Open Build Service

rubygem-mail_agent.changes Added

rubygem-mail_agent.spec Changed

mail_agent-1.1.1.gem/checksums.yaml.gz -> mail_agent-1.1.2.gem/checksums.yaml.gz Changed

mail_agent-1.1.1.gem/data/lib/mail_agent/models/email/box.rb -> mail_agent-1.1.2.gem/data/lib/mail_agent/models/email/box.rb Changed

@@ -4,7 +4,7 @@
   module Models
     module Email
       class Box < Email::Base
-        has_one :forward, primary_key: :uuid, foreign_key: :uuid, dependent: :destroy 
+        has_one :forward, primary_key: :uuid, foreign_key: :uuid, dependent: :destroy
 
         def self.find_by_hel(object)
           self.where(uuid: object.uuid).first
@@ -27,10 +27,18 @@
 
           names = self.column_names.map(&:to_sym)
           names -= :id, :domain_on_hold
-          attrs = object.as_json(only: names).symbolize_keys
-          attrs:on_hold = !! (object.on_hold || object.domain_on_hold)
-          attrs:password = SecureRandom.hex unless attrs:password.present? # manca la validazione della password su Asgard?
-          record.attributes = attrs
+          record.attributes = object.as_json(only: names).symbolize_keys
+          record.on_hold = !! (object.on_hold || object.domain_on_hold)
+
+          if object.encrypted_password.present?
+            record.password = nil
+          elsif object.password.present?
+            record.encrypted_password = nil
+          else
+            record.password = nil
+            record.encrypted_password = SecureRandom.hex
+          end
+
           record.send_only = false
           record.save!
 
@@ -50,20 +58,28 @@
           return false unless object.is_credential?
 
           record ||= new
-          attrs = {
-            fqda: object.login,
-            user: object.login.split(/@/).first,
-            domain: object.login.split(/@/).last,
-            password: object.secret || SecureRandom.hex, # manca la validazione della password su Asgard?
-            on_hold: !!(object.on_hold || object.domain_on_hold),
-            send_only: !object.real_box,
-            uuid: object.uuid
-          }
-          record.attributes = attrs
+          record.fqda = object.login,
+          record.user = object.login.split(/@/).first,
+          record.domain = object.login.split(/@/).last,
+          record.on_hold = !!(object.on_hold || object.domain_on_hold),
+          record.send_only = !object.real_box,
+          record.uuid = object.uuid
+          record.password = object.secret
+          record.encrypted_password = object.encrypted_password
+
+          if object.encrypted_password.present?
+            record.password = nil
+          elsif object.secret.present?
+            record.encrypted_password = nil
+          else
+            record.password = nil
+            record.encrypted_password = SecureRandom.hex
+          end
+
           record.save!
           record
         end
       end
     end
   end
-end
\ No newline at end of file
+end

mail_agent-1.1.1.gem/data/lib/mail_agent/version.rb -> mail_agent-1.1.2.gem/data/lib/mail_agent/version.rb Changed

mail_agent-1.1.1.gem/data/mail_agent.spec.in -> mail_agent-1.1.2.gem/data/mail_agent.spec.in Changed

mail_agent-1.1.1.gem/metadata.gz -> mail_agent-1.1.2.gem/metadata.gz Changed

Changes of Revision 15