ZOHOCRMSDK2_0 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e2e634ac64c557bfbb3054bb21f8a76ea05c3396aba162f88fa777832650c7e
-  data.tar.gz: 867335f19bdf382d60a6ad3f6e5698e08ae6cb6798ae9004cc258935ba2d62f4
+  metadata.gz: 95f0344d741c13094abf8b93a67139018a0b83895f612a9be53fb7e32f14217b
+  data.tar.gz: 8fc22f398327570fe85162016f887c280d2485e6ffdc6e82c671963a1bd7976e
 SHA512:
-  metadata.gz: 625df3665f2738c53b53dc182e364451759bf23cb56e7a42edac2942c5a0a0c6bf16ae728b1de314ad281399ce73fe1f5b72fa76bf9e0a446e133609022636dc
-  data.tar.gz: bc375d637388404f7998acf4a6881ef3a8d871f37cea201fa0846b494af954b9f412c984d486cc1fa822b2c005112fc22934b41d63d1943c3736f9a0ee62cb7a
+  metadata.gz: a30421d88bd8b9b915998fbfaecf567e7f99a2534f86427e0f8e804a6a55a247f31f36239287e22b7e1112ee7902b768b7f783f80180dfca77e6f951d605bc69
+  data.tar.gz: 7481d802d6be8ca33d3f723b560e312d21f49dfc6afa27e0e2ea03599f2a23458417d9a0a18fbf9ef7ba5e1ade40e0601cc41eb0718fb892ffd5e0569c78a209

data/src/ZOHOCRMSDK2_0.rb

@@ -202,11 +202,17 @@ require 'com/zoho/crm/api/contact_roles/contact_role.rb'
 require 'com/zoho/crm/api/contact_roles/body_wrapper.rb'
 require 'com/zoho/crm/api/contact_roles/action_handler.rb'
 require 'com/zoho/crm/api/contact_roles/action_wrapper.rb'
+require 'com/zoho/crm/api/contact_roles/record_action_handler.rb'
+require 'com/zoho/crm/api/contact_roles/record_response_handler.rb'
+require 'com/zoho/crm/api/contact_roles/record_action_wrapper.rb'
+require 'com/zoho/crm/api/contact_roles/record_body_wrapper.rb'
+require 'com/zoho/crm/api/contact_roles/record_response_wrapper.rb'
 require 'com/zoho/crm/api/contact_roles/response_wrapper.rb'
 require 'com/zoho/crm/api/contact_roles/api_exception.rb'
 require 'com/zoho/crm/api/contact_roles/contact_roles_operations.rb'
 require 'com/zoho/crm/api/contact_roles/success_response.rb'
 require 'com/zoho/crm/api/contact_roles/action_response.rb'
+require 'com/zoho/crm/api/contact_roles/contact_role_wrapper.rb'
 require 'com/zoho/crm/api/contact_roles/response_handler.rb'
 require 'com/zoho/crm/api/layouts/layouts_operations.rb'
 require 'com/zoho/crm/api/layouts/section.rb'

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

@@ -11,19 +11,19 @@ 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_accessor :client_id , :client_secret ,:redirect_url ,:grant_token,: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 +35,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 +46,41 @@ 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
+
+        error[Constants::ERROR_HASH_CLASS] = OAuthToken.class
+
+        raise SDKException.new(Constants::INPUT_ERROR, nil, error, nil)
+
+      end
+
+      if !id.nil? && !id.is_a?(String)
+        error[Constants::ERROR_HASH_FIELD] = Constants::ID
 
         error[Constants::ERROR_HASH_EXPECTED_TYPE] = String
 
@@ -57,7 +90,7 @@ 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  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 +99,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
@@ -97,7 +141,6 @@ module Authenticator
         else
           token = oauth_token.access_token
         end
-
         url_connection.headers[Constants::AUTHORIZATION] = Constants::OAUTH_HEADER_PREFIX + token
       end
     end
@@ -115,8 +158,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 +168,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 +188,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 +197,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 +235,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 +258,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)
@@ -38,12 +36,24 @@ module Store
       rs.each do |row|
         oauthtoken = token
 
-        oauthtoken.access_token = row[Constants::ACCESS_TOKEN]
+        oauthtoken.client_id = row[Constants::CLIENT_ID]
 
-        oauthtoken.expires_in = row[Constants::EXPIRY_TIME]
+        oauthtoken.client_secret = row[Constants::CLIENT_SECRET]
+
+        oauthtoken.grant_token = row[Constants::GRANT_TOKEN]
+
+        oauthtoken.redirect_url = row[Constants::REDIRECT_URL]
 
         oauthtoken.refresh_token = row[Constants::REFRESH_TOKEN]
 
+        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
       nil
@@ -54,7 +64,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 +91,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 +104,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]
 
@@ -119,9 +121,9 @@ module Store
 
         oauthtoken.access_token = row[Constants::ACCESS_TOKEN]
 
-        oauthtoken.expires_in = row[Constants::EXPIRY_TIME]
+        oauthtoken.redirect_url = row[Constants::REDIRECT_URL]
 
-        oauthtoken.refresh_token = row[Constants::REFRESH_TOKEN]
+        oauthtoken.expires_in = row[Constants::EXPIRY_TIME]
 
         tokens.push(oauthtoken)
       end
@@ -135,7 +137,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 +147,45 @@ 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 = token
+
+            oauthtoken.client_id = row[Constants::CLIENT_ID]
+
+            oauthtoken.client_secret = row[Constants::CLIENT_SECRET]
+
+            oauthtoken.grant_token = row[Constants::GRANT_TOKEN]
+
+            oauthtoken.redirect_url = row[Constants::REDIRECT_URL]
+
+            oauthtoken.refresh_token = row[Constants::REFRESH_TOKEN]
+
+            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

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

@@ -16,7 +16,7 @@ module Store
 
       unless File.exist? @file_path
         File.new(@file_path, 'w')
-        @csv_file = CSV.open(@file_path, 'a', write_headers: true, headers: [Constants::USER_MAIL, Constants::CLIENT_ID, Constants::REFRESH_TOKEN, Constants::ACCESS_TOKEN, Constants::GRANT_TOKEN, Constants::EXPIRY_TIME])
+        @csv_file = CSV.open(@file_path, 'a', write_headers: true, headers: [Constants::ID,Constants::USER_MAIL, Constants::CLIENT_ID,Constants::CLIENT_SECRET, Constants::REFRESH_TOKEN, Constants::ACCESS_TOKEN, Constants::GRANT_TOKEN, Constants::EXPIRY_TIME,Constants::REDIRECT_URL])
       end
       @csv_file = CSV.open(@file_path, 'a')
     end
@@ -38,15 +38,33 @@ module Store
         end
 
         file_contents.each do |row|
-          token_check = grant_token.nil? ? refresh_token == row[2] : grant_token == row[4]
+          token_check = grant_token.nil? ? refresh_token == row[4] : grant_token == row[6]
+          if (row[1] == user_email) && (row[2] == client_id) && token_check
 
-          if (row[0] == user_email) && (row[1] == client_id) && token_check
-            token.refresh_token = row[2]
+            grant_token = (!row[6].nil? &&  !row[6].empty?) ? row[6] : nil
 
-            token.access_token = row[3]
+            redirect_url = (!row[8].nil? &&  !row[8].empty?) ? row[8] : nil
+            
+            oauthtoken = token
 
-            token.expires_in = row[5]
-            return token
+            oauthtoken.id = row[0]
+
+            oauthtoken.user_mail = row[1]
+
+            oauthtoken.client_id = row[2]
+
+            oauthtoken.client_secret = row[3]
+
+            oauthtoken.refresh_token = row[4]
+
+            oauthtoken.access_token = row[5]
+    
+            oauthtoken.grant_token = grant_token
+
+            oauthtoken.expires_in = row[7]
+    
+            oauthtoken.redirect_url = redirect_url
+            return oauthtoken
           end
         end
       end
@@ -60,25 +78,21 @@ module Store
       file_contents = CSV.table(@file_path)
       file_contents.each do |row|
         unless row == @csv_file.header_row?
-          token_type = nil
-          token_value = nil
-          if !row[4].nil? && row[4].length.positive?
-            token_type = TokenType::GRANT
-            token_value = row[4]
-          else
-            token_type = TokenType::REFRESH
-            token_value = row[2]
-          end
+          grant_token = (!row[6].nil? &&  !row[6].empty?) ? row[6] : nil
+
+          redirect_url = (!row[8].nil? &&  !row[8].empty?) ? row[8] : nil
 
-          token = Authenticator::OAuthToken.new(row[1], nil, token_value, token_type)
+          token = Authenticator::OAuthToken.new(client_id: row[2],client_secret: row[3],grant_token: grant_token,refresh_token: row[4])
+            
+          token.id  = row[0]
 
-          token.user_mail = row[0]
+          token.user_mail = row[1]
 
-          token.refresh_token = row[2]
+          token.access_token = row[5]
 
-          token.access_token = row[3]
+          token.expires_in = row[7]
 
-          token.expires_in = row[5]
+          token.redirect_url = redirect_url
 
           tokens.push(token)
         end
@@ -96,10 +110,14 @@ module Store
         delete_token(token)
         values_list = []
 
+        values_list.push(token.id)
+
         values_list.push(user.email)
 
         values_list.push(token.client_id)
 
+        values_list.push(token.client_secret)
+
         values_list.push(token.refresh_token)
 
         values_list.push(token.access_token)
@@ -107,6 +125,8 @@ module Store
         values_list.push(token.grant_token)
 
         values_list.push(token.expires_in)
+
+        values_list.push(token.redirect_url)
       end
       @csv_file = CSV.open(@file_path, 'a') if @csv_file.closed?
       @csv_file << values_list
@@ -118,6 +138,7 @@ module Store
 
     def delete_token(token)
       if token.is_a? Authenticator::OAuthToken
+      
         grant_token = token.grant_token
 
         refresh_token = token.refresh_token
@@ -134,9 +155,10 @@ module Store
 
         table.delete_if do |row|
           unless row == @csv_file.header_row?
-            token_check = grant_token.nil? ? refresh_token == row[:refresh_token] : grant_token == row[:grant_token]
-
-            row[:user_mail] == user_email and row[:client_id] == client_id and token_check
+       
+            token_check = grant_token.nil? ? refresh_token == row[4] : grant_token == row[6]
+           
+            row[1] == user_email and row[2] == client_id and token_check
           end
         end
 
@@ -161,5 +183,54 @@ module Store
     rescue StandardError => e
       raise SDKException.new(Constants::TOKEN_STORE, Constants::DELETE_TOKENS_FILE_ERROR, nil, e)
     end
+
+    def get_token_by_id(id, token)
+      if token.is_a? Authenticator::OAuthToken
+
+        is_row_present = false
+        
+        file_contents = CSV.read(@file_path)
+
+        file_contents.each do |row|
+
+          if row[0] == id 
+
+            is_row_present = true
+
+            grant_token = (!row[6].nil? &&  !row[6].empty?) ? row[6] : nil
+
+            redirect_url = (!row[8].nil? &&  !row[8].empty?) ? row[8] : nil
+
+            oauthtoken = token
+
+            oauthtoken.id = row[0]
+
+            oauthtoken.user_mail = row[1]
+
+            oauthtoken.client_id = row[2]
+
+            oauthtoken.client_secret = row[3]
+
+            oauthtoken.refresh_token = row[4]
+
+            oauthtoken.access_token = row[5]
+    
+            oauthtoken.grant_token = grant_token
+
+            oauthtoken.expires_in = row[7]
+    
+            oauthtoken.redirect_url = redirect_url
+    
+            return oauthtoken
+          end
+        end
+        if !is_row_present
+          raise SDKException.new(Constants::TOKEN_STORE, Constants::GET_TOKEN_BY_ID_FILE_ERROR, nil, nil)
+        end
+      end
+      nil
+    rescue StandardError => e
+      raise SDKException.new(Constants::TOKEN_STORE, Constants::GET_TOKEN_BY_ID_FILE_ERROR, nil, e)
+    end
   end
 end