omniauth-parallelmarkets 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf94329fc1db02d346d0d7befbb29fac39e51d30ec66e9a4a8b538951d3c7ec7
-  data.tar.gz: f71b522a1fcf3aee5585575e8446ad97b1d91c0b8bf4dc3f0967fd27a8023bc0
+  metadata.gz: 116a4e6f6b528976b72de3ea0fe9b1fbdb49789abf02fe1ec140596554cedbb9
+  data.tar.gz: a609f558e13b46498bbe870c94873846a13a33a012700d78c261c76826995aa7
 SHA512:
-  metadata.gz: 3e2f2d1096227455fb66d03fa9d6896328113f0ba72b81c269bf771a4d4ad51066ab56cee1395584caa256046bce3b8cb5acd5116f94428f26d15c23dbb53d7b
-  data.tar.gz: 3297663cf3ca60172a2aa44889a546116c6ac5a89cf6132366d1dab693b65cb698abdefcb868831e08eed8c8f90b8e659eca164c002f47fe7a3c55eebb7b25c8
+  metadata.gz: cd138b8aab041a68b18601f66602b5b5753f5f7b820c1def738a024da32471ab72d81711a18ce53d64e4bc421e52d8d1e2d5e4167d52071551f4463d08aa3bb1
+  data.tar.gz: 5487cb23b4ba7b1e4213634ac645b3525f894dfe4e693c7cb9414448d892a6cf400d5f9968db5c48c7b435723635b2691b49ee0347db7110c56694d38094ebba

data/lib/omniauth-parallelmarkets/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAuth
   module ParallelMarkets
-    VERSION = '0.4.2'
+    VERSION = '0.5.0'
   end
 end

data/lib/omniauth/strategies/parallelmarkets.rb

@@ -13,29 +13,22 @@ module OmniAuth
 
       uid { raw_info['id'] }
 
-      info do
-        {
-          name: profile['name'] || "#{profile['first_name']} #{profile['last_name']}",
-          first_name: profile['first_name'],
-          last_name: profile['last_name'],
-          email: profile['email']
-        }
-      end
+      info { to_contact_details(profile) }
 
       extra do
         {
-          accreditations: accreditations,
-          indicated_unaccredited: indicated_unaccredited,
+          authorize_scopes: authorize_scopes,
+          # from /api/v1/me
           business_type: profile['business_type'],
-          primary_contact: profile['primary_contact'].nil? ? nil : {
-            name: "#{profile['primary_contact']['first_name']} #{profile['primary_contact']['last_name']}",
-            first_name: profile['primary_contact']['first_name'],
-            last_name: profile['primary_contact']['last_name'],
-            email: profile['primary_contact']['email']
-          },
+          primary_contact: to_contact_details(profile['primary_contact']),
+          raw_info: raw_info,
           type: raw_info['type'],
           user_id: raw_info['user_id'],
-          raw_info: raw_info
+          user_profile: to_contact_details(user_profile),
+          user_providing_for: raw_info['user_providing_for'],
+          # from /api/v1/accreditations
+          accreditations: accreditations,
+          indicated_unaccredited: raw_accreditations['indicated_unaccredited']
         }
       end
 
@@ -52,24 +45,42 @@ module OmniAuth
         options[:redirect_uri] || (full_host + script_name + callback_path)
       end
 
+      def scope?(single_scope)
+        authorize_scopes.include?(single_scope.to_s)
+      end
+
+      # if given ?scope query parameter, use that. otherwise, use server-side provider configuration
+      def authorize_scopes
+        @authorize_scopes ||= (env['omniauth.params']['scope'] || authorize_params['scope']).split(' ')
+      end
+
       def raw_info
-        @raw_info ||= access_token.get('/v1/me').parsed
+        @raw_info ||= scope?(:profile) ? access_token.get('/v1/me').parsed : {}
       end
 
       def profile
         @profile ||= raw_info.fetch('profile', {})
       end
 
-      def raw_accreditations
-        @raw_accreditations ||= access_token.get('/v1/accreditations').parsed
+      def user_profile
+        @user_profile ||= raw_info.fetch('user_profile', {})
       end
 
-      def indicated_unaccredited
-        raw_accreditations['indicated_unaccredited']
+      def raw_accreditations
+        @raw_accreditations ||= scope?(:accreditation_status) ? access_token.get('/v1/accreditations').parsed : {}
       end
 
       def accreditations
-        raw_accreditations['accreditations']
+        @accreditations ||= raw_accreditations.fetch('accreditations', [])
+      end
+
+      def to_contact_details(contact)
+        (contact.nil? || contact.empty?) ? {} : {
+          name: contact['name'] || "#{contact['first_name']} #{contact['last_name']}",
+          first_name: contact['first_name'],
+          last_name: contact['last_name'],
+          email: contact['email']
+        }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-parallelmarkets
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Brian Muller
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-10 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Parallel Markets OAuth strategy for OmniAuth