ZOHOCRMSDK2_0 3.0.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03d299e56d131411933e4782f22b1dc9fa09c876cd65a499ee60bd4fed382c68
-  data.tar.gz: fb7567e5159da8d9c02ef5c81dc70e93b5156c46503559709c75a59115db254e
+  metadata.gz: fbd73e065c84249f4ca89a7a65e1610df644254e238973950a182f45deb4a9aa
+  data.tar.gz: b8c868c5db1b793b6c1b8790cc66908a23be1b9f594ea59090cb26bf898f350e
 SHA512:
-  metadata.gz: 7767ac62c6088b5fd12a0b96f431cbf7b8d2d1e7d02edfd087e5b3e642b70a1a95bef570ed54954dd2d7899807e64aabbd33069c0086607a4343858c52d98bf7
-  data.tar.gz: 669b4d9ee236a466f57a04f5248bae2e98e1a6a937f2332802604105e7a71aeb971abf55ea1ca257aab26de939166322f9d8737045a3ced9bdfa165c3aa74810
+  metadata.gz: 30afef4e1d99a19f48a6db2b509403213f96cc3bb507c2a2a92dc9ba526dcf4c1fb30642cc7e90789e962b919ad8f591674906a4870c3e94d0b8531421e1d2f9
+  data.tar.gz: d4d666d871ea1b63c478b833d039f2e696f28ccf7c5ec68cf5b1707b3c9dbb7e9e959f51ab35781d160a5ee710d20d4bf3a0d56217012e405d79d774a880f923

data/src/ZOHOCRMSDK2_0.rb

@@ -265,6 +265,7 @@ require 'com/zoho/crm/api/dc/au_datacenter.rb'
 require 'com/zoho/crm/api/dc/cn_datacenter.rb'
 require 'com/zoho/crm/api/dc/us_datacenter.rb'
 require 'com/zoho/crm/api/dc/datacenter.rb'
+require 'com/zoho/crm/api/dc/jp_datacenter.rb'
 require 'com/zoho/crm/api/files/file_operations.rb'
 require 'com/zoho/crm/api/files/body_wrapper.rb'
 require 'com/zoho/crm/api/files/action_handler.rb'

data/src/com/zoho/api/authenticator/oauth_token.rb

@@ -12,7 +12,7 @@ module ZOHOCRMSDK
   module Authenticator
     # This class gets and refreshes the tokens based on the expiry time.
     class OAuthToken < Token
-      attr_accessor :client_id , :client_secret ,:redirect_url ,:grant_token,:refresh_token, :access_token ,:user_mail ,:id ,:expires_in
+      attr_accessor :client_id, :client_secret, :redirect_url, :grant_token, :refresh_token, :access_token, :user_mail, :id, :expires_in
       @@sync_lock = Monitor.new
 
       # Creates an OAuthToken class instance with the specified parameters.
@@ -23,61 +23,68 @@ module ZOHOCRMSDK
       # @param redirect_url [string]  A String containing the OAuth redirect URL.
       # @param id [string] A String containing ID
       
-      def initialize(client_id:, client_secret:, grant_token: nil, refresh_token: nil, redirect_url: nil,id: nil)
-        error ={}
-        unless client_id.is_a?(String)
-          error[Constants::ERROR_HASH_FIELD] = Constants::CLIENT_ID
+      def initialize(client_id: nil, client_secret: nil, grant_token: nil, refresh_token: nil, redirect_url: nil, id: nil, access_token: nil)
+        error = {}
 
-          error[Constants::ERROR_HASH_EXPECTED_TYPE] = String
+        if grant_token.nil? && refresh_token.nil? && id.nil? && access_token.nil?
+          raise SDKException.new(Constants::MANDATORY_VALUE_ERROR, Constants::MANDATORY_KEY_ERROR, Constants::OAUTH_MANDATORY_KEYS)
+        end
 
-          error[Constants::ERROR_HASH_CLASS] = OAuthToken.class
+        if id.nil? and access_token.nil?
+          unless client_id.is_a?(String)
+            error[Constants::ERROR_HASH_FIELD] = Constants::CLIENT_ID
 
-          raise SDKException.new(Constants::INPUT_ERROR, nil, error, nil)
+            error[Constants::ERROR_HASH_EXPECTED_TYPE] = String
 
-        end
+            error[Constants::ERROR_HASH_CLASS] = OAuthToken.class
 
-        unless client_secret.is_a?(String)
-          error[Constants::ERROR_HASH_FIELD] = Constants::CLIENT_SECRET
+            raise SDKException.new(Constants::INPUT_ERROR, nil, error, nil)
 
-          error[Constants::ERROR_HASH_EXPECTED_TYPE] = String
+          end
 
-          error[Constants::ERROR_HASH_CLASS] = OAuthToken.class
+          unless client_secret.is_a?(String)
+            error[Constants::ERROR_HASH_FIELD] = Constants::CLIENT_SECRET
 
-          raise SDKException.new(Constants::INPUT_ERROR, nil, error, nil)
+            error[Constants::ERROR_HASH_EXPECTED_TYPE] = String
 
-        end
+            error[Constants::ERROR_HASH_CLASS] = OAuthToken.class
 
-        if !grant_token.nil? && !grant_token.is_a?(String)
-          error[Constants::ERROR_HASH_FIELD] = Constants::GRANT_TOKEN
+            raise SDKException.new(Constants::INPUT_ERROR, nil, error, nil)
 
-          error[Constants::ERROR_HASH_EXPECTED_TYPE] = String
+          end
 
-          error[Constants::ERROR_HASH_CLASS] = OAuthToken.class
+          if !grant_token.nil? && !grant_token.is_a?(String)
+            error[Constants::ERROR_HASH_FIELD] = Constants::GRANT_TOKEN
 
-          raise SDKException.new(Constants::INPUT_ERROR, nil, error, nil)
+            error[Constants::ERROR_HASH_EXPECTED_TYPE] = String
 
-        end
+            error[Constants::ERROR_HASH_CLASS] = OAuthToken.class
 
-        if !refresh_token.nil? && !refresh_token.is_a?(String)
-          error[Constants::ERROR_HASH_FIELD] = Constants::REFRESH_TOKEN
+            raise SDKException.new(Constants::INPUT_ERROR, nil, error, nil)
 
-          error[Constants::ERROR_HASH_EXPECTED_TYPE] = String
+          end
 
-          error[Constants::ERROR_HASH_CLASS] = OAuthToken.class
+          if !refresh_token.nil? && !refresh_token.is_a?(String)
+            error[Constants::ERROR_HASH_FIELD] = Constants::REFRESH_TOKEN
 
-          raise SDKException.new(Constants::INPUT_ERROR, nil, error, nil)
+            error[Constants::ERROR_HASH_EXPECTED_TYPE] = String
 
-        end
+            error[Constants::ERROR_HASH_CLASS] = OAuthToken.class
 
-        if !redirect_url.nil? && !redirect_url.is_a?(String)
-          error[Constants::ERROR_HASH_FIELD] = Constants::REDIRECT_URL
+            raise SDKException.new(Constants::INPUT_ERROR, nil, error, nil)
 
-          error[Constants::ERROR_HASH_EXPECTED_TYPE] = String
+          end
 
-          error[Constants::ERROR_HASH_CLASS] = OAuthToken.class
+          if !redirect_url.nil? && !redirect_url.is_a?(String)
+            error[Constants::ERROR_HASH_FIELD] = Constants::REDIRECT_URL
 
-          raise SDKException.new(Constants::INPUT_ERROR, nil, error, nil)
+            error[Constants::ERROR_HASH_EXPECTED_TYPE] = String
+
+            error[Constants::ERROR_HASH_CLASS] = OAuthToken.class
 
+            raise SDKException.new(Constants::INPUT_ERROR, nil, error, nil)
+
+          end
         end
 
         if !id.nil? && !id.is_a?(String)
@@ -91,15 +98,16 @@ module ZOHOCRMSDK
 
         end
 
-        if  grant_token.nil? && refresh_token.nil?
-          error[Constants::ERROR_HASH_FIELD] = Constants::TYPE
+        if !access_token.nil? && !access_token.is_a?(String)
+          error[Constants::ERROR_HASH_FIELD] = Constants::ACCESS_TOKEN
 
-          error[Constants::ERROR_HASH_EXPECTED_TYPE] = Constants::EXPECTED_TOKEN_TYPES
+          error[Constants::ERROR_HASH_EXPECTED_TYPE] = String
 
           error[Constants::ERROR_HASH_CLASS] = OAuthToken.class
 
           raise SDKException.new(Constants::INPUT_ERROR, nil, error, nil)
         end
+
         @client_id = client_id
 
         @client_secret = client_secret
@@ -110,7 +118,7 @@ module ZOHOCRMSDK
 
         @grant_token = grant_token
 
-        @access_token = nil
+        @access_token = access_token
 
         @expires_in = nil
 
@@ -140,7 +148,7 @@ module ZOHOCRMSDK
 
           if oauth_token.nil?
             token = @refresh_token.nil? ? generate_access_token(user, store).access_token : refresh_access_token(user, store).access_token
-          elsif oauth_token.expires_in.to_f - get_current_time_in_millis < 5000
+          elsif !oauth_token.expires_in.nil? && oauth_token.expires_in.to_f - get_current_time_in_millis < 5000
             SDKLog::SDKLogger.info(Constants::REFRESH_TOKEN_MESSAGE)
             token = oauth_token.refresh_access_token(user, store).access_token
           else
@@ -177,7 +185,7 @@ module ZOHOCRMSDK
 
           generate_id()
 
-          store.save_token(user,self)
+          store.save_token(user, self)
         rescue SDKException => e
           raise e
         rescue StandardError => e
@@ -193,8 +201,6 @@ module ZOHOCRMSDK
 
         json_body[Constants::CLIENT_SECRET] = @client_secret
 
-        json_body[Constants::REDIRECT_URI] = @redirect_url if !@redirect_url.nil?
-
         json_body[Constants::GRANT_TYPE] = Constants::REFRESH_TOKEN
 
         json_body[Constants::REFRESH_TOKEN] = @refresh_token
@@ -204,9 +210,11 @@ module ZOHOCRMSDK
         begin
           parse_response(response)
 
-          generate_id()
+          if @id.nil?
+            generate_id()
+          end
 
-          store.save_token(user,self)
+          store.save_token(user, self)
         rescue SDKException => e
           raise e
         rescue StandardError => e
@@ -268,7 +276,7 @@ module ZOHOCRMSDK
         id = ""
         email = Initializer.get_initializer.user.email
         environment = Initializer.get_initializer.environment.name
-        id = id + "ruby_" +email[0..email.index(Constants::AT) - 1] + Constants::UNDERSCORE
+        id = id + (Constants::RUBY) + email[0..email.index(Constants::AT) - 1] + Constants::UNDERSCORE
         id = id + environment + Constants::UNDERSCORE + @refresh_token[@refresh_token.length-4..@refresh_token.length-1]
         @id = id
       end

data/src/com/zoho/crm/api/dc/jp_datacenter.rb

@@ -0,0 +1,21 @@
+require_relative 'datacenter'
+
+module ZOHOCRMSDK
+  module DC
+    class JPDataCenter < DataCenter
+      def initialize; end
+
+      def get_iam_url
+        'https://accounts.zoho.jp/oauth/v2/token'
+      end
+
+      def get_file_upload_url
+        'https://content.zohoapis.jp'
+      end
+
+      PRODUCTION = Environment.new('https://www.zohoapis.jp', JPDataCenter.new.get_iam_url, JPDataCenter.new.get_file_upload_url,"jp_prd")
+      SANDBOX = Environment.new('https://sandbox.zohoapis.jp', JPDataCenter.new.get_iam_url, JPDataCenter.new.get_file_upload_url,"jp_sdb")
+      DEVELOPER = Environment.new('https://developer.zohoapis.jp', JPDataCenter.new.get_iam_url, JPDataCenter.new.get_file_upload_url,"jp_dev")
+    end
+  end
+end

data/src/com/zoho/crm/api/exception/sdk_exception.rb

@@ -8,7 +8,7 @@ module ZOHOCRMSDK
     # @param message A String containing the Exception error message.
     # @param details A hash containing the error response.
     # @param cause An Exception class instance.
-    def initialize(code, message, details = nil, cause = nil)
+    def initialize(code, message, details=nil, cause=nil)
       @code = code
       @message = message
       @cause = cause

data/src/com/zoho/crm/api/initializer.rb

@@ -1,3 +1,20 @@
+=begin
+Copyright (c) 2021, ZOHO CORPORATION PRIVATE LIMITED 
+All rights reserved. 
+ 
+   Licensed under the Apache License, Version 2.0 (the "License"); 
+   you may not use this file except in compliance with the License. 
+   You may obtain a copy of the License at 
+ 
+       http://www.apache.org/licenses/LICENSE-2.0 
+ 
+   Unless required by applicable law or agreed to in writing, software 
+   distributed under the License is distributed on an "AS IS" BASIS, 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+   See the License for the specific language governing permissions and 
+   limitations under the License.
+=end
+
 require 'uri'
 require 'net/http'
 require 'cgi'
@@ -17,7 +34,7 @@ module ZOHOCRMSDK
       @@json_details
     end
 
-    def self.initialize(user:, environment:, token:, store:, sdk_config:, resources_path:, log: nil, request_proxy: nil)
+    def self.initialize(user:, environment:, token:, store: nil, sdk_config: nil, resources_path: nil, log: nil, request_proxy: nil)
       error = {}
 
       require_relative 'user_signature'
@@ -55,7 +72,7 @@ module ZOHOCRMSDK
 
       require_relative '../../api/authenticator/store/token_store'
 
-      unless store.is_a?(Store::TokenStore)
+      if !store.nil? && !store.is_a?(Store::TokenStore)
         error[Constants::ERROR_HASH_FIELD] = 'store'
 
         error[Constants::ERROR_HASH_EXPECTED_TYPE] = Store::TokenStore
@@ -66,7 +83,7 @@ module ZOHOCRMSDK
 
       require_relative 'sdk_config'
 
-      unless sdk_config.is_a?(SDKConfig)
+      if !sdk_config.nil? && !sdk_config.is_a?(SDKConfig)
         error[Constants::ERROR_HASH_FIELD] = 'sdk_config'
 
         error[Constants::ERROR_HASH_EXPECTED_TYPE] = SDKConfig
@@ -75,20 +92,30 @@ module ZOHOCRMSDK
 
       end
 
-      if !request_proxy.nil? && !sdk_config.is_a?(RequestProxy)
-
+      if !request_proxy.nil? && !request_proxy.is_a?(RequestProxy)
         raise SDKException.new(Constants::INITIALIZATION_ERROR, Constants::REQUEST_PROXY_ERROR, nil, nil)
       end
 
-      if resources_path.nil? || resources_path.empty?
-        raise SDKException.new(Constants::INITIALIZATION_ERROR, Constants::RESOURCE_PATH_ERROR_MESSAGE, nil, nil)
+      if store.nil?
+        require_relative '../../api/authenticator/store/file_store'
+
+        store = Store::FileStore.new(File.join(Dir.pwd, Constants::TOKEN_FILE))
+      
+      end
+      
+      if sdk_config.nil?
+        sdk_config = SDKConfig.new()
+      end
+      
+      if resources_path.nil?
+        resources_path = Dir.pwd
       end
 
       if !File.directory?(resources_path)
         raise SDKException.new(Constants::INITIALIZATION_ERROR, Constants::RESOURCE_PATH_INVALID_ERROR_MESSAGE, nil, nil)
       end
 
-      log = SDKLog::Log.initialize(level: Levels::INFO, path: File.join(Dir.pwd, Constants::LOGFILE_NAME)) if log.nil? 
+      log = SDKLog::Log.initialize(level: Levels::INFO, path: File.join(Dir.pwd, Constants::LOG_FILE_NAME)) if log.nil? 
       SDKLog::SDKLogger.initialize(log)
 
       @@initializer = Initializer.new

data/src/com/zoho/crm/api/parameter_map.rb

@@ -25,7 +25,7 @@ module ZOHOCRMSDK
       end
 
       if value.nil?
-        raise SDKException.new(Constants::PARAMETER_NULL_ERROR, header_name + Constants::NULL_VALUE_ERROR_MESSAGE)
+        raise SDKException.new(Constants::PARAMETER_NULL_ERROR, param_name + Constants::NULL_VALUE_ERROR_MESSAGE)
       end
 
       param_value = nil

data/src/com/zoho/crm/api/util/constants.rb

@@ -157,7 +157,7 @@ module ZOHOCRMSDK
 
     ZOHO_SDK = 'X-ZOHO-SDK'
 
-    SDK_VERSION = '3.0.0'
+    SDK_VERSION = '6.0.0'
 
     ZOHO_API_VERSION = '2.0'
 
@@ -167,13 +167,13 @@ module ZOHOCRMSDK
 
     IS_GENERATE_REQUEST_BODY = [REQUEST_METHOD_POST,REQUEST_METHOD_PUT,REQUEST_METHOD_PATCH]
 
-    REQUIRED_IN_UPDATE = 'required_in_update'
+    REQUIRED_IN_UPDATE = 'required-in-update'
 
     PHOTO = "photo"
       
     CRM = "crm"
     
-    PHOTO_SUPPORTED_MODULES = ["leads", "contacts", "accounts", "products", "vendors", "deals", "cases", "solutions"]
+    PHOTO_SUPPORTED_MODULES = ["leads", "contacts", "accounts", "products", "vendors"]
 
     PARAMETER_NULL_ERROR = 'NULL PARAMETER ERROR'
 
@@ -275,7 +275,7 @@ module ZOHOCRMSDK
 
     CALLS = 'Calls'
 
-    SKIP_MANDATORY = 'skip_mandatory'
+    SKIP_MANDATORY = 'skip-mandatory'
 
     CALL_DURATION = 'Call_Duration'
 
@@ -571,7 +571,9 @@ module ZOHOCRMSDK
 
     KEY_MODIFIED = 'key_modified'
 
-    LOGFILE_NAME = 'SDKLogs.log'
+    LOG_FILE_NAME = 'sdk_logs.log'
+
+    TOKEN_FILE = "sdk_tokens.txt"
 
     INITIALIZATION_ERROR = 'INITIALIZATION ERROR'
 
@@ -635,5 +637,10 @@ module ZOHOCRMSDK
 
     SKIP_MODULES = ['deals']
 
+    RUBY = "ruby_"
+
+    OAUTH_MANDATORY_KEYS = ["grant_token", "refresh_token", "id", "access_token"]
+
+    OWNER_LOOKUP = "ownerlookup"
   end
 end

data/src/com/zoho/crm/api/util/converter.rb

@@ -56,9 +56,10 @@ module ZOHOCRMSDK
         var_type = nil
         check = true
 
-        unless value.nil? 
+        unless value.nil?
+          var_type = value.class.name
           if key_details.key? Constants::INTERFACE and key_details[Constants::INTERFACE] == true
-            json_details = Initializer.get_initializer.json_details
+            json_details = Initializer.json_details
             interface_details = json_details[key_details[Constants::STRUCTURE_NAME]]
             classes = interface_details[Constants::CLASSES]
             check = false
@@ -101,6 +102,11 @@ module ZOHOCRMSDK
           if type.downcase != Util::Utility.path_to_package(var_type).downcase 
             check = false
           end
+          if !check
+            if Object.const_get(var_type).new.is_a? Object.const_get(Util::Utility.class_to_load(type))
+              check = true
+            end
+          end
         end
         if !check 
           error[Constants::ERROR_HASH_CLASS] = class_name

data/src/com/zoho/crm/api/util/utility.rb

@@ -591,8 +591,9 @@ module ZOHOCRMSDK
           return
         end
         field_detail[Constants::LOOKUP] = true if data_type.downcase.include? Constants::LOOKUP
-        field_detail[Constants::SKIP_MANDATORY] = true if data_type.downcase.include? Constants::CONSENT_LOOKUP
-
+        if (data_type.downcase.include? Constants::CONSENT_LOOKUP) || (data_type.downcase.include? Constants::OWNER_LOOKUP)
+          field_detail[Constants::SKIP_MANDATORY] = true
+        end
         if @@apitype_vs_structurename.include? data_type
           field_detail[Constants::STRUCTURE_NAME] = @@apitype_vs_structurename[data_type]
         end