zm-ruby-client 0.18.3 → 2.0.2

data/lib/zm/client/server/server.rb

@@ -6,504 +6,32 @@ require 'zm/client/mta_queue'
 module Zm
   module Client
     # objectClass: zimbraServer
-    class Server < Base::AdminObject
-
-      INSTANCE_VARIABLE_KEYS = %i[
-        zimbraActiveSyncEhcacheExpiration
-        zimbraActiveSyncEhcacheHeapSize
-        zimbraActiveSyncEhcacheMaxDiskSize
-        zimbraAdminImapImportNumThreads
-        zimbraAdminPort
-        zimbraAdminProxyPort
-        zimbraAdminSieveFeatureVariablesEnabled
-        zimbraAdminURL
-        zimbraAmavisDSPAMEnabled
-        zimbraAmavisEnableDKIMVerification
-        zimbraAmavisFinalSpamDestiny
-        zimbraAmavisLogLevel
-        zimbraAmavisMaxServers
-        zimbraAmavisOriginatingBypassSA
-        zimbraAmavisSALogLevel
-        zimbraAntispamExtractionBatchDelay
-        zimbraAntispamExtractionBatchSize
-        zimbraAttachmentsIndexedTextLimit
-        zimbraAuthTokenNotificationInterval
-        zimbraAutoProvPollingInterval
-        zimbraBackupAutoGroupedInterval
-        zimbraBackupAutoGroupedNumGroups
-        zimbraBackupAutoGroupedThrottled
-        zimbraBackupMinFreeSpace
-        zimbraBackupMode
-        zimbraBackupReportEmailRecipients
-        zimbraBackupReportEmailSender
-        zimbraBackupReportEmailSubjectPrefix
-        zimbraBackupSkipBlobs
-        zimbraBackupSkipHsmBlobs
-        zimbraBackupSkipSearchIndex
-        zimbraBackupTarget
-        zimbraCBPolicydAccessControlEnabled
-        zimbraCBPolicydAccountingEnabled
-        zimbraCBPolicydAmavisEnabled
-        zimbraCBPolicydBindPort
-        zimbraCBPolicydBypassMode
-        zimbraCBPolicydBypassTimeout
-        zimbraCBPolicydCheckHeloEnabled
-        zimbraCBPolicydCheckSPFEnabled
-        zimbraCBPolicydGreylistingBlacklistMsg
-        zimbraCBPolicydGreylistingDeferMsg
-        zimbraCBPolicydGreylistingEnabled
-        zimbraCBPolicydGreylistingTrainingEnabled
-        zimbraCBPolicydLogLevel
-        zimbraCBPolicydMaxRequests
-        zimbraCBPolicydMaxServers
-        zimbraCBPolicydMaxSpareServers
-        zimbraCBPolicydMinServers
-        zimbraCBPolicydMinSpareServers
-        zimbraCBPolicydQuotasEnabled
-        zimbraCBPolicydTimeoutBusy
-        zimbraCBPolicydTimeoutIdle
-        zimbraCalendarCalDavClearTextPasswordEnabled
-        zimbraCalendarCalDavDefaultCalendarId
-        zimbraCalendarRecurrenceDailyMaxDays
-        zimbraCalendarRecurrenceMaxInstances
-        zimbraCalendarRecurrenceMonthlyMaxMonths
-        zimbraCalendarRecurrenceOtherFrequencyMaxYears
-        zimbraCalendarRecurrenceWeeklyMaxWeeks
-        zimbraCalendarRecurrenceYearlyMaxYears
-        zimbraChatAllowUnencryptedPassword
-        zimbraChatServiceEnabled
-        zimbraChatXmppPort
-        zimbraChatXmppSslPort
-        zimbraChatXmppSslPortEnabled
-        zimbraClamAVBindAddress
-        zimbraClamAVDatabaseMirror
-        zimbraClamAVListenPort
-        zimbraClamAVMaxThreads
-        zimbraClamAVSafeBrowsing
-        zimbraClusterType
-        zimbraConfiguredServerIDForBlobDirEnabled
-        zimbraContactHiddenAttributes
-        zimbraContactRankingTableRefreshInterval
-        zimbraContactSearchDecomposition
-        zimbraConvertPoolTimeout
-        zimbraConvertdURL
-        zimbraCreateTimestamp
-        zimbraDNSTCPUpstream
-        zimbraDNSUseTCP
-        zimbraDNSUseUDP
-        zimbraDatabaseSlowSqlThreshold
-        zimbraEmptyFolderOpTimeout
-        zimbraExtensionBindPort
-        zimbraExternalAccountStatusCheckInterval
-        zimbraFeatureContactBackupFrequency
-        zimbraFeatureContactBackupLifeTime
-        zimbraFileUploadMaxSize
-        zimbraFreebusyPropagationRetryInterval
-        zimbraHsmAge
-        zimbraHsmBatchSize
-        zimbraHsmMovePreviousRevisions
-        zimbraHsmPolicy
-        zimbraHttpCompressionEnabled
-        zimbraHttpConnectorMaxIdleTimeMillis
-        zimbraHttpContextPathBasedThreadPoolBalancingFilterRules
-        zimbraHttpDebugHandlerEnabled
-        zimbraHttpDosFilterDelayMillis
-        zimbraHttpDosFilterMaxRequestsPerSec
-        zimbraHttpHeaderCacheSize
-        zimbraHttpMaxFormContentSize
-        zimbraHttpNumThreads
-        zimbraHttpOutputBufferSize
-        zimbraHttpRequestHeaderSize
-        zimbraHttpResponseHeaderSize
-        zimbraHttpSSLNumThreads
-        zimbraHttpThreadPoolMaxIdleTimeMillis
-        zimbraHttpThrottleSafeIPs
-        zimbraIPMode
-        zimbraId
-        zimbraImapActiveSessionEhcacheMaxDiskSize
-        zimbraImapBindOnStartup
-        zimbraImapBindPort
-        zimbraImapCleartextLoginEnabled
-        zimbraImapDisplayMailFoldersOnly
-        zimbraImapExposeVersionOnBanner
-        zimbraImapInactiveSessionCacheMaxDiskSize
-        zimbraImapInactiveSessionEhcacheMaxDiskSize
-        zimbraImapInactiveSessionEhcacheSize
-        zimbraImapLoadBalancingAlgorithm
-        zimbraImapMaxConnections
-        zimbraImapMaxRequestSize
-        zimbraImapNumThreads
-        zimbraImapProxyBindPort
-        zimbraImapSSLBindOnStartup
-        zimbraImapSSLBindPort
-        zimbraImapSSLProxyBindPort
-        zimbraImapSSLServerEnabled
-        zimbraImapSaslGssapiEnabled
-        zimbraImapServerEnabled
-        zimbraImapShutdownGraceSeconds
-        zimbraInvalidLoginFilterDelayInMinBetwnReqBeforeReinstating
-        zimbraInvalidLoginFilterMaxFailedLogin
-        zimbraInvalidLoginFilterMaxSizeOfFailedIpDb
-        zimbraInvalidLoginFilterReinstateIpTaskIntervalInMin
-        zimbraItemActionBatchSize
-        zimbraLastPurgeMaxDuration
-        zimbraLdapGentimeFractionalSecondsEnabled
-        zimbraLmtpBindOnStartup
-        zimbraLmtpBindPort
-        zimbraLmtpExposeVersionOnBanner
-        zimbraLmtpLHLORequired
-        zimbraLmtpNumThreads
-        zimbraLmtpPermanentFailureWhenOverQuota
-        zimbraLmtpServerEnabled
-        zimbraLmtpShutdownGraceSeconds
-        zimbraLogToSyslog
-        zimbraLowestSupportedAuthVersion
-        zimbraMailClearTextPasswordEnabled
-        zimbraMailContentMaxSize
-        zimbraMailDiskStreamingThreshold
-        zimbraMailEmptyFolderBatchSize
-        zimbraMailEmptyFolderBatchThreshold
-        zimbraMailFileDescriptorBufferSize
-        zimbraMailFileDescriptorCacheSize
-        zimbraMailKeepOutWebCrawlers
-        zimbraMailLocalBind
-        zimbraMailMode
-        zimbraMailPort
-        zimbraMailProxyMaxFails
-        zimbraMailProxyPort
-        zimbraMailProxyReconnectTimeout
-        zimbraMailPurgeBatchSize
-        zimbraMailPurgeSleepInterval
-        zimbraMailRedirectSetEnvelopeSender
-        zimbraMailReferMode
-        zimbraMailSSLClientCertMode
-        zimbraMailSSLClientCertOCSPEnabled
-        zimbraMailSSLClientCertPort
-        zimbraMailSSLPort
-        zimbraMailSSLProxyClientCertPort
-        zimbraMailSSLProxyPort
-        zimbraMailTrustedIP
-        zimbraMailURL
-        zimbraMailUncompressedCacheMaxBytes
-        zimbraMailUncompressedCacheMaxFiles
-        zimbraMailUseDirectBuffers
-        zimbraMailboxMoveFailedCleanupTaskInterval
-        zimbraMailboxMoveSkipBlobs
-        zimbraMailboxMoveSkipHsmBlobs
-        zimbraMailboxMoveSkipSearchIndex
-        zimbraMailboxMoveTempDir
-        zimbraMailboxThrottleReapInterval
-        zimbraMailboxdSSLProtocols
-        zimbraMailboxdSSLRenegotiationAllowed
-        zimbraMemcachedBindPort
-        zimbraMemcachedClientBinaryProtocolEnabled
-        zimbraMemcachedClientExpirySeconds
-        zimbraMemcachedClientHashAlgorithm
-        zimbraMemcachedClientTimeoutMillis
-        zimbraMessageCacheSize
-        zimbraMessageChannelEnabled
-        zimbraMessageChannelPort
-        zimbraMilterBindPort
-        zimbraMilterMaxConnections
-        zimbraMilterNumThreads
-        zimbraMilterServerEnabled
-        zimbraMobileMaxMessageSize
-        zimbraMobileMetadataRetentionPolicy
-        zimbraMtaAddressVerifyNegativeRefreshTime
-        zimbraMtaAddressVerifyPollCount
-        zimbraMtaAddressVerifyPollDelay
-        zimbraMtaAddressVerifyPositiveRefreshTime
-        zimbraMtaAliasMaps
-        zimbraMtaAlwaysAddMissingHeaders
-        zimbraMtaAntiSpamLockMethod
-        zimbraMtaAuthEnabled
-        zimbraMtaAuthPort
-        zimbraMtaAuthTarget
-        zimbraMtaBounceNoticeRecipient
-        zimbraMtaBounceQueueLifetime
-        zimbraMtaBrokenSaslAuthClients
-        zimbraMtaCanonicalMaps
-        zimbraMtaCommandDirectory
-        zimbraMtaDaemonDirectory
-        zimbraMtaDefaultProcessLimit
-        zimbraMtaDelayWarningTime
-        zimbraMtaDnsLookupsEnabled
-        zimbraMtaEnableSmtpdPolicyd
-        zimbraMtaHeaderChecks
-        zimbraMtaHopcountLimit
-        zimbraMtaInFlowDelay
-        zimbraMtaLmdbMapSize
-        zimbraMtaLmtpConnectionCacheTimeLimit
-        zimbraMtaLmtpHostLookup
-        zimbraMtaLmtpTlsCiphers
-        zimbraMtaLmtpTlsLoglevel
-        zimbraMtaLmtpTlsMandatoryCiphers
-        zimbraMtaLmtpTlsMandatoryProtocols
-        zimbraMtaLmtpTlsProtocols
-        zimbraMtaLmtpTlsSecurityLevel
-        zimbraMtaMailqPath
-        zimbraMtaManpageDirectory
-        zimbraMtaMaxUse
-        zimbraMtaMaximalBackoffTime
-        zimbraMtaMaximalQueueLifetime
-        zimbraMtaMilterCommandTimeout
-        zimbraMtaMilterConnectTimeout
-        zimbraMtaMilterContentTimeout
-        zimbraMtaMilterDefaultAction
-        zimbraMtaMinimalBackoffTime
-        zimbraMtaMyDestination
-        zimbraMtaMyNetworks
-        zimbraMtaNewaliasesPath
-        zimbraMtaNotifyClasses
-        zimbraMtaPolicyTimeLimit
-        zimbraMtaPostscreenAccessList
-        zimbraMtaPostscreenBareNewlineAction
-        zimbraMtaPostscreenBareNewlineEnable
-        zimbraMtaPostscreenBareNewlineTTL
-        zimbraMtaPostscreenBlacklistAction
-        zimbraMtaPostscreenCacheCleanupInterval
-        zimbraMtaPostscreenCacheRetentionTime
-        zimbraMtaPostscreenCommandCountLimit
-        zimbraMtaPostscreenDnsblAction
-        zimbraMtaPostscreenDnsblMaxTTL
-        zimbraMtaPostscreenDnsblMinTTL
-        zimbraMtaPostscreenDnsblTTL
-        zimbraMtaPostscreenDnsblThreshold
-        zimbraMtaPostscreenDnsblTimeout
-        zimbraMtaPostscreenDnsblWhitelistThreshold
-        zimbraMtaPostscreenGreetAction
-        zimbraMtaPostscreenGreetTTL
-        zimbraMtaPostscreenNonSmtpCommandAction
-        zimbraMtaPostscreenNonSmtpCommandEnable
-        zimbraMtaPostscreenNonSmtpCommandTTL
-        zimbraMtaPostscreenPipeliningAction
-        zimbraMtaPostscreenPipeliningEnable
-        zimbraMtaPostscreenPipeliningTTL
-        zimbraMtaPostscreenWatchdogTimeout
-        zimbraMtaPostscreenWhitelistInterfaces
-        zimbraMtaPropagateUnmatchedExtensions
-        zimbraMtaQueueDirectory
-        zimbraMtaQueueRunDelay
-        zimbraMtaRestriction
-        zimbraMtaSaslAuthEnable
-        zimbraMtaSaslSmtpdMechList
-        zimbraMtaSendmailPath
-        zimbraMtaSmtpCnameOverridesServername
-        zimbraMtaSmtpDnsSupportLevel
-        zimbraMtaSmtpHeloName
-        zimbraMtaSmtpSaslAuthEnable
-        zimbraMtaSmtpSaslSecurityOptions
-        zimbraMtaSmtpTlsCiphers
-        zimbraMtaSmtpTlsDaneInsecureMXPolicy
-        zimbraMtaSmtpTlsLoglevel
-        zimbraMtaSmtpTlsMandatoryCiphers
-        zimbraMtaSmtpTlsMandatoryProtocols
-        zimbraMtaSmtpTlsProtocols
-        zimbraMtaSmtpTlsSecurityLevel
-        zimbraMtaSmtpTransportRateDelay
-        zimbraMtaSmtpdBanner
-        zimbraMtaSmtpdClientAuthRateLimit
-        zimbraMtaSmtpdClientPortLogging
-        zimbraMtaSmtpdClientRestrictions
-        zimbraMtaSmtpdDataRestrictions
-        zimbraMtaSmtpdErrorSleepTime
-        zimbraMtaSmtpdHardErrorLimit
-        zimbraMtaSmtpdHeloRequired
-        zimbraMtaSmtpdProxyTimeout
-        zimbraMtaSmtpdRejectUnlistedRecipient
-        zimbraMtaSmtpdRejectUnlistedSender
-        zimbraMtaSmtpdSaslAuthenticatedHeader
-        zimbraMtaSmtpdSaslSecurityOptions
-        zimbraMtaSmtpdSaslTlsSecurityOptions
-        zimbraMtaSmtpdSoftErrorLimit
-        zimbraMtaSmtpdTlsAskCcert
-        zimbraMtaSmtpdTlsCcertVerifydepth
-        zimbraMtaSmtpdTlsCiphers
-        zimbraMtaSmtpdTlsLoglevel
-        zimbraMtaSmtpdTlsMandatoryCiphers
-        zimbraMtaSmtpdTlsMandatoryProtocols
-        zimbraMtaSmtpdTlsProtocols
-        zimbraMtaSmtpdTlsReceivedHeader
-        zimbraMtaSmtpdVirtualTransport
-        zimbraMtaStpdSoftErrorLimit
-        zimbraMtaTlsAppendDefaultCA
-        zimbraMtaTlsAuthOnly
-        zimbraMtaTlsSecurityLevel
-        zimbraMtaTransportMaps
-        zimbraMtaUnverifiedRecipientDeferCode
-        zimbraMtaVirtualAliasDomains
-        zimbraMtaVirtualAliasExpansionLimit
-        zimbraMtaVirtualAliasMaps
-        zimbraMtaVirtualMailboxDomains
-        zimbraMtaVirtualMailboxMaps
-        zimbraNetworkAdminEnabled
-        zimbraNetworkAdminNGEnabled
-        zimbraNetworkMobileNGEnabled
-        zimbraNetworkModulesNGEnabled
-        zimbraNotebookFolderCacheSize
-        zimbraNotebookMaxCachedTemplatesPerFolder
-        zimbraNotebookPageCacheSize
-        zimbraNotifyBindPort
-        zimbraNotifySSLBindPort
-        zimbraNotifySSLServerEnabled
-        zimbraNotifyServerEnabled
-        zimbraOpenImapFolderRequestChunkSize
-        zimbraOpenidConsumerStatelessModeEnabled
-        zimbraPop3BindOnStartup
-        zimbraPop3BindPort
-        zimbraPop3CleartextLoginEnabled
-        zimbraPop3ExposeVersionOnBanner
-        zimbraPop3MaxConnections
-        zimbraPop3NumThreads
-        zimbraPop3ProxyBindPort
-        zimbraPop3SSLBindOnStartup
-        zimbraPop3SSLBindPort
-        zimbraPop3SSLProxyBindPort
-        zimbraPop3SSLServerEnabled
-        zimbraPop3SaslGssapiEnabled
-        zimbraPop3ServerEnabled
-        zimbraPop3ShutdownGraceSeconds
-        zimbraPrevFoldersToTrackMax
-        zimbraRedoLogArchiveDir
-        zimbraRedoLogCrashRecoveryLookbackSec
-        zimbraRedoLogDeleteOnRollover
-        zimbraRedoLogEnabled
-        zimbraRedoLogFsyncIntervalMS
-        zimbraRedoLogLogPath
-        zimbraRedoLogRolloverFileSizeKB
-        zimbraRedoLogRolloverHardMaxFileSizeKB
-        zimbraRedoLogRolloverMinFileAge
-        zimbraRemoteImapBindPort
-        zimbraRemoteImapSSLBindPort
-        zimbraRemoteImapSSLServerEnabled
-        zimbraRemoteImapServerEnabled
-        zimbraRemoteManagementCommand
-        zimbraRemoteManagementPort
-        zimbraRemoteManagementPrivateKeyPath
-        zimbraRemoteManagementUser
-        zimbraReverseProxyAcceptMutex
-        zimbraReverseProxyAdminEnabled
-        zimbraReverseProxyAvailableLookupTargets
-        zimbraReverseProxyClientCertMode
-        zimbraReverseProxyConnectTimeout
-        zimbraReverseProxyDnsLookupInServerEnabled
-        zimbraReverseProxyExactServerVersionCheck
-        zimbraReverseProxyGenConfigPerVirtualHostname
-        zimbraReverseProxyHttpEnabled
-        zimbraReverseProxyIPThrottleWhitelistTime
-        zimbraReverseProxyImapEnabledCapability
-        zimbraReverseProxyImapExposeVersionOnBanner
-        zimbraReverseProxyImapSaslGssapiEnabled
-        zimbraReverseProxyImapSaslPlainEnabled
-        zimbraReverseProxyImapStartTlsMode
-        zimbraReverseProxyInactivityTimeout
-        zimbraReverseProxyLogLevel
-        zimbraReverseProxyLookupTarget
-        zimbraReverseProxyMailEnabled
-        zimbraReverseProxyMailImapEnabled
-        zimbraReverseProxyMailImapsEnabled
-        zimbraReverseProxyMailPop3Enabled
-        zimbraReverseProxyMailPop3sEnabled
-        zimbraReverseProxyPassErrors
-        zimbraReverseProxyPop3EnabledCapability
-        zimbraReverseProxyPop3ExposeVersionOnBanner
-        zimbraReverseProxyPop3SaslGssapiEnabled
-        zimbraReverseProxyPop3SaslPlainEnabled
-        zimbraReverseProxyPop3StartTlsMode
-        zimbraReverseProxyRouteLookupTimeout
-        zimbraReverseProxyRouteLookupTimeoutCache
-        zimbraReverseProxySNIEnabled
-        zimbraReverseProxySSLCiphers
-        zimbraReverseProxySSLProtocols
-        zimbraReverseProxySSLSessionCacheSize
-        zimbraReverseProxySSLSessionTimeout
-        zimbraReverseProxySSLToUpstreamEnabled
-        zimbraReverseProxyStrictServerNameEnabled
-        zimbraReverseProxyUpstreamConnectTimeout
-        zimbraReverseProxyUpstreamEwsServers
-        zimbraReverseProxyUpstreamFairShmSize
-        zimbraReverseProxyUpstreamLoginServers
-        zimbraReverseProxyUpstreamPollingTimeout
-        zimbraReverseProxyUpstreamReadTimeout
-        zimbraReverseProxyUpstreamSendTimeout
-        zimbraReverseProxyWorkerConnections
-        zimbraReverseProxyWorkerProcesses
-        zimbraReverseProxyXmppBoshEnabled
-        zimbraReverseProxyXmppBoshLocalHttpBindURL
-        zimbraReverseProxyXmppBoshSSL
-        zimbraReverseProxyXmppBoshTimeout
-        zimbraReverseProxyZmlookupCachingEnabled
-        zimbraSSLCertificate
-        zimbraSSLExcludeCipherSuites
-        zimbraSSLPrivateKey
-        zimbraSaslGssapiRequiresTls
-        zimbraScheduledTaskNumThreads
-        zimbraServerVersion
-        zimbraServerVersionBuild
-        zimbraServerVersionMajor
-        zimbraServerVersionMicro
-        zimbraServerVersionMinor
-        zimbraServerVersionType
-        zimbraServiceEnabled
-        zimbraServiceHostname
-        zimbraServiceInstalled
-        zimbraShareNotificationMtaAuthRequired
-        zimbraShareNotificationMtaConnectionType
-        zimbraShareNotificationMtaEnabled
-        zimbraSharingUpdatePublishInterval
-        zimbraShortTermAllEffectiveRightsCacheExpiration
-        zimbraShortTermAllEffectiveRightsCacheSize
-        zimbraShortTermGranteeCacheExpiration
-        zimbraShortTermGranteeCacheSize
-        zimbraSieveFeatureVariablesEnabled
-        zimbraSieveRejectEnabled
-        zimbraSmimeOCSPEnabled
-        zimbraSmtpHostname
-        zimbraSmtpPort
-        zimbraSmtpSendPartial
-        zimbraSmtpTimeout
-        zimbraSoapExposeVersion
-        zimbraSoapRequestMaxSize
-        zimbraSpellAvailableDictionary
-        zimbraSpellCheckURL
-        zimbraSshPublicKey
-        zimbraStatThreadNamePrefix
-        zimbraTableMaintenanceGrowthFactor
-        zimbraTableMaintenanceMaxRows
-        zimbraTableMaintenanceMinRows
-        zimbraTableMaintenanceOperation
-        zimbraThreadMonitorEnabled
-        zimbraVirusDefinitionsUpdateFrequency
-        zimbraWebGzipEnabled
-        zimbraXMPPEnabled
-        zimbraZimletJspEnabled
-      ]
-      attr_accessor *INSTANCE_VARIABLE_KEYS
-      attr_accessor :name, :id
-
-      def all_instance_variable_keys
-        INSTANCE_VARIABLE_KEYS
-      end
+    class Server < Base::Object
+      include HasSoapAdminConnector
 
       def mta_queues
-        @mta_queues ||= mta_queues!
-      end
-
-      def mta_queues!
-        MtaQueuesCollection.new self
+        @mta_queues ||= MtaQueuesCollection.new(self)
       end
 
       def backups
-        @backups ||= backups!
-      end
-
-      def backups!
-        BackupsCollection.new self
+        @backups ||= BackupsCollection.new(self)
       end
 
       def accounts
         @accounts ||= ServerAccountsCollection.new(self)
       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
     end
   end
 end

data/lib/zm/client/server/server_jsns_initializer.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    # class for initialize account
+    class ServerJsnsInitializer < Base::BaseJsnsInitializer
+      class << self
+        def create(parent, json)
+          item = Server.new(parent)
+
+          update(item, json)
+        end
+      end
+    end
+  end
+end

data/lib/zm/client/server/servers_builder.rb

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

data/lib/zm/client/server/servers_collection.rb

@@ -3,6 +3,7 @@
 module Zm
   module Client
     # Collection servers
+    # TODO: modifier l'héritage car SearchDirectoryRequest n'implémente pas le type Server
     class ServersCollection < Base::AdminObjectsCollection
       def initialize(parent)
         @child_class = Server
@@ -11,10 +12,15 @@ module Zm
         super(parent)
       end
 
-      def find_by(hash)
-        rep = sac.get_server(hash.values.first, hash.keys.first)
-        entry = rep[:Body][:GetServerResponse][:server].first
-        build_from_entry(entry)
+      def find_by!(hash)
+        soap_request = SoapElement.admin(SoapAdminConstants::GET_SERVER_REQUEST)
+        node_server = SoapElement.create(SoapConstants::SERVER).add_attribute(SoapConstants::BY, hash.keys.first).add_content(hash.values.first)
+        soap_request.add_node(node_server)
+        soap_request.add_attribute(SoapConstants::ATTRS, attrs_comma) unless @attrs.nil?
+        entry = sac.invoke(soap_request)[:GetServerResponse][:server].first
+
+        reset_query_params
+        ServerJsnsInitializer.create(@parent, entry)
       end
 
       def where(service)
@@ -25,7 +31,9 @@ module Zm
       private
 
       def make_query
-        sac.get_all_servers(@service)
+        soap_request = SoapElement.admin(SoapAdminConstants::GET_ALL_SERVERS_REQUEST)
+        soap_request.add_attribute(SoapConstants::SERVICE, @service) unless @service.nil?
+        sac.invoke(soap_request)
       end
     end
   end

data/lib/zm/client/server.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'zm/client/server/server'
+require 'zm/client/server/server_jsns_initializer'
 require 'zm/client/server/servers_builder'
 require 'zm/client/server/servers_collection'
 require 'zm/client/server/server_accounts_collection'

data/lib/zm/client/share/share.rb

@@ -3,50 +3,12 @@
 module Zm
   module Client
     # class for account share
-    class Share < Base::AccountObject
-       INSTANCE_VARIABLE_KEYS = %i[
-         ownerId ownerEmail ownerName folderId folderUuid folderPath
-         view rights granteeType granteeId granteeName mid
-      ].freeze
+    class Share < Base::Object
+      attr_accessor :ownerId, :ownerEmail, :ownerName, :folderId, :folderUuid, :folderPath, :view, :rights,
+                    :granteeType, :granteeId, :granteeName, :mid
 
-      attr_accessor(*INSTANCE_VARIABLE_KEYS)
-
-      def initialize(parent, json = nil)
-        @parent = parent
-        init_from_json(json) if json.is_a?(Hash)
-        yield(self) if block_given?
-      end
-
-      def all_instance_variable_keys
-        INSTANCE_VARIABLE_KEYS
-      end
-
-      def create!
-        options = { grant: { gt: granteeType, d: granteeName, perm: rights } }
-        @parent.sacc.folder_action(
-          @parent.token,
-          :grant,
-          folderId,
-          options
-        )
-      end
-
-      def create_mountpoint!(name = nil)
-        name ||= default_mountpoint_name
-        @parent.sacc.create_mountpoint(
-          @parent.token,
-          FolderDefault::ROOT[:id],
-          name,
-          @view,
-          @ownerId,
-          @folderId
-        )
-      end
-
-      def default_mountpoint_name
-        folder_name = @folderPath[1..-1].split('/').last
-        owner_name = (@ownerName || @ownerEmail).tr('/', '-')
-        "#{folder_name} (#{owner_name})"
+      def mountpoints
+        @mountpoints ||= ShareMountPointsCollection.new(self)
       end
     end
   end

data/lib/zm/client/share/share_jsns_initializer.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    # class for account share
+    class ShareJsnsInitializer
+      class << self
+        def create(parent, json)
+          item = Share.new(parent)
+          update(item, json)
+        end
+
+        def update(item, json)
+          item.ownerId = json[:ownerId]
+          item.ownerEmail = json[:ownerEmail]
+          item.ownerName = json[:ownerName]
+          item.folderId = json[:folderId]
+          item.folderUuid = json[:folderUuid]
+          item.folderPath = json[:folderPath]
+          item.view = json[:view]
+          item.rights = json[:rights]
+          item.granteeType = json[:granteeType]
+          item.granteeId = json[:granteeId]
+          item.granteeName = json[:granteeName]
+          item.mid = json[:mid]
+
+          item
+        end
+      end
+    end
+  end
+end