ZOHOCRMSDK2_0 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03d299e56d131411933e4782f22b1dc9fa09c876cd65a499ee60bd4fed382c68
-  data.tar.gz: fb7567e5159da8d9c02ef5c81dc70e93b5156c46503559709c75a59115db254e
+  metadata.gz: 95865623be0d4e3e6d16852e488ae76ca600dd87ca4172a5d1ffc8e1295a3fc8
+  data.tar.gz: b73357f1f0a84c80eaaeb536448f1909b5234c284bc77d8f45d096f6e3d1fd55
 SHA512:
-  metadata.gz: 7767ac62c6088b5fd12a0b96f431cbf7b8d2d1e7d02edfd087e5b3e642b70a1a95bef570ed54954dd2d7899807e64aabbd33069c0086607a4343858c52d98bf7
-  data.tar.gz: 669b4d9ee236a466f57a04f5248bae2e98e1a6a937f2332802604105e7a71aeb971abf55ea1ca257aab26de939166322f9d8737045a3ced9bdfa165c3aa74810
+  metadata.gz: c3fe08e3bdeb1104f3840d07e8865e38262255783dfcef8310a5a590e56069337c80c5ba5dbec0161a086a45475ef79f382e469d9a217aff948e4163d5f6b7ae
+  data.tar.gz: 395d864f10ee6dba4807305e95badbad33e7c8b55218fe9775dbadf9b305adca35a09c755c27d84b7943b5a9955a7b69e1594b57a9aa60c8cf0ffa8f6d11596b

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

@@ -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(code:Constants::MANDATORY_VALUE_ERROR, message:Constants::MANDATORY_KEY_ERROR, details: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
@@ -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/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

@@ -17,7 +17,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 +55,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 +66,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 +75,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/util/constants.rb

@@ -157,7 +157,7 @@ module ZOHOCRMSDK
 
     ZOHO_SDK = 'X-ZOHO-SDK'
 
-    SDK_VERSION = '3.0.0'
+    SDK_VERSION = '4.0.0'
 
     ZOHO_API_VERSION = '2.0'
 
@@ -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,8 @@ module ZOHOCRMSDK
 
     SKIP_MODULES = ['deals']
 
+    RUBY = "ruby_"
+
+    OAUTH_MANDATORY_KEYS = ["grant_token", "refresh_token", "id", "access_token"]
   end
 end

data/src/version.rb

@@ -1,3 +1,3 @@
 module ZOHOCRMSDK
-  VERSION = '3.0.0'
+  VERSION = '4.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ZOHOCRMSDK2_0
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - ZOHO CRM API TEAM
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-24 00:00:00.000000000 Z
+date: 2021-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cgi