zm-ruby-client 2.2.7 → 3.0.0

data/lib/zm/client/identity/identities_collection.rb

@@ -7,14 +7,15 @@ module Zm
       def initialize(parent)
         @child_class = Identity
         @builder_class = IdentitiesBuilder
-        super(parent)
+        super
       end
 
-      private
-
       def make_query
-        soap_request = SoapElement.account(SoapAccountConstants::GET_IDENTITIES_REQUEST)
-        @parent.sacc.invoke(soap_request)
+        @parent.soap_connector.invoke(build_query)
+      end
+
+      def build_query
+        SoapElement.account(SoapAccountConstants::GET_IDENTITIES_REQUEST)
       end
     end
   end

data/lib/zm/client/identity/identity.rb

@@ -4,43 +4,25 @@ module Zm
   module Client
     # class account identity
     class Identity < Base::Object
+      include RequestMethodsMailbox
+
       attr_accessor :id, :name, :zimbraPrefIdentityName, :zimbraPrefFromDisplay, :zimbraPrefFromAddress,
                     :zimbraPrefFromAddressType, :zimbraPrefReplyToEnabled, :zimbraPrefReplyToDisplay,
                     :zimbraPrefReplyToAddress, :zimbraPrefDefaultSignatureId, :zimbraPrefForwardReplySignatureId,
                     :zimbraPrefWhenSentToEnabled, :zimbraPrefWhenInFoldersEnabled, :zimbraPrefWhenSentToAddresses
 
       def create!
-        rep = @parent.sacc.invoke(jsns_builder.to_jsns)
+        rep = @parent.soap_connector.invoke(build_create)
         IdentityJsnsInitializer.update(self, rep[:CreateIdentityResponse][:identity].first)
         @id
       end
 
-      def modify!
-        @parent.sacc.invoke(jsns_builder.to_update)
-        true
-      end
-
-      def update!(hash)
-        return false if hash.delete_if { |k, v| v.nil? || !respond_to?(k) }.empty?
-
-        do_update!(hash)
-
-        hash.each do |key, value|
-          update_attribute(key, value)
-        end
-
-        true
-      end
-
-      def rename!(new_name)
+      def rename!(*args)
         raise NotImplementedError
       end
 
-      def delete!
-        return if @id.nil?
-
-        @parent.sacc.invoke(jsns_builder.to_delete)
-        @id = nil
+      def build_rename(*args)
+        raise NotImplementedError
       end
 
       def clone
@@ -55,12 +37,10 @@ module Zm
 
       private
 
-      def do_update!(hash)
-        @parent.sacc.invoke(jsns_builder.to_patch(hash))
-      end
-
       def jsns_builder
-        @jsns_builder ||= IdentityJsnsBuilder.new(self)
+        return @jsns_builder if defined? @jsns_builder
+
+        @jsns_builder = IdentityJsnsBuilder.new(self)
       end
     end
   end

data/lib/zm/client/identity/identity_jsns_builder.rb

@@ -10,28 +10,32 @@ module Zm
 
       def to_jsns
         soap_request = SoapElement.account(SoapAccountConstants::CREATE_IDENTITY_REQUEST)
-        node_identity = SoapElement.create(SoapConstants::IDENTITY).add_attributes({ name: @item.name, _attrs: attrs })
+        node_identity = SoapElement.create(SoapConstants::IDENTITY)
+                                   .add_attributes({ name: @item.name, _attrs: attrs })
         soap_request.add_node(node_identity)
         soap_request
       end
 
       def to_update
         soap_request = SoapElement.account(SoapAccountConstants::MODIFY_IDENTITY_REQUEST)
-        node_identity = SoapElement.create(SoapConstants::IDENTITY).add_attributes({ id: @item.id, _attrs: attrs })
+        node_identity = SoapElement.create(SoapConstants::IDENTITY)
+                                   .add_attributes({ id: @item.id, _attrs: attrs })
         soap_request.add_node(node_identity)
         soap_request
       end
 
       def to_patch(hash)
         soap_request = SoapElement.account(SoapAccountConstants::MODIFY_IDENTITY_REQUEST)
-        node_identity = SoapElement.create(SoapConstants::IDENTITY).add_attributes({ id: @item.id, _attrs: hash })
+        node_identity = SoapElement.create(SoapConstants::IDENTITY)
+                                   .add_attributes({ id: @item.id, _attrs: hash })
         soap_request.add_node(node_identity)
         soap_request
       end
 
       def to_delete
         soap_request = SoapElement.account(SoapAccountConstants::DELETE_IDENTITY_REQUEST)
-        node_identity = SoapElement.create(SoapConstants::IDENTITY).add_attributes({ id: @item.id })
+        node_identity = SoapElement.create(SoapConstants::IDENTITY)
+                                   .add_attributes({ id: @item.id })
         soap_request.add_node(node_identity)
         soap_request
       end

data/lib/zm/client/identity/identity_jsns_initializer.rb

@@ -6,13 +6,14 @@ module Zm
     class IdentityJsnsInitializer
       class << self
         def create(parent, json)
-          item = Identity.new(parent)
-          update(item, json)
+          Identity.new(parent).tap do |item|
+            update(item, json)
+          end
         end
 
         def update(item, json)
-          item.id = json[:id]
-          item.name = json[:name]
+          item.id = json.delete(:id)
+          item.name = json.delete(:name)
 
           return item if json[:_attrs].nil? || json[:_attrs].empty?
 

data/lib/zm/client/license/license.rb

@@ -10,7 +10,13 @@ module Zm
                     :IssuedToEmail, :IssuedToName, :LicenseId, :MAPIConnectorAccountsLimit, :MobileSyncAccountsLimit,
                     :MobileSyncEnabled, :ResellerName, :SMIMEAccountsLimit, :TouchClientsAccountsLimit,
                     :TwoFactorAuthAccountsLimit, :ValidFrom, :ValidUntil, :VoiceAccountsLimit, :ZSSAccountsLimit,
-                    :ZTalkAccountsLimit
+                    :ZTalkAccountsLimit, :AttachmentIndexingEnabled, :BasicOneToOneChatAccountsLimit, 
+                    :BriefcaseAccountsLimit, :CalenderAccountsLimit, :ChatAccountsLimit, :ChatVideoAccountsLimit,
+                    :ConversationEnabledAccountsLimit, :DelegatedAdminAccountsLimit, :DocumentEditingAccountsLimit,
+                    :FeaturesOnHold, :GroupCalenderAccountsLimit, :ManageZimletsEnabledAccountsLimit,
+                    :MultiFactorAuthEnabled, :ObjectStoreSupportEnabled, :SharingAccountsLimit,
+                    :StorageManagementEnabled, :TaggingEnabledAccountsLimit, :TaskEnabledAccountsLimit,
+                    :ViewInHtmlEnabledAccountsLimit
     end
   end
 end

data/lib/zm/client/license/license_jsns_initializer.rb

@@ -6,13 +6,16 @@ module Zm
     class LicenseJsnsInitializer
       class << self
         def create(parent, json)
-          item = License.new(parent)
+          License.new(parent).tap do |item|
+            json[:attr].each do |a|
+              setter = "#{a.delete(:name)}="
+              value = a.dig(:maxLimit, :_content) || a.delete(:_content)
 
-          json[:attr].each do |a|
-            item.instance_variable_set(Utils.arrow_name(a[:name]), a[:_content])
+              if item.respond_to?(setter)
+                item.send(setter, value)
+              end
+            end
           end
-
-          item
         end
       end
     end

data/lib/zm/client/license/licenses_collection.rb

@@ -10,7 +10,7 @@ module Zm
 
       def find
         soap_request = SoapElement.admin(SoapAdminConstants::GET_LICENSE_REQUEST)
-        entry = sac.invoke(soap_request)[:GetLicenseResponse][:license].first
+        entry = @parent.soap_admin_connector.invoke(soap_request)[:GetLicenseResponse][:license].first
         LicenseJsnsInitializer.create(@parent, entry)
       end
     end

data/lib/zm/client/mailbox/mailbox_item_concern.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require_relative 'mailbox_item_id'
+
+module Zm
+  module Client
+    module MailboxItemConcern
+      def id=(remote_id)
+        parts = remote_id.to_s.split(':').reverse
+        parts << nil if parts.length == 1
+        @id = MailboxItemID.new(*parts)
+      end
+
+      def id
+        return nil unless defined? @id
+
+        @id.item_id
+      end
+
+      def mailbox_id
+        return nil unless defined? @id
+
+        @id.mailbox_id
+      end
+
+      def l=(remote_l)
+        @l = remote_l.to_s.split(':').last
+      end
+
+      attr_reader :l
+    end
+  end
+end

data/lib/zm/client/mailbox/mailbox_item_id.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    MailboxItemID = Data.define(:item_id, :mailbox_id)
+  end
+end

data/lib/zm/client/message/attachments_collection.rb

@@ -40,9 +40,9 @@ module Zm
 
           url = account.home_url
 
-          url << '?' << Utils.format_url_params(h)
+          url << '?' << h.map { |k, v| "#{k}=#{v}" }.join('&')
 
-          uploader = Upload.new(@parent, RestAccountConnector.new)
+          uploader = @parent.build_uploader
           uploader.download_file_with_url(url, dest_file_path)
         end
 

data/lib/zm/client/message/message.rb

@@ -6,8 +6,11 @@ module Zm
     class Message < Base::Object
       include BelongsToFolder
       include BelongsToTag
+      include RequestMethodsMailbox
+      include MailboxItemConcern
 
-      attr_accessor :id, :d, :l, :f, :su, :fr, :autoSendTime, :mid, :idnt, :tn, :subject, :s
+      attr_accessor :d, :f, :su, :fr, :autoSendTime, :mid, :idnt, :tn, :subject, :s
+      attr_reader :recipients, :attachments, :body
 
       alias size s
 
@@ -15,94 +18,97 @@ module Zm
         @parent = parent
         @subject = ''
 
-        yield(self) if block_given?
-      end
-
-      def recipients
-        return @recipients if defined? @recipients
-
         @recipients = Recipients.new
-      end
-
-      def attachments
-        return @attachments if defined? @attachments
-
+        @body = Body.new
         @attachments = AttachmentsCollection.new
-      end
 
-      def body
-        return @body if defined? @body
-
-        @body = Body.new
+        yield(self) if block_given?
       end
 
-      def download(dest_file_path, fmt = 'eml')
-        uploader = Upload.new(@parent, RestAccountConnector.new)
-        uploader.download_file( Zm::Client::FolderDefault::ROOT[:path], fmt, [Zm::Client::FolderView::MESSAGE], [@id], dest_file_path)
+      def download(dest_file_path, fmt: 'eml')
+        uploader = @parent.build_uploader
+        uploader.download_file(dest_file_path, id, FolderView::MESSAGE, fmt:)
       end
 
-      def read(fmt = 'eml')
-        uploader = Upload.new(@parent, RestAccountConnector.new)
-        uploader.read_file( Zm::Client::FolderDefault::ROOT[:path], fmt, [Zm::Client::FolderView::MESSAGE], [@id])
+      def read
+        uploader = @parent.build_uploader
+        uploader.read_file(id, FolderView::MESSAGE, fmt: 'eml')
       end
 
       def date
-        @date ||= Time.at(d.to_i / 1000)
+        return @date if defined? @date
+
+        @date = Time.at(d.to_i / 1000)
       end
 
       def flags
-        @flags ||= FlagsCollection.new(self)
+        return @flags if defined? @flags
+
+        @flags = FlagsCollection.new(self)
       end
 
       def create!(*args)
         raise NotImplementedError
       end
 
+      def build_create
+        raise NotImplementedError
+      end
+
       def modify!(*args)
         raise NotImplementedError
       end
 
-      def update!(l: nil, rgb: nil, color: nil, f: nil, tn: nil)
-        attrs = {
-          op: :update,
-          id: @id,
-          l: l,
-          rgb: rgb,
-          color: color,
-          f: f,
-          tn: tn
-        }
+      def build_modify
+        raise NotImplementedError
+      end
+
+      def update!(attrs)
+        authorized_keys = %i[l rgb color f tn]
+
+        attrs.reject! { |k| !authorized_keys.include?(k) }
 
-        attrs.delete_if { |_, v| v.nil? }
+        attrs.merge!({ op: :update, id: id })
 
-        soap_request = SoapElement.mail(SoapMailConstants::MSG_ACTION_REQUEST)
+        attrs.compact!
+
+        soap_request = SoapElement.mail(SoapMailConstants::ITEM_ACTION_REQUEST)
         node_action = SoapElement.create(SoapConstants::ACTION).add_attributes(attrs)
         soap_request.add_node(node_action)
-        @parent.sacc.invoke(soap_request)
+        @parent.soap_connector.invoke(soap_request)
       end
 
       def rename!(*args)
         raise NotImplementedError
       end
 
-      def delete!
-        return false if @id.nil?
-
-        @parent.sacc.invoke(jsns_builder.to_delete)
-        @id = nil
+      def build_rename(*args)
+        raise NotImplementedError
       end
 
       def unspam!
-        @parent.sacc.invoke(jsns_builder.to_unspam)
+        @parent.soap_connector.invoke(build_unspam)
+      end
+
+      def build_unspam
+        jsns_builder.to_unspam
       end
 
       def spam!
-        @parent.sacc.invoke(jsns_builder.to_spam)
+        @parent.soap_connector.invoke(build_spam)
+      end
+
+      def build_spam
+        jsns_builder.to_spam
       end
 
       def send!
-        soap_request = SoapElement.mail(SoapMailConstants::SEND_MSG_REQUEST).add_attributes(jsns_builder.to_jsns)
-        @parent.sacc.invoke(soap_request)
+        @parent.soap_connector.invoke(build_send)
+      end
+
+      def build_send
+        SoapElement.mail(SoapMailConstants::SEND_MSG_REQUEST)
+                   .add_attributes(jsns_builder.to_jsns)
       end
 
       # content fo an email
@@ -110,12 +116,10 @@ module Zm
         attr_accessor :text, :html
       end
 
-      def sacc
-        @parent.sacc
-      end
-
       def jsns_builder
-        @jsns_builder ||= MessageJsnsBuilder.new(self)
+        return @jsns_builder if defined? @jsns_builder
+
+        @jsns_builder = MessageJsnsBuilder.new(self)
       end
     end
   end

data/lib/zm/client/message/message_flags.rb

@@ -10,11 +10,7 @@ module Zm
         end
 
         def all
-          @all || all!
-        end
-
-        def all!
-          @parent.f.to_s.chars
+          @all ||= @parent.f.to_s.chars
         end
 
         # properties
@@ -74,23 +70,35 @@ module Zm
         # actions
 
         def unread!
-          attrs = { op: '!read', id: @parent.id }
-          @parent.sacc.invoke(build(attrs))
+          @parent.soap_connector.invoke(build_unread)
+        end
+
+        def build_unread
+          build({ op: '!read', id: @parent.id })
         end
 
         def read!
-          attrs = { op: 'read', id: @parent.id }
-          @parent.sacc.invoke(build(attrs))
+          @parent.soap_connector.invoke(build_read)
+        end
+
+        def build_read
+          build({ op: 'read', id: @parent.id })
         end
 
         def unflag!
-          attrs = { op: '!flag', id: @parent.id }
-          @parent.sacc.invoke(build(attrs))
+          @parent.soap_connector.invoke(build_unflag)
+        end
+
+        def build_unflag
+          build({ op: '!flag', id: @parent.id })
         end
 
         def flag!
-          attrs = { op: 'flag', id: @parent.id }
-          @parent.sacc.invoke(build(attrs))
+          @parent.soap_connector.invoke(build_flag)
+        end
+
+        def build_flag
+          build({ op: 'flag', id: @parent.id })
         end
 
         private

data/lib/zm/client/message/message_jsns_builder.rb

@@ -15,16 +15,17 @@ module Zm
           e: recipients_jsns,
           su: { _content: @item.su },
           mp: body_jsns
-        }.delete_if { |_, v| v.nil? }
+        }
+        jsns.compact!
 
-        jsns[:did] = @item.id if @item.l.to_i == FolderDefault::DRAFTS[:id]
+        jsns[:did] = @item.id if @item.l.to_i == FolderDefault::DRAFTS.id
 
         jsns
       end
 
       def attachments_jsns
         @item.attachments.all.map do |attachment|
-          {
+          h = {
             part: attachment.part,
             mid: attachment.mid,
             aid: attachment.aid,
@@ -33,7 +34,9 @@ module Zm
             filename: attachment.filename,
             ci: attachment.ci,
             cd: attachment.cd
-          }.reject { |_, v| v.nil? }
+          }
+          h.compact!
+          h
         end
       end
 
@@ -41,11 +44,13 @@ module Zm
         return nil if @item.recipients.all.empty?
 
         @item.recipients.all.map do |recipient|
-          {
+          h = {
             t: recipient.field,
             a: recipient.email,
             p: recipient.display_name
-          }.reject { |_, v| v.nil? }
+          }
+          h.compact!
+          h
         end
       end
 

data/lib/zm/client/message/message_jsns_initializer.rb

@@ -6,29 +6,30 @@ module Zm
     class MessageJsnsInitializer
       class << self
         def create(parent, json)
-          item = Message.new(parent)
-          update(item, json)
+          Message.new(parent).tap do |item|
+            update(item, json)
+          end
         end
 
         def update(item, json)
-          item.id = json[:id]
-          item.d = json[:d]
-          item.l    = json[:l]
-          item.su   = json[:su]
-          item.fr   = json[:fr]
-          item.autoSendTime = json[:autoSendTime]
-          item.mid  = json[:mid]
-          item.idnt = json[:idnt]
-          item.f = json[:f]
-          item.tn = json[:tn]
-          item.s = json[:s]
+          item.id = json.delete(:id)
+          item.d = json.delete(:d)
+          item.l    = json.delete(:l)
+          item.su   = json.delete(:su)
+          item.fr   = json.delete(:fr)
+          item.autoSendTime = json.delete(:autoSendTime)
+          item.mid  = json.delete(:mid)
+          item.idnt = json.delete(:idnt)
+          item.f = json.delete(:f)
+          item.tn = json.delete(:tn)
+          item.s = json.delete(:s)
 
           json[:e].each do |e|
-            recipient = Recipient.new(e[:t], e[:a], e[:p])
+            recipient = Recipient.new(e.delete(:t), e.delete(:a), e.delete(:p))
             item.recipients.add(recipient)
           end
 
-          update_mps(item, json[:mp])
+          update_mps(item, json.delete(:mp))
 
           item
         end
@@ -56,14 +57,14 @@ module Zm
 
         def update_attachment(item, json)
           pj = Zm::Client::Message::Attachment.new(self)
-          pj.mid  = json[:mid]
-          pj.aid  = json[:aid]
-          pj.ct   = json[:ct]
-          pj.s    = json[:s]
-          pj.filename = json[:filename]
-          pj.ci   = json[:ci]
-          pj.cd   = json[:cd]
-          pj.part = json[:part]
+          pj.mid  = json.delete(:mid)
+          pj.aid  = json.delete(:aid)
+          pj.ct   = json.delete(:ct)
+          pj.s    = json.delete(:s)
+          pj.filename = json.delete(:filename)
+          pj.ci   = json.delete(:ci)
+          pj.cd   = json.delete(:cd)
+          pj.part = json.delete(:part)
           item.attachments.add(pj)
         end
       end

data/lib/zm/client/message/messages_builder.rb

@@ -5,7 +5,7 @@ module Zm
     # class factory [messages]
     class MessagesBuilder < Base::ObjectsBuilder
       def initialize(parent, json)
-        super(parent, json)
+        super
         @json_item_key = :m
       end
 

data/lib/zm/client/message/messages_collection.rb

@@ -5,7 +5,7 @@ module Zm
     # Collection Messages
     class MessagesCollection < Base::AccountSearchObjectsCollection
       def initialize(parent)
-        super(parent)
+        super
         @child_class = Message
         @builder_class = MessagesBuilder
         @type = SoapConstants::MESSAGE
@@ -23,20 +23,6 @@ module Zm
         end
       end
 
-      def delete_all(ids)
-        attrs = {
-          op: :delete,
-          id: ids.join(',')
-        }
-
-        attrs.delete_if { |_, v| v.nil? }
-
-        soap_request = SoapElement.mail(SoapMailConstants::MSG_ACTION_REQUEST)
-        node_action = SoapElement.create(SoapConstants::ACTION).add_attributes(attrs)
-        soap_request.add_node(node_action)
-        @parent.sacc.invoke(soap_request)
-      end
-
       private
 
       def build_options