omniauth-parallelmarkets 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a546b67917507c45b98686e72e5438d9d353d32714d55f47cf98df2d68e3ad26
-  data.tar.gz: 5f7c9ac005253ae226d006760d6405332222ed3da874f342806beccbc12423ff
+  metadata.gz: 116a4e6f6b528976b72de3ea0fe9b1fbdb49789abf02fe1ec140596554cedbb9
+  data.tar.gz: a609f558e13b46498bbe870c94873846a13a33a012700d78c261c76826995aa7
 SHA512:
-  metadata.gz: a4a1cbc37e8e3b9f9cc4b5b5c051224d545c8b809ceb87ae4668638fb8ae0792695cbeab5465e15fe284bb5ffdb66d6c5f31f2661f1e9f6e0b3b487182f07bd5
-  data.tar.gz: 90a28c0e4615bebe6908c0764b7a57e6b2a0fee3d8bfbf07559928b895939c9cd65acf1f93ba90bad5c830c69911fbf6bb62031687a1cc658fd816fd0d1ddd95
+  metadata.gz: cd138b8aab041a68b18601f66602b5b5753f5f7b820c1def738a024da32471ab72d81711a18ce53d64e4bc421e52d8d1e2d5e4167d52071551f4463d08aa3bb1
+  data.tar.gz: 5487cb23b4ba7b1e4213634ac645b3525f894dfe4e693c7cb9414448d892a6cf400d5f9968db5c48c7b435723635b2691b49ee0347db7110c56694d38094ebba

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.3.0'
+    VERSION = '0.5.0'
   end
 end

data/lib/omniauth/strategies/parallelmarkets.rb

@@ -9,26 +9,26 @@ 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,
+          authorize_scopes: authorize_scopes,
+          # from /api/v1/me
           business_type: profile['business_type'],
+          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
 
@@ -45,20 +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 user_profile
+        @user_profile ||= raw_info.fetch('user_profile', {})
+      end
+
       def raw_accreditations
-        @raw_accreditations ||= access_token.get('/v1/accreditations').parsed
+        @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

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.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Brian Muller
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2021-06-22 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
@@ -89,7 +74,7 @@ homepage: https://github.com/parallel-markets/omniauth-parallelmarkets
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -104,8 +89,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Parallel Markets OAuth strategy for OmniAuth
 test_files: []

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