yoti 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 691432df23cdd73c562aedd1f85ea6077ce38508
-  data.tar.gz: ba22b06a08a95aaff4c3309e1e7c1db4195f4a10
+  metadata.gz: 554c3f07a3798f6c7f40a0dcd126449a8d866fe6
+  data.tar.gz: 3f09b020f30e99038faf01bc74db8106f4fc7b31
 SHA512:
-  metadata.gz: b8fba42c58a939ffbd6f66d97e2970cc34a705e1b3f04ccffb5fddba494a8f273de9aadb6d9c88b5c3cd6be8a673655c23347f35da303f7f408c74cc22747155
-  data.tar.gz: de2c82706cd19db939a182e45134c3d0aaf282cb1b0785e443e8691cf419b76250921ad0507f84987206c3075fdf127fa4b2d1b554d499764dc95f1db43c86cd
+  metadata.gz: 37cbabc0963156cdd95bc7ba2bd1657ce01a180619c44993f4e2298e902f0d7856d924c887a1333bec73fd8c24c8d553136b18733470191df2a59b3d5399fca2
+  data.tar.gz: 49c22b5abc8a43e6e3c7b0021a7b3a2c37b417f24f6247f01dd6844c638969b4c216be52fd0e646b1f1a4285d93ce2a3982b6d687f9d9d06451c3a4387b19369

data/lib/yoti/activity_details.rb

@@ -93,6 +93,9 @@ module Yoti
     #
     # @param receipt [Hash] the receipt from the API request
     # @param decrypted_profile [Object] Protobuf AttributeList decrypted object containing the profile attributes
+    # @param decrypted_application_profile [Object] Protobuf AttributeList decrypted object containing profile attributes for the application profile
+    # @param extra_data [Yoti::Share::ExtraData|nil] Processed extra data object or nil
+    #   if absent from the receipt
     #
     def initialize(receipt, decrypted_profile = nil, decrypted_application_profile = nil, extra_data = nil)
       @remember_me_id = receipt['remember_me_id']
@@ -103,7 +106,7 @@ module Yoti
       @timestamp = receipt['timestamp'] ? Time.parse(receipt['timestamp']) : nil
       @extended_user_profile = process_decrypted_profile(decrypted_profile)
       @extended_application_profile = process_decrypted_profile(decrypted_application_profile)
-      @extra_data = Share::ExtraData.new(extra_data) if extra_data
+      @extra_data = extra_data
       @user_profile = @extended_user_profile.map do |name, attribute|
         [name, attribute.value]
       end.to_h

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

@@ -2,6 +2,16 @@
 
 module Yoti
   module DynamicSharingService
+    class ThirdPartyAttributeDefinition
+      def initialize(name)
+        @name = name
+      end
+
+      def to_json(*_args)
+        { name: @name }.to_json
+      end
+    end
+
     class ThirdPartyAttributeExtensionBuilder
       def initialize
         @expiry_date = nil
@@ -14,8 +24,8 @@ module Yoti
       end
 
       def with_definitions(*names)
-        names.each do |s|
-          @definitions += [{ name: s }]
+        @definitions += names.map do |name|
+          ThirdPartyAttributeDefinition.new(name)
         end
         self
       end

data/lib/yoti/protobuf/main.rb

@@ -44,9 +44,9 @@ module Yoti
       end
 
       def extra_data(receipt)
-        return nil unless valid_receipt?(receipt)
+        return nil if receipt['extra_data_content'].nil? || receipt['extra_data_content'] == ''
 
-        decipher_profile(receipt['extra_data'], receipt['wrapped_receipt_key']) if receipt['extra_data']
+        decipher_extra_data(receipt['extra_data_content'], receipt['wrapped_receipt_key'])
       end
 
       def attribute_list(data)
@@ -111,11 +111,21 @@ module Yoti
       end
 
       def decipher_profile(profile_content, wrapped_key)
-        encrypted_data = decode_profile(profile_content)
-        unwrapped_key = Yoti::SSL.decrypt_token(wrapped_key)
-        decrypted_data = Yoti::SSL.decipher(unwrapped_key, encrypted_data.iv, encrypted_data.cipher_text)
+        decrypted_data = decipher_data(profile_content, wrapped_key)
         Protobuf.attribute_list(decrypted_data)
       end
+
+      def decipher_extra_data(extra_data_content, wrapped_key)
+        decrypted_data = decipher_data(extra_data_content, wrapped_key)
+        proto = Yoti::Protobuf::Sharepubapi::ExtraData.decode(decrypted_data)
+        Share::ExtraData.new(proto)
+      end
+
+      def decipher_data(encrypted_content, wrapped_key)
+        encrypted_data = decode_profile(encrypted_content)
+        unwrapped_key = Yoti::SSL.decrypt_token(wrapped_key)
+        Yoti::SSL.decipher(unwrapped_key, encrypted_data.iv, encrypted_data.cipher_text)
+      end
     end
   end
 end

data/lib/yoti/share/attribute_issuance_details.rb

@@ -28,7 +28,7 @@ module Yoti
       # @param [Yoti::Protobuf::Sharepubapi::ThirdPartyAttribute] data_entry
       #
       def initialize(data_entry)
-        @token = Base64.encode64(data_entry.issuance_token)
+        @token = Base64.strict_encode64(data_entry.issuance_token)
         begin
           @expiry_date = DateTime.parse(data_entry.issuing_attributes.expiry_date)
         rescue ArgumentError

data/lib/yoti/version.rb

@@ -1,4 +1,4 @@
 module Yoti
   # @return [String] the gem's current version
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.6.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yoti
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Sebastian Zaremba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2020-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport