omniauth-parallelmarkets 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a09a136f927f294185559a7dfab444e5fb74998f1de4eeccea20380a4f16de31
-  data.tar.gz: d9dba23f966d094ca5ea5998e9750d4aefba87b8a34069b5372f9ac524aa270c
+  metadata.gz: 9d9f955824566ba7be54bb6041e602513ac5c4cf0a6c41abbcd84b700eabe9ca
+  data.tar.gz: 8a0a0ac60040da68d27a2dcf0061c9d3fc714742cc4cf24e43efcf7de10729b6
 SHA512:
-  metadata.gz: c874ad3849bf22c15ffd1a8388ccbcf0120ad36e24222e7250c4434432ceda003df5628a4f4be2a7be6caac8a6b9dd453aba361909f183f6fb6f95f506b2c5fe
-  data.tar.gz: df94ef490b155c9e7cf1117c3fb925d606e1e6a1faef01a390de63bd9f28d0d9c169069959e106f867268d4851eb481ce5aeaaf730cf71b349c67139abc57f09
+  metadata.gz: 6411a99701c9ac720a070699de9b948c570e950ad80c9cde73eca4d001c9461cbe8d6268a493e1e8e863c4f5364f94a0b6e0da9ae651afc6fc2a57b8c0ddc818
+  data.tar.gz: aa9544f7df643fbfd389fb3d8a16725e6a80f7ec7bd2b857d511e97d0b322daf0127817b04bd49a876d52ffffa3b85b97953462778bc90f7fcf3090816ea6bdd

data/.github/workflows/ci.yml

@@ -0,0 +1,18 @@
+name: Run Tests
+on:
+  push:
+    branches:
+      - master
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@master
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.0.1'
+          bundler-cache: true
+
+      - run: bundle exec rake

data/README.md

@@ -1,5 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/omniauth-parallelmarkets.svg)](https://badge.fury.io/rb/omniauth-parallelmarkets)
-[![Build Status](https://travis-ci.org/parallel-markets/omniauth-parallelmarkets.svg?branch=master)](https://travis-ci.org/parallel-markets/omniauth-parallelmarkets)
+[![Tests](https://github.com/parallel-markets/omniauth-parallelmarkets/actions/workflows/ci.yml/badge.svg)](https://github.com/parallel-markets/omniauth-parallelmarkets/actions/workflows/ci.yml)
 
 # OmniAuth ParallelMarkets
 

data/lib/omniauth-parallelmarkets/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAuth
   module ParallelMarkets
-    VERSION = '0.4.0'
+    VERSION = '0.6.0'
   end
 end

data/lib/omniauth/strategies/parallelmarkets.rb

@@ -9,33 +9,28 @@ module OmniAuth
              site: 'https://api.parallelmarkets.com',
              authorize_url: '/v1/oauth/authorize',
              token_url: '/v1/oauth/token'
-      option :authorize_options, %i[scope force_accreditation_check]
+      option :authorize_options, %i[scope force_accreditation_check force_identity_check identity_claim_override_id]
 
       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'],
+          # from /api/v1/identity
+          identity_details: identity_details
         }
       end
 
@@ -52,24 +47,50 @@ 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 raw_identity
+        @raw_identity ||= scope?(:identity) ? access_token.get('/v1/identity').parsed : {}
+      end
+
+      def identity_details
+        @identity_details ||= raw_identity['identity_details']
+      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

data/omniauth-parallelmarkets.gemspec

@@ -20,5 +20,4 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'omniauth-oauth2', '~> 1.2'
   s.add_development_dependency 'rake', '~> 12.0'
   s.add_development_dependency 'rspec', '~> 3.5'
-  s.add_development_dependency 'rubocop'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-parallelmarkets
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Brian Muller
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-28 00:00:00.000000000 Z
+date: 2021-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Parallel Markets OAuth strategy for OmniAuth.
 email:
 - bamuller@gmail.com
@@ -73,10 +59,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -104,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Parallel Markets OAuth strategy for OmniAuth

data/.rubocop.yml

@@ -1,11 +0,0 @@
-Metrics/LineLength:
-  Enabled: false
-
-Metrics/BlockLength:
-  Enabled: false
-
-Style/Documentation:
-  Enabled: false
-
-Naming/FileName:
-  Enabled: false

data/.travis.yml

@@ -1,6 +0,0 @@
-cache: bundler
-language: ruby
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5