selfsdk 0.0.193 → 0.0.194

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce09c8f8b8cb4daafea4f4d94f2d1110fd376e8811a9e30f2703a8add593d5ab
-  data.tar.gz: 44d649bce5e7f0d0789954fdde6bbc47896b474a95af8eb536913f1bf5ef8712
+  metadata.gz: 64444c470c0e92c3baf684bfd8470b7c073d24305eaa279a1bee52acb1a9d855
+  data.tar.gz: 2dd352e0b0f31fd3b5144b7cfc48a8f63d60e579d5f1ace40aefde6a72223c33
 SHA512:
-  metadata.gz: 26aad938c2d5c2e0cc2328eb9639f2e15b46805de03f97456cead55d005a21942f13078db7ce75ad6507d134777040e1698a17cab8c9caf075d52407f48222b3
-  data.tar.gz: 39ebfd842ec43b0b425b843dc9cfbf557dff14d5aa411ebd0fb8645ab7f09e81fcb5d71dd134154d9b0d80c6b891416309adf4d2ef285f8f9203cbbd80c834dc
+  metadata.gz: 77b0906799dbb55db2d74ee2ce479a7316bc7de79a2be36ae8b12f3b5e6bd2e38d3ee6633309fea613a4fecc9742e65fa6e5d2916bb24713c614f13427848785
+  data.tar.gz: aff751245062775dcb0a16b2955373ae0f549c2af0f5985d3b7ef4b102c1c9eb21e6599b40bca9d2f5ceee66d115d61c74dee2bec29650e3a4206d6ef9f7d8cf

data/lib/chat/file_object.rb

@@ -40,7 +40,9 @@ module SelfSDK
           begin
             ciphertext = URI.open(input[:link], "Authorization" => "Bearer #{@token}").read
             break
-          rescue
+          rescue => e
+            SelfSDK.logger.warn e.message
+            SelfSDK.logger.warn e.backtrace.join("\n")
             sleep 1
           end
         end

data/lib/messages/fact.rb

@@ -14,14 +14,11 @@ module SelfSDK
       end
 
       def parse(fact)
-        @name = SelfSDK::fact_name(fact[:fact])
-
-        @operator = ""
-        @operator = SelfSDK::operator(fact[:operator]) if fact[:operator]
-
+        @name = @messaging.source.normalize_fact_name! fact[:fact]
+        @operator = @messaging.source.normalize_operator!(fact[:operator])
         @sources = []
         fact[:sources]&.each do |s|
-          @sources << SelfSDK::source(s)
+          @sources << @messaging.source.normalize_source!(s)
         end
 
         @expected_value = fact[:expected_value] || ""

data/lib/messages/fact_response.rb

@@ -43,7 +43,7 @@ module SelfSDK
       end
 
       def fact(name)
-        name = SelfSDK::fact_name(name)
+        name = @messaging.source.normalize_fact_name!(name)
         @facts.select{|f| f.name == name}.first
       end
 

data/lib/messaging.rb

@@ -17,7 +17,7 @@ module SelfSDK
     DEFAULT_STORAGE_DIR="./.self_storage"
     ON_DEMAND_CLOSE_CODE=3999
 
-    attr_accessor :client, :jwt, :device_id, :ack_timeout, :timeout, :type_observer, :uuid_observer, :encryption_client
+    attr_accessor :client, :jwt, :device_id, :ack_timeout, :timeout, :type_observer, :uuid_observer, :encryption_client, :source
 
     # RestClient initializer
     #
@@ -47,6 +47,7 @@ module SelfSDK
       FileUtils.mkdir_p @storage_dir unless File.exist? @storage_dir
       @offset_file = "#{@storage_dir}/#{@jwt.id}:#{@device_id}.offset"
       @offset = read_offset
+      @source = SelfSDK::Sources.new("#{__dir__}/sources.json")
       migrate_old_storage_format
 
       unless options.include? :no_crypto
@@ -283,7 +284,7 @@ module SelfSDK
     end
 
     def subscribe(type, &block)
-      type = SelfSDK::message_type(type) if type.is_a? Symbol
+      type = @source.message_type(type) if type.is_a? Symbol
       @type_observer[type] = { block: block }
     end
 

data/lib/services/facts.rb

@@ -139,13 +139,13 @@ module SelfSDK
         fs = []
         facts.each do |f|
           fact = if f.is_a?(Hash)
-                  f
-                else
-                  { fact: f }
-                end
+                   f
+                 else
+                   { fact: f }
+                 end
           # validate_fact!(fact)
           fs << fact
-        end      
+        end
         fs
       end
 
@@ -156,67 +156,72 @@ module SelfSDK
         raise 'provided fact does not specify a name' if f[:fact].empty?
         return unless f.has_key? :sources
 
-        valid_sources = [ SOURCE_USER_SPECIFIED, 
-                          SOURCE_PASSPORT, 
-                          SOURCE_DRIVING_LICENSE, 
-                          SOURCE_IDENTITY_CARD, 
-                          SOURCE_TWITTER,
-                          SOURCE_LINKEDIN,
-                          SOURCE_FACEBOK ]
-        factsForPassport = [ FACT_DOCUMENT_NUMBER, 
-          FACT_SURNAME, 
-          FACT_GIVEN_NAMES,
-          FACT_DATE_OF_BIRTH,
-          FACT_DATE_OF_EXPIRATION, 
-          FACT_SEX, 
-          FACT_NATIONALITY,
-          FACT_COUNTRY_OF_ISSUANCE ]
-
-        factsForDL = [ FACT_DOCUMENT_NUMBER,
-          FACT_SURNAME,
-          FACT_GIVEN_NAMES,
-          FACT_DATE_OF_BIRTH,
-          FACT_DATE_OF_ISSUANCE,
-          FACT_DATE_OF_EXPIRATION,
-          FACT_ADDRESS, 
-          FACT_ISSUING_AUTHORITY,
-          FACT_PLACE_OF_BIRTH, 
-          FACT_COUNTRY_OF_ISSUANCE ]
-
-        factsForUser = [ FACT_DOCUMENT_NUMBER,
-          FACT_DISPLAY_NAME,
-          FACT_EMAIL,
-          FACT_PHONE ]
-
-        factsForTwitter = [ FACT_ACCOUNT_ID, FACT_NICKNAME ]
-        factsForLinkedin = [ FACT_ACCOUNT_ID, FACT_NICKNAME ]
-        factsForFacebook = [ FACT_ACCOUNT_ID, FACT_NICKNAME ]
-  
+        valid_sources = [SOURCE_USER_SPECIFIED,
+                         SOURCE_PASSPORT,
+                         SOURCE_DRIVING_LICENSE,
+                         SOURCE_IDENTITY_CARD,
+                         SOURCE_TWITTER,
+                         SOURCE_LINKEDIN,
+                         SOURCE_FACEBOK]
+        fact_for_passport = [FACT_DOCUMENT_NUMBER,
+                             FACT_SURNAME,
+                             FACT_GIVEN_NAMES,
+                             FACT_DATE_OF_BIRTH,
+                             FACT_DATE_OF_EXPIRATION,
+                             FACT_SEX,
+                             FACT_NATIONALITY,
+                             FACT_COUNTRY_OF_ISSUANCE]
+
+        facts_for_dl = [FACT_DOCUMENT_NUMBER,
+                        FACT_SURNAME,
+                        FACT_GIVEN_NAMES,
+                        FACT_DATE_OF_BIRTH,
+                        FACT_DATE_OF_ISSUANCE,
+                        FACT_DATE_OF_EXPIRATION,
+                        FACT_ADDRESS, 
+                        FACT_ISSUING_AUTHORITY,
+                        FACT_PLACE_OF_BIRTH, 
+                        FACT_COUNTRY_OF_ISSUANCE]
+
+        facts_for_user = [FACT_DOCUMENT_NUMBER,
+                          FACT_DISPLAY_NAME,
+                          FACT_EMAIL,
+                          FACT_PHONE]
+
+        facts_for_twitter = [FACT_ACCOUNT_ID, FACT_NICKNAME]
+        facts_for_linkedin = [FACT_ACCOUNT_ID, FACT_NICKNAME]
+        facts_for_facebook = [FACT_ACCOUNT_ID, FACT_NICKNAME]
+        facts_for_live = [FACT_SELFIE]
+
         f[:sources].each do |s|
           raise errInvalidSource unless valid_sources.include? s.to_s
 
           if s.to_s == SOURCE_PASSPORT || s.to_s == SOURCE_IDENTITY_CARD
-            raise errInvalidFactToSource unless factsForPassport.include? f[:fact]
+            raise errInvalidFactToSource unless fact_for_passport.include? f[:fact]
           end
 
           if s.to_s == SOURCE_DRIVING_LICENSE
-            raise errInvalidFactToSource unless factsForDL.include? f[:fact]
+            raise errInvalidFactToSource unless facts_for_dl.include? f[:fact]
           end
 
           if s.to_s == SOURCE_USER_SPECIFIED
-            raise errInvalidFactToSource unless factsForUser.include? f[:fact].to_s
+            raise errInvalidFactToSource unless facts_for_user.include? f[:fact].to_s
           end
 
           if s.to_s == SOURCE_TWITTER
-            raise errInvalidFactToSource unless factsForTwitter.include? f[:fact].to_s
+            raise errInvalidFactToSource unless facts_for_twitter.include? f[:fact].to_s
           end
 
           if s.to_s == SOURCE_LINKEDIN
-            raise errInvalidFactToSource unless factsForLinkedin.include? f[:fact].to_s
+            raise errInvalidFactToSource unless facts_for_linkedin.include? f[:fact].to_s
           end
 
           if s.to_s == SOURCE_FACEBOOK
-            raise errInvalidFactToSource unless factsForFacebok.include? f[:fact].to_s
+            raise errInvalidFactToSource unless facts_for_facebook.include? f[:fact].to_s
+          end
+
+          if s.to_s == SOURCE_LIVE
+            raise errInvalidFactToSource unless facts_for_live.include? f[:fact].to_s
           end
         end
       end

data/lib/sources.rb

@@ -2,38 +2,42 @@
 
 # frozen_string_literal: true
 
+require "json"
 module SelfSDK
-  FACT_EMAIL = "email_address"
-  FACT_PHONE = "phone_number"
-  FACT_DISPLAY_NAME = "display_name"
-  FACT_DOCUMENT_NUMBER = "document_number"
-  FACT_GIVEN_NAMES = "given_names"
-  FACT_SURNAME = "surname"
-  FACT_SEX = "sex"
-  FACT_ISSUING_AUTHORITY = "issuing_authority"
-  FACT_NATIONALITY = "nationality"
-  FACT_ADDRESS = "address"
-  FACT_PLACE_OF_BIRTH = "place_of_birth"
-  FACT_DATE_OF_BIRTH = "date_of_birth"
-  FACT_DATE_OF_ISSUANCE = "date_of_issuance"
-  FACT_DATE_OF_EXPIRATION = "date_of_expiration"
-  FACT_VALID_FROM = "valid_from"
-  FACT_VALID_TO = "valid_to"
-  FACT_CATEGORIES = "categories"
-  FACT_SORT_CODE = "sort_code"
-  FACT_COUNTRY_OF_ISSUANCE = "country_of_issuance"
-  FACT_ACCOUNT_ID = "account_id"
-  FACT_NICKNAME = "nickname"
+  class Sources
+    def initialize(sources_file)
+      file = File.open sources_file
+      data = JSON.load(file)
+      file.close
+      @sources = data["sources"]
+      @facts = []
+      @sources.each do |source, facts|
+        @facts.push(*facts)
+      end
+    end
+
+    def normalize_fact_name!(fact)
+      fact = fact.to_s
+      raise "invalid fact '#{fact}'" unless @facts.include?(fact)
+      fact
+    end
+
+    def validate_source!(source)
+      raise "invalid source '#{source}'" unless @sources.keys.include?(source.to_s)
+    end
+
+    def normalize_operator!(input)
+      return "" unless input
 
-  SOURCE_USER_SPECIFIED = "user_specified"
-  SOURCE_PASSPORT = "passport"
-  SOURCE_DRIVING_LICENSE = "driving_license"
-  SOURCE_IDENTITY_CARD = "identity_card"
-  SOURCE_TWITTER = "twitter"
-  SOURCE_LINKEDIN = "linkedin"
-  SOURCE_FACEBOOK = "facebook"
+      operators = { equals: '==',
+                    different: '!=',
+                    great_or_equal_than: '>=',
+                    less_or_equal: '<=',
+                    great_than: '>',
+                    less_than: '<' }
+      get(operators, input, "operator")
+    end
 
-  class << self
     def message_type(s)
       types = { authentication_request: SelfSDK::Messages::AuthenticationReq::MSG_TYPE,
                 authentication_response: SelfSDK::Messages::AuthenticationResp::MSG_TYPE,
@@ -51,51 +55,7 @@ module SelfSDK
       return types[s]
     end
 
-    def operator(input)
-      operators = { equals: '==',
-                    different: '!=',
-                    great_or_equal_than: '>=',
-                    less_or_equal: '<=',
-                    great_than: '>',
-                    less_than: '<' }
-      get(operators, input, "operator")
-    end
-
-    def fact_name(input)
-      facts = { email_address: FACT_EMAIL,
-                phone_number: FACT_PHONE,
-                display_name: FACT_DISPLAY_NAME,
-                document_number: FACT_DOCUMENT_NUMBER,
-                given_names: FACT_GIVEN_NAMES,
-                surname: FACT_SURNAME,
-                sex: FACT_SEX,
-                issuing_authority: FACT_ISSUING_AUTHORITY,
-                nationality: FACT_NATIONALITY,
-                address: FACT_ADDRESS,
-                place_of_birth: FACT_PLACE_OF_BIRTH,
-                date_of_birth: FACT_DATE_OF_BIRTH,
-                date_of_issuance: FACT_DATE_OF_ISSUANCE,
-                date_of_expiration: FACT_DATE_OF_EXPIRATION,
-                valid_from: FACT_VALID_FROM,
-                valid_to: FACT_VALID_TO,
-                categories: FACT_CATEGORIES,
-                sort_code: FACT_SORT_CODE,
-                country_of_issuance: FACT_COUNTRY_OF_ISSUANCE, 
-                account_id: FACT_ACCOUNT_ID,
-                nickname: FACT_NICKNAME }
-      get(facts, input, "fact")
-    end
-
-    def source(input)
-      sources = { user_specified: SOURCE_USER_SPECIFIED,
-                passport: SOURCE_PASSPORT,
-                driving_license: SOURCE_DRIVING_LICENSE,
-                identity_card: SOURCE_IDENTITY_CARD,
-                twitter: SOURCE_TWITTER,
-                linkedin: SOURCE_LINKEDIN,
-                facebook: SOURCE_FACEBOOK }
-      get(sources, input, "source")
-    end
+    private
 
     def get(options, input, option_type)
       if input.is_a? Symbol
@@ -105,6 +65,5 @@ module SelfSDK
       raise "invalid #{option_type} '#{input}'" unless options.values.include? input
       input
     end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selfsdk
 version: !ruby/object:Gem::Version
-  version: 0.0.193
+  version: 0.0.194
 platform: ruby
 authors:
 - Aldgate Ventures