yoti 1.6.2 → 1.8.0

data/lib/yoti/dynamic_share_service/extension/thirdparty_attribute_extension.rb

@@ -1,14 +1,23 @@
 # frozen_string_literal: true
 
+require 'time'
+
 module Yoti
   module DynamicSharingService
     class ThirdPartyAttributeDefinition
+      #
+      # @param [String] name
+      #
       def initialize(name)
         @name = name
       end
 
+      def as_json(*_args)
+        { name: @name }
+      end
+
       def to_json(*_args)
-        { name: @name }.to_json
+        as_json.to_json
       end
     end
 
@@ -18,11 +27,21 @@ module Yoti
         @definitions = []
       end
 
+      #
+      # @param [DateTime,Time] expiry_date
+      #
+      # @return [self]
+      #
       def with_expiry_date(expiry_date)
         @expiry_date = expiry_date
         self
       end
 
+      #
+      # @param [String] names
+      #
+      # @return [self]
+      #
       def with_definitions(*names)
         @definitions += names.map do |name|
           ThirdPartyAttributeDefinition.new(name)
@@ -30,39 +49,71 @@ module Yoti
         self
       end
 
+      #
+      # @return [ThirdPartyAttributeExtension]
+      #
       def build
-        extension = ThirdPartyAttributeExtension.new
-        extension.instance_variable_get(:@content)[:expiry_date] = @expiry_date
-        extension.instance_variable_get(:@content)[:definitions] = @definitions
-        extension
+        content = ThirdPartyAttributeExtensionContent.new(@expiry_date, @definitions)
+        ThirdPartyAttributeExtension.new(content)
       end
     end
 
     class ThirdPartyAttributeExtension
       EXTENSION_TYPE = 'THIRD_PARTY_ATTRIBUTE'
 
+      # @return [ThirdPartyAttributeExtensionContent]
       attr_reader :content
+
+      # @return [String]
       attr_reader :type
 
-      def initialize
-        @content = {}
+      #
+      # @param [ThirdPartyAttributeExtensionContent] content
+      #
+      def initialize(content = nil)
+        @content = content
         @type = EXTENSION_TYPE
       end
 
       def as_json(*_args)
-        {
-          type: @type,
-          content: @content
-        }
+        json = {}
+        json[:type] = @type
+        json[:content] = @content.as_json unless @content.nil?
+        json
       end
 
       def to_json(*_args)
         as_json.to_json
       end
 
+      #
+      # @return [ThirdPartyAttributeExtensionBuilder]
+      #
       def self.builder
         ThirdPartyAttributeExtensionBuilder.new
       end
     end
+
+    class ThirdPartyAttributeExtensionContent
+      #
+      # @param [DateTime,Time] expiry_date
+      # @param [Array<ThirdPartyAttributeDefinition>] definitions
+      #
+      def initialize(expiry_date, definitions)
+        @expiry_date = expiry_date
+        @definitions = definitions
+      end
+
+      def as_json(*_args)
+        json = {}
+        json[:expiry_date] = @expiry_date.to_time.utc.strftime('%FT%T.%3NZ') unless @expiry_date.nil?
+        json[:definitions] = @definitions.map(&:as_json)
+        json
+      end
+
+      def to_json(*_args)
+        as_json.to_json
+      end
+    end
   end
 end

data/lib/yoti/dynamic_share_service/policy/dynamic_policy.rb

@@ -16,8 +16,8 @@ module Yoti
         false
       end
 
-      def to_json(*args)
-        as_json.to_json(*args)
+      def to_json(*_args)
+        as_json.to_json
       end
 
       def as_json(*_args)
@@ -93,36 +93,54 @@ module Yoti
 
       #
       # @param [String] name
-      # @param [Hash] constraints
+      # @param [Array<SourceConstraint>] constraints
+      # @param [Bool] accept_self_asserted
       #
-      def with_wanted_attribute_by_name(name, constraints: nil)
+      def with_wanted_attribute_by_name(name, constraints: nil, accept_self_asserted: nil)
         attribute_builder = WantedAttribute.builder.with_name(name)
         constraints&.each do |constraint|
           attribute_builder.with_constraint constraint
         end
+        attribute_builder.with_accept_self_asserted(accept_self_asserted) unless accept_self_asserted.nil?
         attribute = attribute_builder.build
         with_wanted_attribute attribute
       end
 
+      #
+      # @option options [Array<SourceConstraint>] :constraints
+      # @option options [Bool] :accept_self_asserted
+      #
       def with_family_name(options = {})
-        with_wanted_attribute_by_name Attribute::FAMILY_NAME, options
+        with_wanted_attribute_by_name Attribute::FAMILY_NAME, **options
       end
 
+      #
+      # @option options [Array<SourceConstraint>] :constraints
+      # @option options [Bool] :accept_self_asserted
+      #
       def with_given_names(options = {})
-        with_wanted_attribute_by_name Attribute::GIVEN_NAMES, options
+        with_wanted_attribute_by_name Attribute::GIVEN_NAMES, **options
       end
 
+      #
+      # @option options [Array<SourceConstraint>] :constraints
+      # @option options [Bool] :accept_self_asserted
+      #
       def with_full_name(options = {})
-        with_wanted_attribute_by_name Attribute::FULL_NAME, options
+        with_wanted_attribute_by_name Attribute::FULL_NAME, **options
       end
 
+      #
+      # @option options [Array<SourceConstraint>] :constraints
+      # @option options [Bool] :accept_self_asserted
+      #
       def with_date_of_birth(options = {})
-        with_wanted_attribute_by_name Attribute::DATE_OF_BIRTH, options
+        with_wanted_attribute_by_name Attribute::DATE_OF_BIRTH, **options
       end
 
       #
       # @param [String] derivation
-      # @param [Hash] constraints
+      # @param [Array<SourceConstraint>] constraints
       #
       def with_age_derived_attribute(derivation, constraints: nil)
         attribute_builder = WantedAttribute.builder
@@ -135,49 +153,93 @@ module Yoti
       end
 
       #
-      # @param [Integer] derivation
+      # @param [Integer] age
+      # @option options [Array<SourceConstraint>] :constraints
+      # @option options [Bool] :accept_self_asserted
       #
       def with_age_over(age, options = {})
-        with_age_derived_attribute(Attribute::AGE_OVER + age.to_s, options)
+        with_age_derived_attribute(Attribute::AGE_OVER + age.to_s, **options)
       end
 
       #
-      # @param [Integer] derivation
+      # @param [Integer] age
+      # @option options [Array<SourceConstraint>] :constraints
+      # @option options [Bool] :accept_self_asserted
       #
       def with_age_under(age, options = {})
-        with_age_derived_attribute(Attribute::AGE_UNDER + age.to_s, options)
+        with_age_derived_attribute(Attribute::AGE_UNDER + age.to_s, **options)
       end
 
+      #
+      # @option options [Array<SourceConstraint>] :constraints
+      # @option options [Bool] :accept_self_asserted
+      #
       def with_gender(options = {})
-        with_wanted_attribute_by_name Attribute::GENDER, options
+        with_wanted_attribute_by_name Attribute::GENDER, **options
       end
 
+      #
+      # @option options [Array<SourceConstraint>] :constraints
+      # @option options [Bool] :accept_self_asserted
+      #
       def with_postal_address(options = {})
-        with_wanted_attribute_by_name(Attribute::POSTAL_ADDRESS, options)
+        with_wanted_attribute_by_name(Attribute::POSTAL_ADDRESS, **options)
       end
 
+      #
+      # @option options [Array<SourceConstraint>] :constraints
+      # @option options [Bool] :accept_self_asserted
+      #
       def with_structured_postal_address(options = {})
-        with_wanted_attribute_by_name(Attribute::STRUCTURED_POSTAL_ADDRESS, options)
+        with_wanted_attribute_by_name(Attribute::STRUCTURED_POSTAL_ADDRESS, **options)
       end
 
+      #
+      # @option options [Array<SourceConstraint>] :constraints
+      # @option options [Bool] :accept_self_asserted
+      #
       def with_nationality(options = {})
-        with_wanted_attribute_by_name(Attribute::NATIONALITY, options)
+        with_wanted_attribute_by_name(Attribute::NATIONALITY, **options)
       end
 
+      #
+      # @option options [Array<SourceConstraint>] :constraints
+      # @option options [Bool] :accept_self_asserted
+      #
       def with_phone_number(options = {})
-        with_wanted_attribute_by_name(Attribute::PHONE_NUMBER, options)
+        with_wanted_attribute_by_name(Attribute::PHONE_NUMBER, **options)
       end
 
+      #
+      # @option options [Array<SourceConstraint>] :constraints
+      # @option options [Bool] :accept_self_asserted
+      #
       def with_selfie(options = {})
-        with_wanted_attribute_by_name(Attribute::SELFIE, options)
+        with_wanted_attribute_by_name(Attribute::SELFIE, **options)
       end
 
+      #
+      # @option options [Array<SourceConstraint>] :constraints
+      # @option options [Bool] :accept_self_asserted
+      #
       def with_email(options = {})
-        with_wanted_attribute_by_name(Attribute::EMAIL_ADDRESS, options)
+        with_wanted_attribute_by_name(Attribute::EMAIL_ADDRESS, **options)
       end
 
-      def with_document_details
-        with_wanted_attribute_by_name(Attribute::DOCUMENT_DETAILS)
+      #
+      # @option options [Array<SourceConstraint>] :constraints
+      # @option options [Bool] :accept_self_asserted
+      #
+      def with_document_details(options = {})
+        with_wanted_attribute_by_name(Attribute::DOCUMENT_DETAILS, **options)
+      end
+
+      #
+      # @option options [Array<SourceConstraint>] :constraints
+      # @option options [Bool] :accept_self_asserted
+      #
+      def with_document_images(options = {})
+        with_wanted_attribute_by_name(Attribute::DOCUMENT_IMAGES, **options)
       end
     end
   end

data/lib/yoti/dynamic_share_service/share_url.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'securerandom'
+
 module Yoti
   module DynamicSharingService
     class Share
@@ -11,50 +13,33 @@ module Yoti
       end
     end
 
-    def self.create_share_url_endpoint
-      "/qrcodes/apps/#{Yoti.configuration.client_sdk_id}"
-    end
-
-    def self.create_share_url_query
-      "?nonce=#{SecureRandom.uuid}&timestamp=#{Time.now.to_i}"
-    end
-
     def self.create_share_url(scenario)
-      endpoint = "#{create_share_url_endpoint}#{create_share_url_query}"
-      uri = URI("#{Yoti.configuration.api_endpoint}#{endpoint}")
-
-      unsigned = Net::HTTP::Post.new uri
-      unsigned.body = scenario.to_json
+      yoti_request = Yoti::Request
+                     .builder
+                     .with_http_method('POST')
+                     .with_base_url(Yoti.configuration.api_endpoint)
+                     .with_endpoint("qrcodes/apps/#{Yoti.configuration.client_sdk_id}")
+                     .with_query_param('appId', Yoti.configuration.client_sdk_id)
+                     .with_payload(scenario)
+                     .build
 
-      signed_request = Yoti::SignedRequest.new(
-        unsigned,
-        endpoint,
-        scenario
-      ).sign
+      begin
+        create_share_url_parse_response yoti_request.execute
+      rescue Yoti::RequestError => e
+        raise if e.response.nil?
 
-      response = Net::HTTP.start(
-        uri.hostname,
-        uri.port,
-        use_ssl: true
-      ) do |http|
-        http.request signed_request
-      end
-
-      create_share_url_parse_response response
-    end
-
-    def self.create_share_url_parse_response(response)
-      if response.code.to_i < 200 || response.code.to_i >= 300
-        case response.code
+        case e.response.code
         when '400'
           raise InvalidDataError
         when '404'
           raise ApplicationNotFoundError
         else
-          raise UnknownHTTPError, response.code
+          raise UnknownHTTPError, e.response.code
         end
       end
+    end
 
+    def self.create_share_url_parse_response(response)
       Share.new JSON.parse response.body
     end
 
@@ -76,5 +61,15 @@ module Yoti
         super msg
       end
     end
+
+    # @deprecated no longer used - will be removed in 2.0.0
+    def self.create_share_url_query
+      "?nonce=#{SecureRandom.uuid}&timestamp=#{Time.now.to_i}"
+    end
+
+    # @deprecated no longer used - will be removed in 2.0.0
+    def self.create_share_url_endpoint
+      "/qrcodes/apps/#{Yoti.configuration.client_sdk_id}"
+    end
   end
 end

data/lib/yoti/errors.rb

@@ -3,12 +3,25 @@ module Yoti
   class ProtobufError < StandardError; end
 
   # Raises exceptions related to API requests
-  class RequestError < StandardError; end
+  class RequestError < StandardError
+    attr_reader :response
+
+    def initialize(message, response = nil)
+      super(message)
+      @response = response
+    end
+
+    def message
+      return super if @response.nil? || @response.body.empty?
+
+      "#{super}: #{@response.body}"
+    end
+  end
 
   # Raises exceptions related to OpenSSL actions
   class SslError < StandardError; end
 
-  # Raises exceptions realted to an incorrect gem configuration value
+  # Raises exceptions related to an incorrect gem configuration value
   class ConfigurationError < StandardError; end
 
   # Raises exceptions related to AML actions

data/lib/yoti/http/aml_check_request.rb

@@ -1,13 +1,16 @@
 module Yoti
   # Manage the API's AML check requests
   class AmlCheckRequest
+    #
+    # @param [AmlProfile] aml_profile
+    #
     def initialize(aml_profile)
       @aml_profile = aml_profile
       @payload = aml_profile.payload
       @request = request
     end
 
-    # @return [String] a JSON representation of the AML check response
+    # @return [Hash] a JSON representation of the AML check response
     def response
       JSON.parse(@request.body)
     end
@@ -15,11 +18,14 @@ module Yoti
     private
 
     def request
-      yoti_request = Yoti::Request.new
-      yoti_request.http_method = 'POST'
-      yoti_request.endpoint = 'aml-check'
-      yoti_request.payload = @payload
-      yoti_request
+      Yoti::Request
+        .builder
+        .with_http_method('POST')
+        .with_base_url(Yoti.configuration.api_endpoint)
+        .with_endpoint('aml-check')
+        .with_query_param('appId', Yoti.configuration.client_sdk_id)
+        .with_payload(@payload)
+        .build
     end
   end
 end