zm-ruby-client 0.18.3 → 2.0.2

data/lib/zm/client/constant.rb

@@ -6,9 +6,9 @@ module Zm
     DOUBLEPOINT = ' :: '
 
     module Regex
-      UUID_REGEX = %r{[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}}
-      BASEDN_REGEX = %r{^uid=}
-      SHARED_CONTACT = %r{[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}:[0-9]+}
+      UUID_REGEX = /[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/.freeze
+      BASEDN_REGEX = /^uid=/.freeze
+      SHARED_CONTACT = /[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}:[0-9]+/.freeze
     end
 
     module FolderDefault
@@ -83,7 +83,7 @@ module Zm
       COS = :coses
 
       module Attributes
-        ACCOUNT = %i[
+        ACCOUNT = %w[
           displayName
           zimbraId
           cn
@@ -102,7 +102,7 @@ module Zm
           zimbraIsExternalVirtualAccount
         ].freeze
 
-        DL = %i[
+        DL = %w[
           displayName
           zimbraId
           zimbraMailHost
@@ -112,7 +112,7 @@ module Zm
           zimbraMailAlias
         ].freeze
 
-        ALIAS = %i[
+        ALIAS = %w[
           zimbraAliasTargetId
           zimbraId
           targetName
@@ -126,7 +126,7 @@ module Zm
           zimbraIsExternalVirtualAccount
         ].freeze
 
-        RESOURCE = %i[
+        RESOURCE = %w[
           displayName
           zimbraId
           zimbraMailHost
@@ -141,7 +141,7 @@ module Zm
           zimbraIsExternalVirtualAccount
         ].freeze
 
-        DOMAIN = %i[
+        DOMAIN = %w[
           description
           zimbraDomainName
           zimbraDomainStatus
@@ -150,7 +150,7 @@ module Zm
           zimbraDomainDefaultCOSId
         ].freeze
 
-        COS = %i[
+        COS = %w[
           cn
           description
           zimbraMailHostPool
@@ -186,7 +186,7 @@ module Zm
       CORRUPT = 'corrupt'
       ACTIVE = 'active'
       HOLD = 'hold'
-      ALL = [INCOMING, DEFERRED, CORRUPT, ACTIVE, HOLD]
+      ALL = [INCOMING, DEFERRED, CORRUPT, ACTIVE, HOLD].freeze
     end
 
     module MtaQueueAction
@@ -211,7 +211,17 @@ module Zm
       SERVER = 'server'
       RESOURCE = 'calresource'
       INTERNAL_USER_ACCOUNT = 'internalUserAccount'
-      ALL = [USER_ACCOUNT, ACCOUNT, ALIAS, DL, DOMAIN, COS, SERVER, RESOURCE, INTERNAL_USER_ACCOUNT]
+      ALL = [USER_ACCOUNT, ACCOUNT, ALIAS, DL, DOMAIN, COS, SERVER, RESOURCE, INTERNAL_USER_ACCOUNT].freeze
+    end
+
+    module ContentType
+      TEXT = 'text/plain'
+      HTML = 'text/html'
+      ALL = [TEXT, HTML].freeze
+    end
+
+    module ContentPart
+      ALTERNATIVE = 'multipart/alternative'
     end
   end
 end

data/lib/zm/client/contact/contact.rb

@@ -3,31 +3,23 @@
 module Zm
   module Client
     # class account tag
-    class Contact < Base::AccountObject
+    class Contact < Base::Object
+      include BelongsToFolder
+      include BelongsToTag
+
       GROUP_PATTERN = 'group'
 
-      INSTANCE_VARIABLE_KEYS = %i[
-        anniversary assistantPhone birthday callbackPhone carPhone company companyPhone custom1 department email email2
-        email3 email4 email5 email6 email7 firstName fullName homeCity homeCountry homeFax homePhone homePostalCode
-        homeState homeStreet homeURL imAddress1 imAddress2 imAddress3 imAddress4 imAddress5 jobTitle lastName maidenName
-        middleName mobilePhone namePrefix nameSuffix nickname notes otherCity otherCountry otherFax otherPhone
-        otherPostalCode otherState otherStreet otherURL pager workCity workCountry workFax workPhone workPostalCode
-        workState workStreet workURL image
-      ].freeze
-
-      attr_accessor *INSTANCE_VARIABLE_KEYS
-      attr_accessor :id, :name, :l, :type, :members, :old_members, :tn
-
-      def initialize(parent, json = nil)
-        @parent  = parent
-        @members = []
-        @custom_keys = []
-        init_from_json(json) if json.is_a?(Hash)
-        yield(self) if block_given?
-        @old_members = @members.clone
+      attr_accessor :anniversary, :assistantPhone, :birthday, :callbackPhone, :carPhone, :company, :companyPhone,
+                    :custom1, :department, :email, :email2, :email3, :email4, :email5, :email6, :email7, :firstName, :fullName, :homeCity, :homeCountry, :homeFax, :homePhone, :homePostalCode, :homeState, :homeStreet, :homeURL, :imAddress1, :imAddress2, :imAddress3, :imAddress4, :imAddress5, :jobTitle, :lastName, :maidenName, :middleName, :mobilePhone, :namePrefix, :nameSuffix, :nickname, :notes, :otherCity, :otherCountry, :otherFax, :otherPhone, :otherPostalCode, :otherState, :otherStreet, :otherURL, :pager, :workCity, :workCountry, :workFax, :workPhone, :workPostalCode, :workState, :workStreet, :workURL, :image, :id, :name, :l, :type, :tn, :shared_account_id, :shared_folder_account_id
+
+      def initialize(parent)
+        @l = FolderDefault::CONTACTS[:id]
+        @shared_account_id = nil
+        @shared_folder_account_id = nil
+        super(parent)
       end
 
-      def is_group?
+      def group?
         @type == GROUP_PATTERN
       end
 
@@ -35,90 +27,57 @@ module Zm
         [email, email2, email3, email4, email5, email6, email7].compact
       end
 
-      def emails_h
-        {
-            'email' => email,
-            'email2' => email2,
-            'email3' => email3,
-            'email4' => email4,
-            'email5' => email5,
-            'email6' => email6,
-            'email7' => email7
-        }.compact
+      def add_custom_property(key, value)
+        instance_variable_set(Utils.arrow_name(key), value)
       end
 
-      def concat
-        [id, name, l] + all_instance_variable_keys.map { |key| instance_variable_get(arrow_name(key)) }
-      end
+      def create!
+        rep = @parent.sacc.invoke(jsns_builder.to_jsns)
+        ContactJsnsInitializer.update(self, rep[:CreateContactResponse][:cn].first)
 
-      def to_h
-        hashmap = Hash[all_instance_variable_keys.map { |key| [key, instance_variable_get(arrow_name(key))] }]
-        hashmap.delete_if { |_, v| v.nil? }
-        hashmap
+        @id
       end
 
-      def init_from_json(json)
-        @id   = json[:id]
-        @name = json[:fileAsStr]
-        @l    = json[:l]
-        @tn   = json[:tn]
-
-        init_instance_variable_from_json(json[:_attrs])
-
-        return unless is_group?
-
-        extend(GroupContact)
-        init_members_from_json(json[:m])
+      def modify!
+        @parent.sacc.invoke(jsns_builder.to_update)
+        true
       end
 
-      def init_instance_variable_from_json(json_attrs)
-        return if json_attrs.nil?
-
-        @type = json_attrs[:type]
+      def update!(hash)
+        return false if hash.delete_if { |k, v| v.nil? || !respond_to?(k) }.empty?
 
-        make_custom_keys(json_attrs)
+        do_update!(hash)
 
-        all_instance_variable_keys.each do |key|
-          instance_variable_set(arrow_name(key), json_attrs[key])
+        hash.each do |key, value|
+          update_attribute(key, value)
         end
-      end
-
-      def make_custom_keys(json_attrs)
-        @custom_keys = json_attrs.keys - INSTANCE_VARIABLE_KEYS - %i[type fileAs]
-        return if @custom_keys.empty?
 
-        self.class.attr_accessor(*@custom_keys)
-      rescue StandardError => _
-        @custom_keys.clear
-        nil
+        true
       end
 
-      def all_instance_variable_keys
-        INSTANCE_VARIABLE_KEYS + @custom_keys
+      def rename!(*args)
+        raise NotImplementedError
       end
 
-      def add_custom_property(key, value)
-        instance_variable_set(arrow_name(key), value)
-        @custom_keys << key unless all_instance_variable_keys.include?(key)
-      end
+      def delete!
+        return false if @id.nil?
 
-      def create!
-        rep = @parent.sacc.create_contact(@parent.token, l, instance_variables_array(all_instance_variable_keys))
-        init_from_json(rep[:Body][:CreateContactResponse][:cn].first)
+        @parent.sacc.invoke(jsns_builder.to_delete)
+        @id = nil
       end
 
-      def delete!
-        @parent.sacc.contact_action(@parent.token, :delete, @id)
-        super
+      def reload!
+        raise NotImplementedError
       end
 
-      def update!(hash)
-        @parent.sacc.modify_contact(@parent.token, id, hash)
-        hash.each { |k, v| send "#{k}=", v }
+      private
+
+      def do_update!(hash)
+        @parent.sacc.invoke(jsns_builder.to_patch(hash))
       end
 
-      def modify!
-        @parent.sacc.modify_contact(@parent.token, id, instance_variables_array(all_instance_variable_keys))
+      def jsns_builder
+        @jsns_builder ||= ContactJsnsBuilder.new(self)
       end
     end
   end

data/lib/zm/client/contact/contact_jsns_builder.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    # class for account contact jsns builder
+    class ContactJsnsBuilder < BaseAccountJsnsBuilder
+      EXCLUDE_INSTANCE_VARIABLE_KEYS = %i[@id @name @parent @l @type @tn @jsns_builder].freeze
+
+      def to_jsns
+        jsns = {
+          cn: {
+            a: instance_variables_array(all_instance_variables).map(&Utils::A_NODE_PROC),
+            l: @item.folder_id || Zm::Client::FolderDefault::CONTACTS[:id]
+          }
+        }
+
+        SoapElement.mail(SoapMailConstants::CREATE_CONTACT_REQUEST).add_attributes(jsns)
+      end
+
+      def to_update
+        jsns = {
+          cn: {
+            a: instance_variables_array(all_instance_variables).map(&Utils::A_NODE_PROC),
+            id: @item.id
+          }
+        }
+
+        SoapElement.mail(SoapMailConstants::MODIFY_CONTACT_REQUEST).add_attributes(jsns)
+      end
+
+      def to_patch(hash)
+        jsns = {
+          cn: {
+            id: @item.id,
+            a: hash.map(&Utils::A_ARRAY_PROC).flatten(1).map(&Utils::A_NODE_PROC)
+          }
+        }
+
+        SoapElement.mail(SoapMailConstants::MODIFY_CONTACT_REQUEST).add_attributes(jsns)
+      end
+
+      def instance_variables_array(zcs_attrs)
+        arr = zcs_attrs.map do |name|
+          n = name.to_s[1..]
+          value = @item.instance_variable_get(name)
+          [n, value]
+        end
+
+        multi_value = arr.select { |a| a.last.is_a?(Array) }
+        arr.reject! { |a| a.last.is_a?(Array) || a.last.nil? }
+        multi_value.each { |a| arr += a.last.map { |v| [a.first, v] } }
+        arr
+      end
+
+      def all_instance_variables
+        @item.instance_variables - EXCLUDE_INSTANCE_VARIABLE_KEYS
+      end
+    end
+  end
+end

data/lib/zm/client/contact/contact_jsns_initializer.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    # class for account contact
+    class ContactJsnsInitializer
+      class << self
+        def create(parent, json)
+          item = Contact.new(parent)
+          update(item, json)
+        end
+
+        def update(item, json)
+          part_id = json[:id].split(':')
+
+          if part_id.length == 1
+            item.id = json[:id].to_i
+          elsif part_id.length == 2
+            item.shared_account_id = part_id.first
+            item.id = part_id.last.to_i
+          else
+            item.id = json[:id]
+          end
+
+          part_l = json[:l].split(':')
+
+          if part_l.length == 1
+            item.l = json[:l].to_i
+          elsif part_l.length == 2
+            item.shared_folder_account_id = part_l.first
+            item.l = part_l.last.to_i
+          else
+            item.l = json[:l]
+          end
+
+          # item.id   = json[:id]
+          item.name = json[:fileAsStr]
+          # item.l    = json[:l].to_i
+          item.tn   = json[:tn]
+
+          if json[:_attrs].is_a?(Hash)
+            make_custom_keys(json[:_attrs], item)
+            init_by_attrs(json[:_attrs], item)
+          end
+
+          if item.group?
+            item.extend(GroupContact)
+            init_members_from_json(json[:m], item)
+          end
+
+          item
+        end
+
+        def make_custom_keys(attrs, item)
+          custom_keys = attrs.keys - item.all_instance_variable_keys
+          return if custom_keys.empty?
+
+          item.class.attr_accessor(*custom_keys)
+        rescue StandardError => _e
+          nil
+        end
+
+        def init_by_attrs(attrs, item)
+          attrs.each do |k, v|
+            m = Utils.equals_name(k)
+            item.send(m, v) if item.respond_to?(m)
+          end
+        end
+
+        def init_members_from_json(m, item)
+          return if m.nil?
+
+          item.members.all = m.map { |m| Zm::Client::ConcatMember.new(m[:type], m[:value]) }
+        end
+      end
+    end
+  end
+end

data/lib/zm/client/contact/contact_member.rb

@@ -3,48 +3,40 @@
 module Zm
   module Client
     class ConcatMember
+      include Zm::Inspector
+
       INTERNAL = 'C'
       FREE     = 'I'
       LDAP     = 'G'
       ADD      = '+'
       DEL      = '-'
 
-      class << self
-        def find_type_by_value(value)
-          return INTERNAL if !value.to_i.zero? || Zm::Client::Regex::SHARED_CONTACT.match(value)
-          return LDAP if Zm::Client::Regex::BASEDN_REGEX.match(value)
-
-          FREE
-        end
-
-        def init_by_value(value)
-          type_v = find_type_by_value(value)
-          new(type_v, value)
-        end
-      end
-
-      attr_reader :type, :value, :op
+      attr_reader :type, :value, :op, :shared_account_id
 
       def initialize(type, value, op = nil)
+        @shared_account_id = nil
         @op = op
         @type = type
-        @value = value
-      end
 
-      def concat
-        [@value, @type, @op]
-      end
+        value_int = value.to_i
 
-      def to_s
-        concat.join(' :: ')
+        if !value_int.zero?
+          @value = value_int
+        elsif Zm::Client::Regex::SHARED_CONTACT.match(value)
+          part_value = value.split(':')
+          @shared_account_id = part_value.first
+          @value = part_value.last.to_i
+        else
+          @value = value
+        end
       end
 
       def internal?
-        @type == INTERNAL && !Zm::Client::Regex::SHARED_CONTACT.match(value)
+        @type == INTERNAL && @value.is_a?(Integer)
       end
 
       def shared?
-        @type == INTERNAL && Zm::Client::Regex::SHARED_CONTACT.match(value)
+        @type == INTERNAL && !@shared_account_id.nil?
       end
 
       def free?
@@ -55,6 +47,10 @@ module Zm
         @type == LDAP
       end
 
+      def current?
+        @op.nil?
+      end
+
       def add!
         @op = ADD
       end
@@ -63,10 +59,15 @@ module Zm
         @op = DEL
       end
 
-      def construct_soap_node
-        node = { type: @type, value: @value }
-        node[:op] = @op unless @op.nil?
-        node
+      def email_address
+        return unless ldap?
+
+        @email_address ||= @value.sub('uid=', '').sub(',ou=people,dc=', '@').gsub(',dc=', '.')
+      end
+
+      def instance_variables_map
+        email_address
+        super
       end
     end
   end

data/lib/zm/client/contact/contact_members_collection.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    class ContactMembersCollection
+      attr_accessor :all
+
+      def initialize(parent)
+        @parent = parent
+        @all = []
+      end
+
+      def add(new_member)
+        return false unless new_member.is_a?(Zm::Client::ConcatMember)
+
+        current_member = @all.find { |m| m.type == new_member.type && m.value == new_member.value }
+
+        if current_member.nil?
+          new_member.add!
+          @all << new_member
+          return true
+        end
+
+        if current_member.op == Zm::Client::ConcatMember::DEL
+          current_member.add!
+          return true
+        end
+
+        false
+      end
+
+      def remove(new_member)
+        return false unless new_member.is_a?(Zm::Client::ConcatMember)
+
+        current_member = @all.find { |m| m.type == new_member.type && m.value == new_member.value }
+        return false if current_member.nil?
+
+        current_member.remove!
+
+        true
+      end
+    end
+  end
+end

data/lib/zm/client/contact/contacts_builder.rb

@@ -6,9 +6,16 @@ module Zm
     class ContactBuilder < Base::ObjectsBuilder
       def initialize(parent, json)
         super(parent, json)
-        @child_class = Contact
         @json_item_key = :cn
       end
+
+      def make
+        return [] if json_items.nil?
+
+        json_items.map do |entry|
+          ContactJsnsInitializer.create(@parent, entry)
+        end
+      end
     end
   end
 end

data/lib/zm/client/contact/contacts_collection.rb

@@ -7,13 +7,29 @@ module Zm
       def initialize(parent)
         @child_class = Contact
         @builder_class = ContactBuilder
+        @folder_id = nil
         super(parent)
       end
 
+      def folder(folder)
+        return self unless folder.is_a?(Zm::Client::Folder)
+
+        folder_id(folder.id)
+      end
+
+      def folder_id(folder_id)
+        return self if @folder_id == folder_id
+
+        @folder_id = folder_id
+        self
+      end
+
       private
 
       def make_query
-        @parent.sacc.get_all_contacts(@parent.token)
+        jsns = @folder_id.nil? ? nil : { l: @folder_id }
+        soap_request = SoapElement.mail(SoapMailConstants::GET_CONTACTS_REQUEST).add_attributes(jsns)
+        @parent.sacc.invoke(soap_request)
       end
     end
   end

data/lib/zm/client/contact/group_contact_jsns_builder.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    # class for account contact jsns builder
+    class GroupContactJsnsBuilder < BaseAccountJsnsBuilder
+      EXCLUDE_INSTANCE_VARIABLE_KEYS = %i[@id @name @parent @l @type @tn @jsns_builder].freeze
+
+      def to_jsns
+        {
+          cn: {
+            a: instance_variables_array.map(&Utils::A_NODE_PROC),
+            l: @item.folder_id || Zm::Client::FolderDefault::CONTACTS[:id],
+            m: members_node
+          }
+        }
+      end
+
+      def to_update
+        {
+          cn: {
+            a: instance_variables_array.map(&Utils::A_NODE_PROC),
+            id: @item.id,
+            m: members_node
+          }
+        }
+      end
+
+      def to_patch(hash)
+        {
+          cn: {
+            id: @item.id,
+            a: hash.map(&Utils::A_ARRAY_PROC).flatten(1).map(&Utils::A_NODE_PROC)
+          }
+        }
+      end
+
+      alias to_create to_jsns
+
+      def members_node
+        @item.members.all.reject(&:current?).map do |m|
+          { type: m.type, value: m.value, op: m.op }
+        end
+      end
+
+      def instance_variables_array
+        [[:nickname, @item.name], [:fullname, @item.name], [:fileAs, "8:#{@item.name}"], %i[type group]]
+      end
+    end
+  end
+end