ZCRMSDK 2.1.0 → 3.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4754097d74e87ebd8d343c0667ba59a07c2ad8b91e60f93dfbcac3ac05bd7391
-  data.tar.gz: 9528461fca077395fe305ea54af17b06275ebcfa00cfb052f1414eb27df3cd9b
+  metadata.gz: 8904af6d2578e6476199b3d332c31aa201ba71b09a0696e530cc15d1ab48b5e0
+  data.tar.gz: 9ea0df2ce8f9db7f4c4223be625b4e0eb7f404074e5bef02754e387ef29e1e24
 SHA512:
-  metadata.gz: 434c2b3a036e8c48f334cfefb23d45307331cf508d284a56b05ad40d856cd20661c69f126624d2fa040be43dd383ad30c5526b195ecfadddb210878f1fc15d90
-  data.tar.gz: d6ed7370f2a3ce9ff9b3654ee35368daed99212397bafe772a0edeb43c8f2a5abb711fbc060839cb28a2c75a2a23d8fc514ad23e34dce5bdb9cb52c2440b38ce
+  metadata.gz: 3cbe40f9c9b7df36198203bf82e4b0f8252cb27e68cf888823ef8e59a2ab00fa518bf19a3080b1631783cbaa23951a29dd006eb4b81133727d9dfc2100941465
+  data.tar.gz: b55ab1856d5a12d99ce5bf785f053ce6e44dd7cc5e9a7557dceba4b1a7a9066311e5667ff4b3d275456a3ab511be602207ea037f40050431f0dd3190527c417b

data/src/ZCRMSDK.rb

@@ -1,5 +1,23 @@
 require 'version.rb'
 require 'com/zoho/crm/api/request_proxy.rb'
+require 'com/zoho/crm/api/pipeline/transfer_action_handler.rb'
+require 'com/zoho/crm/api/pipeline/stage.rb'
+require 'com/zoho/crm/api/pipeline/transfer_action_response.rb'
+require 'com/zoho/crm/api/pipeline/body_wrapper.rb'
+require 'com/zoho/crm/api/pipeline/transfer_action_wrapper.rb'
+require 'com/zoho/crm/api/pipeline/pipeline.rb'
+require 'com/zoho/crm/api/pipeline/action_handler.rb'
+require 'com/zoho/crm/api/pipeline/pipeline_operations.rb'
+require 'com/zoho/crm/api/pipeline/transfer_and_delete_wrapper.rb'
+require 'com/zoho/crm/api/pipeline/pick_list_value.rb'
+require 'com/zoho/crm/api/pipeline/action_wrapper.rb'
+require 'com/zoho/crm/api/pipeline/forecast_category.rb'
+require 'com/zoho/crm/api/pipeline/transfer_pipe_line.rb'
+require 'com/zoho/crm/api/pipeline/response_wrapper.rb'
+require 'com/zoho/crm/api/pipeline/api_exception.rb'
+require 'com/zoho/crm/api/pipeline/success_response.rb'
+require 'com/zoho/crm/api/pipeline/action_response.rb'
+require 'com/zoho/crm/api/pipeline/response_handler.rb'
 require 'com/zoho/crm/api/currencies/body_wrapper.rb'
 require 'com/zoho/crm/api/currencies/currencies_operations.rb'
 require 'com/zoho/crm/api/currencies/currency.rb'
@@ -35,17 +53,23 @@ require 'com/zoho/crm/api/record/participants.rb'
 require 'com/zoho/crm/api/record/remind_at.rb'
 require 'com/zoho/crm/api/record/carry_over_tags.rb'
 require 'com/zoho/crm/api/record/record.rb'
+require 'com/zoho/crm/api/record/wizard.rb'
 require 'com/zoho/crm/api/record/convert_body_wrapper.rb'
+require 'com/zoho/crm/api/record/price_book.rb'
 require 'com/zoho/crm/api/record/file_details.rb'
 require 'com/zoho/crm/api/record/action_wrapper.rb'
 require 'com/zoho/crm/api/record/deleted_records_handler.rb'
 require 'com/zoho/crm/api/record/convert_action_handler.rb'
+require 'com/zoho/crm/api/record/mass_update_territory.rb'
+require 'com/zoho/crm/api/record/multi_select_lookup.rb'
+require 'com/zoho/crm/api/record/multi_select_picklist.rb'
 require 'com/zoho/crm/api/record/mass_update.rb'
 require 'com/zoho/crm/api/record/mass_update_action_response.rb'
 require 'com/zoho/crm/api/record/deleted_record.rb'
 require 'com/zoho/crm/api/record/convert_action_wrapper.rb'
 require 'com/zoho/crm/api/record/territory.rb'
 require 'com/zoho/crm/api/record/mass_update_response.rb'
+require 'com/zoho/crm/api/record/widget.rb'
 require 'com/zoho/crm/api/record/mass_update_body_wrapper.rb'
 require 'com/zoho/crm/api/record/mass_update_success_response.rb'
 require 'com/zoho/crm/api/record/response_wrapper.rb'
@@ -55,18 +79,27 @@ require 'com/zoho/crm/api/record/comment.rb'
 require 'com/zoho/crm/api/record/file_handler.rb'
 require 'com/zoho/crm/api/record/api_exception.rb'
 require 'com/zoho/crm/api/record/mass_update_response_handler.rb'
+require 'com/zoho/crm/api/record/count_handler.rb'
 require 'com/zoho/crm/api/record/options.rb'
 require 'com/zoho/crm/api/record/field.rb'
 require 'com/zoho/crm/api/record/recurring_activity.rb'
+require 'com/zoho/crm/api/record/tax.rb'
+require 'com/zoho/crm/api/record/image_upload.rb'
 require 'com/zoho/crm/api/record/criteria.rb'
 require 'com/zoho/crm/api/record/mass_update_response_wrapper.rb'
 require 'com/zoho/crm/api/record/success_response.rb'
+require 'com/zoho/crm/api/record/count_wrapper.rb'
 require 'com/zoho/crm/api/record/action_response.rb'
 require 'com/zoho/crm/api/record/pricing_details.rb'
 require 'com/zoho/crm/api/record/response_handler.rb'
 require 'com/zoho/crm/api/record/successful_convert.rb'
 require 'com/zoho/crm/api/record/line_item_product.rb'
 require 'com/zoho/crm/api/record/mass_update_action_wrapper.rb'
+require 'com/zoho/crm/api/field_attachments/body_wrapper.rb'
+require 'com/zoho/crm/api/field_attachments/file_body_wrapper.rb'
+require 'com/zoho/crm/api/field_attachments/api_exception.rb'
+require 'com/zoho/crm/api/field_attachments/response_handler.rb'
+require 'com/zoho/crm/api/field_attachments/field_attachments_operations.rb'
 require 'com/zoho/crm/api/sdk_config.rb'
 require 'com/zoho/crm/api/util/api_http_connector.rb'
 require 'com/zoho/crm/api/util/form_data_converter.rb'
@@ -108,18 +141,31 @@ require 'com/zoho/crm/api/org/success_response.rb'
 require 'com/zoho/crm/api/org/action_response.rb'
 require 'com/zoho/crm/api/org/response_handler.rb'
 require 'com/zoho/crm/api/org/org.rb'
+require 'com/zoho/crm/api/inventory_templates/inventory_templates_operations.rb'
+require 'com/zoho/crm/api/inventory_templates/inventory_template.rb'
+require 'com/zoho/crm/api/inventory_templates/response_wrapper.rb'
+require 'com/zoho/crm/api/inventory_templates/api_exception.rb'
+require 'com/zoho/crm/api/inventory_templates/response_handler.rb'
 require 'com/zoho/crm/api/blue_print/body_wrapper.rb'
 require 'com/zoho/crm/api/blue_print/next_transition.rb'
 require 'com/zoho/crm/api/blue_print/blue_print_operations.rb'
 require 'com/zoho/crm/api/blue_print/process_info.rb'
 require 'com/zoho/crm/api/blue_print/blue_print.rb'
+require 'com/zoho/crm/api/blue_print/escalation.rb'
 require 'com/zoho/crm/api/blue_print/transition.rb'
 require 'com/zoho/crm/api/blue_print/response_wrapper.rb'
 require 'com/zoho/crm/api/blue_print/api_exception.rb'
 require 'com/zoho/crm/api/blue_print/validation_error.rb'
+require 'com/zoho/crm/api/blue_print/field.rb'
 require 'com/zoho/crm/api/blue_print/success_response.rb'
 require 'com/zoho/crm/api/blue_print/action_response.rb'
 require 'com/zoho/crm/api/blue_print/response_handler.rb'
+require 'com/zoho/crm/api/email_templates/email_template.rb'
+require 'com/zoho/crm/api/email_templates/attachment.rb'
+require 'com/zoho/crm/api/email_templates/response_wrapper.rb'
+require 'com/zoho/crm/api/email_templates/email_templates_operations.rb'
+require 'com/zoho/crm/api/email_templates/api_exception.rb'
+require 'com/zoho/crm/api/email_templates/response_handler.rb'
 require 'com/zoho/crm/api/related_records/body_wrapper.rb'
 require 'com/zoho/crm/api/related_records/action_handler.rb'
 require 'com/zoho/crm/api/related_records/related_records_operations.rb'
@@ -157,8 +203,8 @@ require 'com/zoho/crm/api/tags/action_response.rb'
 require 'com/zoho/crm/api/tags/merge_wrapper.rb'
 require 'com/zoho/crm/api/tags/response_handler.rb'
 require 'com/zoho/crm/api/header_map.rb'
+require 'com/zoho/crm/api/custom_views/shared_to.rb'
 require 'com/zoho/crm/api/custom_views/info.rb'
-require 'com/zoho/crm/api/custom_views/shared_details.rb'
 require 'com/zoho/crm/api/custom_views/translation.rb'
 require 'com/zoho/crm/api/custom_views/custom_view.rb'
 require 'com/zoho/crm/api/custom_views/range.rb'
@@ -259,6 +305,12 @@ 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/assignment_rules/assignment_rules_operations.rb'
+require 'com/zoho/crm/api/assignment_rules/assignment_rule.rb'
+require 'com/zoho/crm/api/assignment_rules/response_wrapper.rb'
+require 'com/zoho/crm/api/assignment_rules/api_exception.rb'
+require 'com/zoho/crm/api/assignment_rules/default_user.rb'
+require 'com/zoho/crm/api/assignment_rules/response_handler.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'
@@ -285,10 +337,12 @@ require 'com/zoho/crm/api/bulk_write/response_handler.rb'
 require 'com/zoho/crm/api/fields/private.rb'
 require 'com/zoho/crm/api/fields/association_details.rb'
 require 'com/zoho/crm/api/fields/module.rb'
+require 'com/zoho/crm/api/fields/external.rb'
 require 'com/zoho/crm/api/fields/currency.rb'
 require 'com/zoho/crm/api/fields/pick_list_value.rb'
 require 'com/zoho/crm/api/fields/view_type.rb'
 require 'com/zoho/crm/api/fields/lookup_field.rb'
+require 'com/zoho/crm/api/fields/multi_user_lookup.rb'
 require 'com/zoho/crm/api/fields/multi_select_lookup.rb'
 require 'com/zoho/crm/api/fields/auto_number.rb'
 require 'com/zoho/crm/api/fields/unique.rb'
@@ -301,9 +355,12 @@ require 'com/zoho/crm/api/fields/field.rb'
 require 'com/zoho/crm/api/fields/crypt.rb'
 require 'com/zoho/crm/api/fields/tool_tip.rb'
 require 'com/zoho/crm/api/fields/response_handler.rb'
+require 'com/zoho/crm/api/fields/history_tracking.rb'
+require 'com/zoho/crm/api/fields/maps.rb'
 require 'com/zoho/crm/api/parameter_map.rb'
 require 'com/zoho/crm/api/profiles/category.rb'
 require 'com/zoho/crm/api/profiles/permission_detail.rb'
+require 'com/zoho/crm/api/profiles/default_view.rb'
 require 'com/zoho/crm/api/profiles/section.rb'
 require 'com/zoho/crm/api/profiles/profile.rb'
 require 'com/zoho/crm/api/profiles/response_wrapper.rb'
@@ -324,6 +381,32 @@ require 'com/zoho/crm/api/share_records/api_exception.rb'
 require 'com/zoho/crm/api/share_records/success_response.rb'
 require 'com/zoho/crm/api/share_records/action_response.rb'
 require 'com/zoho/crm/api/share_records/response_handler.rb'
+require 'com/zoho/crm/api/send_mail/body_wrapper.rb'
+require 'com/zoho/crm/api/send_mail/action_handler.rb'
+require 'com/zoho/crm/api/send_mail/user_address.rb'
+require 'com/zoho/crm/api/send_mail/inventory_details.rb'
+require 'com/zoho/crm/api/send_mail/template.rb'
+require 'com/zoho/crm/api/send_mail/action_wrapper.rb'
+require 'com/zoho/crm/api/send_mail/data_subject_request.rb'
+require 'com/zoho/crm/api/send_mail/send_mail_operations.rb'
+require 'com/zoho/crm/api/send_mail/response_wrapper.rb'
+require 'com/zoho/crm/api/send_mail/api_exception.rb'
+require 'com/zoho/crm/api/send_mail/success_response.rb'
+require 'com/zoho/crm/api/send_mail/mail.rb'
+require 'com/zoho/crm/api/send_mail/action_response.rb'
+require 'com/zoho/crm/api/send_mail/response_handler.rb'
+require 'com/zoho/crm/api/wizards/node.rb'
+require 'com/zoho/crm/api/wizards/segment.rb'
+require 'com/zoho/crm/api/wizards/chart_data.rb'
+require 'com/zoho/crm/api/wizards/wizard.rb'
+require 'com/zoho/crm/api/wizards/connection.rb'
+require 'com/zoho/crm/api/wizards/container.rb'
+require 'com/zoho/crm/api/wizards/button.rb'
+require 'com/zoho/crm/api/wizards/wizards_operations.rb'
+require 'com/zoho/crm/api/wizards/response_wrapper.rb'
+require 'com/zoho/crm/api/wizards/api_exception.rb'
+require 'com/zoho/crm/api/wizards/screen.rb'
+require 'com/zoho/crm/api/wizards/response_handler.rb'
 require 'com/zoho/crm/api/query/body_wrapper.rb'
 require 'com/zoho/crm/api/query/response_wrapper.rb'
 require 'com/zoho/crm/api/query/query_operations.rb'

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

@@ -11,19 +11,20 @@ require_relative '../../crm/api/exception/sdk_exception'
 module Authenticator
   # This class gets and refreshes the tokens based on the expiry time.
   class OAuthToken < Token
+    attr_reader :client_id , :client_secret ,:redirect_url ,:grant_token
+    attr_accessor :refresh_token, :access_token ,:user_mail ,:id ,:expires_in
     @@sync_lock = Monitor.new
 
-    attr_accessor :client_id, :client_secret, :redirect_url, :grant_token, :refresh_token, :access_token, :expires_in, :user_mail, :id
-
     # Creates an OAuthToken class instance with the specified parameters.
     # @param client_id [string] A String containing the OAuth client id.
     # @param client_secret [string] A String containing the OAuth client secret.
+    # @param grant_token [string]  A String containing the grant token.
+    # @param refresh_token [string] A String containing the refresh token.
     # @param redirect_url [string]  A String containing the OAuth redirect URL.
-    # @param token [string]  A String containing the REFRESH/GRANT token.
-    # @param type A TokenType module variable containing the type of given token.
-    def initialize(client_id, client_secret, token, type, redirect_url = nil)
-      error = {}
-
+    # @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
 
@@ -35,7 +36,7 @@ module Authenticator
 
       end
 
-      unless client_secret.nil? || client_secret.is_a?(String)
+      unless client_secret.is_a?(String)
         error[Constants::ERROR_HASH_FIELD] = Constants::CLIENT_SECRET
 
         error[Constants::ERROR_HASH_EXPECTED_TYPE] = String
@@ -46,8 +47,30 @@ module Authenticator
 
       end
 
-      unless token.is_a?(String)
-        error[Constants::ERROR_HASH_FIELD] = Constants::TOKEN
+      if !grant_token.nil? && !grant_token.is_a?(String)
+        error[Constants::ERROR_HASH_FIELD] = Constants::GRANT_TOKEN
+
+        error[Constants::ERROR_HASH_EXPECTED_TYPE] = String
+
+        error[Constants::ERROR_HASH_CLASS] = OAuthToken.class
+
+        raise SDKException.new(Constants::INPUT_ERROR, nil, error, nil)
+
+      end
+
+      if !refresh_token.nil? && !refresh_token.is_a?(String)
+        error[Constants::ERROR_HASH_FIELD] = Constants::REFRESH_TOKEN
+
+        error[Constants::ERROR_HASH_EXPECTED_TYPE] = String
+
+        error[Constants::ERROR_HASH_CLASS] = OAuthToken.class
+
+        raise SDKException.new(Constants::INPUT_ERROR, nil, error, nil)
+
+      end
+
+      if !redirect_url.nil? && !redirect_url.is_a?(String)
+        error[Constants::ERROR_HASH_FIELD] = Constants::REDIRECT_URL
 
         error[Constants::ERROR_HASH_EXPECTED_TYPE] = String
 
@@ -57,7 +80,18 @@ module Authenticator
 
       end
 
-      unless TokenType::REFRESH.to_s.equal?(TokenType.const_get(type.to_s)) || TokenType::GRANT.to_s.equal?(TokenType.const_get(type.to_s))
+      if !id.nil? && !id.is_a?(String)
+        error[Constants::ERROR_HASH_FIELD] = Constants::ID
+
+        error[Constants::ERROR_HASH_EXPECTED_TYPE] = String
+
+        error[Constants::ERROR_HASH_CLASS] = OAuthToken.class
+
+        raise SDKException.new(Constants::INPUT_ERROR, nil, error, nil)
+
+      end
+
+      if  grant_token.nil? && refresh_token.nil?
         error[Constants::ERROR_HASH_FIELD] = Constants::TYPE
 
         error[Constants::ERROR_HASH_EXPECTED_TYPE] = Constants::EXPECTED_TOKEN_TYPES
@@ -66,28 +100,39 @@ module Authenticator
 
         raise SDKException.new(Constants::INPUT_ERROR, nil, error, nil)
       end
-
       @client_id = client_id
 
       @client_secret = client_secret
 
       @redirect_url = redirect_url
 
-      @refresh_token = (type == TokenType::REFRESH) ? token : nil
+      @refresh_token = refresh_token
 
-      @grant_token = (type == TokenType::GRANT) ? token : nil
-    end
+      @grant_token = grant_token
+
+      @access_token = nil
+
+      @expires_in = nil
 
+      @user_mail = nil
+
+      @id = id
+    end
+    
     def authenticate(url_connection)
       @@sync_lock.synchronize do
         initializer = Initializer.get_initializer
         store = initializer.store
-
         user = initializer.user
 
-        oauth_token = initializer.store.get_token(user, self)
+        oauth_token = nil
+        if !@id.nil?
+          oauth_token = initializer.store.get_token_by_id(@id, self)
+        else
+          oauth_token = initializer.store.get_token(user, self)
+        end
 
-        token = nil
+        token = ""
 
         if oauth_token.nil?
           token = @refresh_token.nil? ? generate_access_token(user, store).access_token : refresh_access_token(user, store).access_token
@@ -115,8 +160,8 @@ module Authenticator
       json_body[Constants::CLIENT_ID] = @client_id
 
       json_body[Constants::CLIENT_SECRET] = @client_secret
-
-      json_body[Constants::REDIRECT_URI] = @redirect_url
+ 
+      json_body[Constants::REDIRECT_URI] = @redirect_url if !@redirect_url.nil?
 
       json_body[Constants::GRANT_TYPE] = Constants::GRANT_TYPE_AUTH_CODE
 
@@ -125,7 +170,11 @@ module Authenticator
       response = get_response_from_server(json_body)
 
       begin
-        store.save_token(user, parse_response(response))
+        parse_response(response)
+
+        generate_id()
+
+        store.save_token(user,self)
       rescue SDKException => e
         raise e
       rescue StandardError => e
@@ -141,7 +190,7 @@ module Authenticator
 
       json_body[Constants::CLIENT_SECRET] = @client_secret
 
-      json_body[Constants::REDIRECT_URI] = @redirect_url
+      json_body[Constants::REDIRECT_URI] = @redirect_url if !@redirect_url.nil?
 
       json_body[Constants::GRANT_TYPE] = Constants::REFRESH_TOKEN
 
@@ -150,7 +199,11 @@ module Authenticator
       response = get_response_from_server(json_body)
 
       begin
-        store.save_token(user, parse_response(response))
+        parse_response(response)
+
+        generate_id()
+
+        store.save_token(user,self)
       rescue SDKException => e
         raise e
       rescue StandardError => e
@@ -184,7 +237,7 @@ module Authenticator
       http.use_ssl = true
 
       request = Net::HTTP::Post.new(url.request_uri)
-
+      request.add_field(Constants::USER_AGENT_KEY, Constants::USER_AGENT)
       request.set_form(json_body, Constants::APPLICATION_FORM_URLENCODED)
 
       response = http.request(request)
@@ -207,11 +260,14 @@ module Authenticator
     def get_current_time_in_millis
       (Time.now.to_f * 1000).to_i
     end
-  end
-end
 
-# This module contains different types of token.
-module TokenType
-  GRANT = 'GRANT'.freeze
-  REFRESH = 'REFRESH'.freeze
-end
+    def generate_id
+      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 + environment + Constants::UNDERSCORE + @refresh_token[@refresh_token.length-4..@refresh_token.length-1]
+      @id = id
+    end
+  end
+end

data/src/com/zoho/api/authenticator/store/db_store.rb

@@ -6,24 +6,22 @@ require_relative '../../../crm/api/util/constants'
 module Store
   # This class stores the user token details to the MySQL DataBase.
   class DBStore < TokenStore
-    attr_accessor :user_name, :password, :port_number, :host, :database_name
+    attr_reader :user_name, :password, :port_number, :host, :database_name, :table_name
 
     # Creates an DBStore class instance with the specified parameters.
     # @param host [string] A String containing the DataBase host name.
     # @param database_name A String containing the DataBase name.
+    # @param table_name A String containing the table name.
     # @param user_name A String containing the DataBase user name.
     # @param password A String containing the DataBase password.
     # @param port_number A String containing the DataBase port number.
-    def initialize(host = nil, database_name = nil, user_name = nil, password = nil, port_number = nil)
-      @host = host.nil? ? Constants::MYSQL_HOST : host
-
-      @database_name = database_name.nil? ? Constants::MYSQL_DATABASE_NAME : database_name
-
-      @user_name = user_name.nil? ? Constants::MYSQL_USER_NAME : user_name
-
-      @password = password.nil? ? '' : password
-
-      @port_number = port_number.nil? ? Constants::MYSQL_PORT_NUMBER : port_number
+    def initialize(host: Constants::MYSQL_HOST, database_name: Constants::MYSQL_DATABASE_NAME ,table_name: Constants::MYSQL_TABLE_NAME,user_name: Constants::MYSQL_USER_NAME,password: '',port_number: Constants::MYSQL_PORT_NUMBER )
+      @host = host
+      @database_name = database_name
+      @table_name = table_name
+      @user_name = user_name
+      @password = password
+      @port_number = port_number
     end
 
     def get_token(user, token)
@@ -36,7 +34,9 @@ module Store
       con.close
 
       rs.each do |row|
-        oauthtoken = token
+        oauthtoken = Authenticator::OAuthToken.new(client_id: row[Constants::CLIENT_ID],client_secret: row[Constants::CLIENT_SECRET],grant_token: row[Constants::GRANT_TOKEN],refresh_token: row[Constants::REFRESH_TOKEN],redirect_url: row[Constants::REDIRECT_URL])
+
+        oauthtoken.id  = row[Constants::ID]
 
         oauthtoken.access_token = row[Constants::ACCESS_TOKEN]
 
@@ -54,7 +54,7 @@ module Store
     def save_token(user, token)
       con = Mysql2::Client.new(host: @host, username: @user_name, password: @password, database: @database_name, port: @port_number)
       if token.is_a? Authenticator::OAuthToken
-        query = "insert into oauthtoken(user_mail,client_id,refresh_token,access_token,grant_token,expiry_time) values ('#{user.email}','#{token.client_id}','#{token.refresh_token}','#{token.access_token}','#{token.grant_token}','#{token.expires_in}')"
+        query = "insert into #{token.table_name}(id,user_mail,client_id,client_secret,refresh_token,access_token,grant_token,expiry_time,redirect_url) values ('#{token.id}','#{user.email}','#{token.client_id}','#{token.client_secret}','#{token.refresh_token}','#{token.access_token}','#{token.grant_token}','#{token.expires_in}','#{token.redirect_url}')"
         token.user_mail = user.email
         delete_token(token)
         con.query(query)
@@ -81,7 +81,7 @@ module Store
     def delete_tokens
       con = Mysql2::Client.new(host: @host, username: @user_name, password: @password, database: @database_name, port: @port_number)
 
-      query = 'delete from oauthtoken'
+      query = "delete * from #{@table_name}"
 
       con.query(query)
 
@@ -94,24 +94,16 @@ module Store
       tokens = []
       con = Mysql2::Client.new(host: @host, username: @user_name, password: @password, database: @database_name, port: @port_number)
 
-      query = 'select * from oauthtoken;'
+      query = "select * from #{@table_name}"
 
       rs = con.query(query)
 
       con.close
 
       rs.each do |row|
-        token_type = nil
-        token_value = nil
-        if !row[Constants::GRANT_TOKEN].nil? && row[Constants::GRANT_TOKEN].length.positive?
-          token_type = TokenType::GRANT
-          token_value = row[Constants::GRANT_TOKEN]
-        else
-          token_type = TokenType::REFRESH
-          token_value = row[Constants::REFRESH_TOKEN]
-        end
 
-        oauthtoken = Authenticator::OAuthToken.new(row[Constants::CLIENT_ID], nil, token_value, token_type)
+
+        oauthtoken = Authenticator::OAuthToken.new(client_id: row[Constants::CLIENT_ID],client_secret: row[Constants::CLIENT_SECRET],grant_token: grant_token,refresh_token: row[Constants::REFRESH_TOKEN])
 
         oauthtoken.id = row[Constants::ID]
 
@@ -121,8 +113,6 @@ module Store
 
         oauthtoken.expires_in = row[Constants::EXPIRY_TIME]
 
-        oauthtoken.refresh_token = row[Constants::REFRESH_TOKEN]
-
         tokens.push(oauthtoken)
       end
       tokens
@@ -135,7 +125,7 @@ module Store
 
       query = is_delete ? 'delete from ' : 'select * from '
 
-      query += 'oauthtoken ' + "where user_mail='#{email}' and client_id='#{token.client_id}' and "
+      query += "#{@table_name} where user_mail='#{email}' and client_id='#{token.client_id}' and "
 
       query += if token.grant_token.nil?
                  "refresh_token='#{token.refresh_token}'"
@@ -145,5 +135,35 @@ module Store
 
       query
     end
+    def get_token_by_id(id,token)
+      con = Mysql2::Client.new(host: @host, username: @user_name, password: @password, database: @database_name, port: @port_number)
+      
+      if token.is_a? Authenticator::OAuthToken
+        query = "select * from #{@table_name} where id='#{id}'" 
+
+        rs = con.query(query)
+
+        con.close
+
+        rs.each do |row|
+          if id == row[Constants::ID]
+            oauthtoken = Authenticator::OAuthToken.new(client_id: row[Constants::CLIENT_ID],client_secret: row[Constants::CLIENT_SECRET],grant_token: row[Constants::GRANT_TOKEN],refresh_token: row[Constants::REFRESH_TOKEN],redirect_url: row[Constants::REDIRECT_URL])
+
+            oauthtoken.id = row[Constants::ID]
+
+            oauthtoken.user_mail = row[Constants::USER_MAIL]
+
+            oauthtoken.access_token = row[Constants::ACCESS_TOKEN]
+
+            oauthtoken.expires_in = row[Constants::EXPIRY_TIME]
+
+            return oauthtoken
+          end
+        end
+      end
+      nil
+    rescue Mysql2::Error => e
+      raise SDKException.new(Constants::TOKEN_STORE, Constants::GET_TOKEN_BY_ID_DB_ERROR, nil, e)
+    end
   end
 end