onfido 0.15.1 → 2.0.1

data/lib/onfido.rb

@@ -1,28 +1,28 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'rack'
 require 'rest-client'
 require 'openssl'
 
 require 'onfido/version'
-require 'onfido/configuration'
 require 'onfido/errors/onfido_error'
 require 'onfido/errors/request_error'
 require 'onfido/errors/server_error'
 require 'onfido/errors/connection_error'
-require 'onfido/null_logger'
 require 'onfido/api'
+require 'onfido/options'
 require 'onfido/resource'
 require 'onfido/resources/address'
 require 'onfido/resources/applicant'
 require 'onfido/resources/check'
 require 'onfido/resources/document'
+require 'onfido/resources/extraction'
 require 'onfido/resources/live_photo'
 require 'onfido/resources/live_video'
 require 'onfido/resources/report'
-require 'onfido/resources/report_type_group'
 require 'onfido/resources/sdk_token'
 require 'onfido/resources/webhook'
 
 module Onfido
-  extend Configuration
 end

data/lib/onfido/api.rb

@@ -1,47 +1,53 @@
+# frozen_string_literal: true
+
 module Onfido
   class API
-    def initialize(options = {})
-      @api_key = options[:api_key]
+    def initialize(api_key:, region:, **extra_options)
+      @options = Onfido::Options.new(api_key: api_key, region: region, **extra_options)
     end
 
     def applicant
-      Onfido::Applicant.new(@api_key)
+      @applicant ||= Onfido::Applicant.new(options)
     end
 
     def check
-      Onfido::Check.new(@api_key)
+      @check ||= Onfido::Check.new(options)
     end
 
     def document
-      Onfido::Document.new(@api_key)
+      @document ||= Onfido::Document.new(options)
     end
 
     def live_photo
-      Onfido::LivePhoto.new(@api_key)
+      @live_photo ||= Onfido::LivePhoto.new(options)
     end
 
     def live_video
-      Onfido::LiveVideo.new(@api_key)
+      @live_video ||= Onfido::LiveVideo.new(options)
     end
 
     def report
-      Onfido::Report.new(@api_key)
-    end
-
-    def report_type_group
-      Onfido::ReportTypeGroup.new(@api_key)
+      @report ||= Onfido::Report.new(options)
     end
 
     def sdk_token
-      Onfido::SdkToken.new(@api_key)
+      @sdk_token ||= Onfido::SdkToken.new(options)
     end
 
     def webhook
-      Onfido::Webhook.new(@api_key)
+      @webhook ||= Onfido::Webhook.new(options)
     end
 
     def address
-      Onfido::Address.new(@api_key)
+      @address ||= Onfido::Address.new(options)
     end
+
+    def extraction
+      @extraction ||= Onfido::Extraction.new(options)
+    end
+
+    private
+
+    attr_reader :options
   end
 end

data/lib/onfido/errors/connection_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Onfido
   class ConnectionError < OnfidoError
   end

data/lib/onfido/errors/onfido_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Onfido
   class OnfidoError < StandardError
     attr_accessor :response_code, :response_body

data/lib/onfido/errors/request_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Onfido
   class RequestError < OnfidoError
   end

data/lib/onfido/errors/server_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Onfido
   class ServerError < OnfidoError
   end

data/lib/onfido/options.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Onfido
+  class Options
+    REGIONS = %w[eu us ca].freeze
+
+    def initialize(api_key:, region:, open_timeout: 10, read_timeout: 30, unknown_api_url: nil)
+      @api_key = api_key
+      @region = region.to_s.downcase
+      @open_timeout = open_timeout
+      @read_timeout = read_timeout
+      @unknown_api_url = unknown_api_url
+
+      raise "Unknown region #{@region}" unless REGIONS.include?(@region)
+    end
+
+    def rest_client
+      @rest_client ||= RestClient::Resource.new(
+        base_url,
+        read_timeout: read_timeout,
+        open_timeout: open_timeout,
+        headers: {
+          'Authorization' => "Token token=#{api_key}",
+          'Accept' => 'application/json',
+          'User-Agent' => "onfido-ruby/#{Onfido::VERSION}"
+        }
+      )
+    end
+
+    private
+
+    attr_reader :api_key, :open_timeout, :read_timeout
+
+    def base_url
+      @unknown_api_url || "https://api.#{@region}.onfido.com/v3.1/"
+    end
+  end
+end

data/lib/onfido/resource.rb

@@ -1,59 +1,52 @@
+# frozen_string_literal: true
+
 module Onfido
-  class Resource
-    VALID_HTTP_METHODS = %i(get post put delete).freeze
+  class Resource # rubocop:todo Metrics/ClassLength
+    VALID_HTTP_METHODS = %i[get post put delete].freeze
     REQUEST_TIMEOUT_HTTP_CODE = 408
 
-    def initialize(api_key = nil)
-      @api_key = api_key || Onfido.api_key
+    def initialize(options)
+      @rest_client = options.rest_client
     end
 
-    def url_for(path)
-      Onfido.endpoint + path
-    end
+    private
 
-    VALID_HTTP_METHODS.each do |method|
-      define_method method do |*args|
-        make_request(
-          method: method.to_sym,
-          url: args.first.fetch(:url),
-          payload: build_query(args.first.fetch(:payload, {}))
-        )
-      end
+    attr_reader :rest_client
+
+    def get(path:)
+      handle_request { rest_client[path].get }
     end
 
-    private
+    def post(path:, payload: nil)
+      handle_request { rest_client[path].post(payload) }
+    end
 
-    def make_request(options)
-      url = options.fetch(:url)
-      payload = options.fetch(:payload)
-      method = options.fetch(:method)
+    def put(path:, payload: nil)
+      handle_request { rest_client[path].put(payload) }
+    end
 
-      request_options = {
-        url: url,
-        payload: payload,
-        method: method,
-        headers: headers,
-        open_timeout: Onfido.open_timeout,
-        timeout: Onfido.read_timeout
-      }
+    def delete(path:)
+      handle_request { rest_client[path].delete }
+    end
 
-      response = RestClient::Request.execute(request_options)
+    def handle_request
+      response = yield
 
       # response should be parsed only when there is a response expected
       parse(response) unless response.code == 204 # no_content
-    rescue RestClient::ExceptionWithResponse => error
-      if error.response && !timeout_response?(error.response)
-        handle_api_error(error.response)
+    rescue RestClient::ExceptionWithResponse => e
+      if e.response && !timeout_response?(e.response)
+        handle_api_error(e.response)
       else
-        handle_restclient_error(error, url)
+        handle_restclient_error(e)
       end
-    rescue RestClient::Exception, Errno::ECONNREFUSED => error
-      handle_restclient_error(error, url)
+    rescue RestClient::Exception, Errno::ECONNREFUSED => e
+      handle_restclient_error(e)
     end
 
     def parse(response)
       content_type = response.headers[:content_type]
-      if content_type && content_type.include?("application/json")
+      if content_type&.include?('application/json')
         JSON.parse(response.body.to_s)
       else
         response.body
@@ -66,13 +59,6 @@ module Onfido
       response.code.to_i == REQUEST_TIMEOUT_HTTP_CODE
     end
 
-    def headers
-      {
-        'Authorization' => "Token token=#{@api_key}",
-        'Accept' => "application/json"
-      }
-    end
-
     # There seems to be a serialization issue with the HTTP client
     # which does not serialize the payload properly.
     # Have a look here https://gist.github.com/PericlesTheo/cb35139c57107ab3c84a
@@ -88,12 +74,12 @@ module Onfido
     def handle_api_error(response)
       parsed_response = parse(response)
 
-      general_api_error(response.code, response.body) unless parsed_response["error"]
+      general_api_error(response.code, response.body) unless parsed_response['error']
 
       error_class = response.code.to_i >= 500 ? ServerError : RequestError
 
       raise error_class.new(
-        parsed_response["error"]['message'],
+        parsed_response['error']['message'],
         response_code: response.code,
         response_body: response.body
       )
@@ -110,46 +96,43 @@ module Onfido
       )
     end
 
-    def handle_restclient_error(error, url)
+    def handle_restclient_error(error) # rubocop:todo Metrics/MethodLength
       connection_message =
-        "Please check your internet connection and try again. " \
-        "If this problem persists, you should let us know at info@onfido.com."
+        'Please check your internet connection and try again. ' \
+        'If this problem persists, you should let us know at info@onfido.com.'
 
       message =
         case error
         when RestClient::RequestTimeout
-          "Could not connect to Onfido (#{url}). #{connection_message}"
+          "Could not connect to Onfido . #{connection_message}"
 
         when RestClient::ServerBrokeConnection
-          "The connection to the server (#{url}) broke before the " \
-          "request completed. #{connection_message}"
+          "The connection to the server broke before the request completed. #{connection_message}"
 
         when RestClient::SSLCertificateNotVerified
           "Could not verify Onfido's SSL certificate. Please make sure " \
-          "that your network is not intercepting certificates. " \
-          "(Try going to #{Onfido.endpoint} in your browser.) " \
-          "If this problem persists, let us know at info@onfido.com."
+          'that your network is not intercepting certificates. '
 
         when SocketError
-          "Unexpected error when trying to connect to Onfido. " \
-          "You may be seeing this message because your DNS is not working. " \
+          'Unexpected error when trying to connect to Onfido. ' \
+          'You may be seeing this message because your DNS is not working. ' \
           "To check, try running 'host onfido.com' from the command line."
 
         else
-          "Unexpected error communicating with Onfido. " \
-          "If this problem persists, let us know at info@onfido.com."
+          'Unexpected error communicating with Onfido. ' \
+          'If this problem persists, let us know at info@onfido.com.'
         end
 
       full_message = message + "\n\n(Network error: #{error.message})"
 
-      raise ConnectionError.new(full_message)
+      raise ConnectionError, full_message
     end
 
     def validate_file!(file)
       return if file.respond_to?(:read) && file.respond_to?(:path)
 
-      raise ArgumentError, "File must be a `File`-like object which responds to " \
-                           "`#read` and `#path`"
+      raise ArgumentError, 'File must be a `File`-like object which responds to ' \
+                           '`#read` and `#path`'
     end
   end
 end

data/lib/onfido/resources/address.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 module Onfido
   class Address < Resource
     def all(postcode)
-      query_string = "postcode=#{postcode.delete(' ')}"
-      get(url: url_for("addresses/pick?#{query_string}"))
+      get(path: "addresses/pick?postcode=#{postcode.delete(' ')}")
     end
   end
 end

data/lib/onfido/resources/applicant.rb

@@ -1,27 +1,29 @@
+# frozen_string_literal: true
+
 module Onfido
   class Applicant < Resource
     def create(payload)
-      post(url: url_for('applicants'), payload: payload)
+      post(path: 'applicants', payload: payload)
     end
 
     def update(applicant_id, payload)
-      put(url: url_for("applicants/#{applicant_id}"), payload: payload)
+      put(path: "applicants/#{applicant_id}", payload: payload)
     end
 
     def destroy(applicant_id)
-      delete(url: url_for("applicants/#{applicant_id}"))
+      delete(path: "applicants/#{applicant_id}")
     end
 
     def find(applicant_id)
-      get(url: url_for("applicants/#{applicant_id}"))
+      get(path: "applicants/#{applicant_id}")
     end
 
     def all(page: 1, per_page: 20)
-      get(url: url_for("applicants?page=#{page}&per_page=#{per_page}"))
+      get(path: "applicants?page=#{page}&per_page=#{per_page}")
     end
 
     def restore(applicant_id)
-      post(url: url_for("applicants/#{applicant_id}/restore"))
+      post(path: "applicants/#{applicant_id}/restore")
     end
   end
 end

data/lib/onfido/resources/check.rb

@@ -1,32 +1,28 @@
+# frozen_string_literal: true
+
 module Onfido
   class Check < Resource
-    def create(applicant_id, payload)
-      post(
-        url: url_for("applicants/#{applicant_id}/checks"),
-        payload: payload
-      )
-    end
+    def create(applicant_id:, report_names:, **payload)
+      payload[:applicant_id] = applicant_id
+      payload[:report_names] = report_names
 
-    def find(applicant_id, check_id, expand: nil)
-      querystring = "&expand=#{expand}" if expand
-      get(url: url_for("applicants/#{applicant_id}/checks/#{check_id}?" \
-                       "#{querystring}"))
+      post(path: 'checks', payload: payload)
     end
 
-    def find_by_url(url, expand: nil)
-      url_path = url.sub(%r/^https\:\/\/api\.onfido\.com\/v2\//, '')
-      querystring = "&expand=#{expand}" if expand
-      get(url: url_for("#{url_path}?#{querystring}"))
+    def find(check_id)
+      get(path: "checks/#{check_id}")
     end
 
-    def all(applicant_id, page: 1, per_page: 20, expand: nil)
-      querystring = "page=#{page}&per_page=#{per_page}"
-      querystring += "&expand=#{expand}" if expand
-      get(url: url_for("applicants/#{applicant_id}/checks?#{querystring}"))
+    def all(applicant_id)
+      get(path: "checks?applicant_id=#{applicant_id}")
     end
 
     def resume(check_id)
-      post(url: url_for("checks/#{check_id}/resume"))
+      post(path: "checks/#{check_id}/resume")
+    end
+
+    def download(check_id)
+      get(path: "checks/#{check_id}/download")
     end
   end
 end

data/lib/onfido/resources/document.rb

@@ -1,26 +1,28 @@
+# frozen_string_literal: true
+
 module Onfido
   class Document < Resource
     # with open-uri the file can be a link or an actual file
 
-    def create(applicant_id, payload)
-      validate_file!(payload.fetch(:file))
+    def create(applicant_id:, file:, type:, **payload)
+      validate_file!(file)
+      payload[:applicant_id] = applicant_id
+      payload[:file] = file
+      payload[:type] = type
 
-      post(
-        url: url_for("applicants/#{applicant_id}/documents"),
-        payload: payload
-      )
+      post(path: 'documents', payload: payload)
     end
 
-    def find(applicant_id, document_id)
-      get(url: url_for("applicants/#{applicant_id}/documents/#{document_id}"))
+    def find(document_id)
+      get(path: "documents/#{document_id}")
     end
 
-    def download(applicant_id, document_id)
-      get(url: url_for("applicants/#{applicant_id}/documents/#{document_id}/download"))
+    def download(document_id)
+      get(path: "documents/#{document_id}/download")
     end
 
     def all(applicant_id)
-      get(url: url_for("applicants/#{applicant_id}/documents"))
+      get(path: "documents?applicant_id=#{applicant_id}")
     end
   end
 end