omniauth-osso 0.1.5 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0103d6e8c37362ce1b7280de5ebfd9ee2c7fcb38fb27b7625990cbc880707d8
-  data.tar.gz: 166b30efdda9703dbe1b9d9b1162d076404eb3235972219e7eb793a06f0c12f2
+  metadata.gz: '060189c38f08e460d75fea568f52d1d91790e2be8e096e85ad40eb82e16ffbc9'
+  data.tar.gz: 3f40dd45f8ee43d1c5278e84d7fab10147f9281f8dd451b660184b96ace3b928
 SHA512:
-  metadata.gz: 7fee3a7e97f1d37c9e3b5ae94ce82939dcd71c9b9e1c39d2bb9b08516e9e37cb040a96e432ce3845126fa8f3a1e02ec049a616b519a7905ef39aa1d70c4339e8
-  data.tar.gz: dc3e14fbc609efac8ea657fcfecffd9454eb88b60eb244de699bc40097e3eb1785fbabbc4dfdb1d40ff6e97cba8362fe7539510bd1e04ab63ee755c53f8f148e
+  metadata.gz: 8b343a5cf6b1220f4bd10435790c862167e741cba2b2e8d798f137b2e4142628be1e06437fc76153ef298c817317e840befcc005090632e375cfbfd3e8431768
+  data.tar.gz: 6cbf6d78ac3229480f880c5082c781600fe5a42cd0cbd14aa34523d3b0997790310207a245b4d0acac1a4b900a0674b22fc5b7fb3ad352d9cf9e1c1720a62c56

data/.buildkite/pipeline.yml

@@ -10,8 +10,8 @@ steps:
       - bundle exec rubocop
   
   - block: ":rubygems: Publish :red_button:"
-    branches: "main"
+    if: build.tag != null
   
   - name: "Push :rubygems:"
     commands: "./bin/publish"
-    branches: "main"
+    if: build.tag != null

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+  labels:
+    - "dependencies"

data/.github/workflows/automerge.yml

@@ -0,0 +1,19 @@
+name: auto-merge
+
+on:
+  pull_request:
+
+jobs:
+  auto-approve:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ahmadnassri/action-dependabot-auto-merge@v2
+        with:
+          target: minor
+          github-token: ${{ secrets.TOKEN }}
+      - uses: hmarr/auto-approve-action@v2.0.0
+        if: github.actor == 'dependabot[bot]'
+        with:
+          github-token: "${{ secrets.TOKEN }}"
+      

data/.rubocop.yml

@@ -1,3 +1,6 @@
+AllCops:
+  TargetRubyVersion: 2.4
+
 Layout/LineLength:
   Max: 120
 

data/Gemfile

@@ -7,9 +7,9 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 group :test do
   gem 'pry'
   gem 'rack-test'
-  gem 'rspec', '~> 3.2'
+  gem 'rspec', '~> 3.10'
   gem 'rubocop'
-  gem 'webmock', '~> 3.0'
+  gem 'webmock', '~> 3.11'
 end
 
 gemspec

data/Gemfile.lock

@@ -1,25 +1,28 @@
 PATH
   remote: .
   specs:
-    omniauth-osso (0.1.5)
-      omniauth-oauth2 (~> 1.6.0)
+    omniauth-osso (0.2.0)
+      omniauth (< 2.0.0)
+      omniauth-oauth2 (>= 1.6, < 1.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.0)
-    coderay (1.1.2)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.3)
-    faraday (1.0.1)
+    ast (2.4.2)
+    coderay (1.1.3)
+    crack (0.4.5)
+      rexml
+    diff-lcs (1.4.4)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords
+    faraday-net_http (1.0.1)
     hashdiff (1.0.1)
     hashie (4.1.0)
-    jaro_winkler (1.5.4)
-    jwt (2.2.1)
+    jwt (2.2.2)
     method_source (1.0.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
@@ -33,46 +36,50 @@ GEM
     omniauth (1.9.1)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
-    omniauth-oauth2 (1.6.0)
-      oauth2 (~> 1.1)
-      omniauth (~> 1.9)
-    parallel (1.19.1)
-    parser (2.7.1.0)
-      ast (~> 2.4.0)
-    pry (0.13.0)
+    omniauth-oauth2 (1.7.1)
+      oauth2 (~> 1.4)
+      omniauth (>= 1.9, < 3)
+    parallel (1.20.1)
+    parser (3.0.0.0)
+      ast (~> 2.4.1)
+    pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.4)
-    rack (2.2.2)
+    public_suffix (4.0.6)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rainbow (3.0.0)
+    regexp_parser (2.0.3)
     rexml (3.2.4)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (0.81.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.1)
+    rubocop (1.8.1)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    ruby-progressbar (1.10.1)
-    safe_yaml (1.0.5)
-    unicode-display_width (1.7.0)
-    webmock (3.8.3)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.1)
+      parser (>= 2.7.1.5)
+    ruby-progressbar (1.11.0)
+    ruby2_keywords (0.0.4)
+    unicode-display_width (2.0.0)
+    webmock (3.11.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -85,9 +92,9 @@ DEPENDENCIES
   omniauth-osso!
   pry
   rack-test
-  rspec (~> 3.2)
+  rspec (~> 3.10)
   rubocop
-  webmock (~> 3.0)
+  webmock (~> 3.11)
 
 BUNDLED WITH
    2.1.4

data/LICENSE

@@ -2,33 +2,31 @@ Business Source License 1.1
 
 Parameters
 
-Licensor:             Samuel Bauch
+Licensor:             EnterpriseOSS, Inc.
 Licensed Work:        omniauth-osso
-                      The Licensed Work is (c) 2020 Samuel Bauch.
-Additional Use Grant: You may make use of the Licensed Work, provided that you do
-                      not use the Licensed Work in a Single Sign On Management
-                      Service.
-
-                      A "Single Sign On Management Service" is an offering
-                      (be it free or commercial) that uses the Licensed Work
-                      to allow third parties (other than your employees and 
-                      contractors) to access the functionality of the 
-                      Licensed Work such that any fourth parties directly 
-                      benefit from the authentication, configuration, or 
-                      documentation features of the Licensed Work.
-
-                      You thus may only use the Licensed Work in a manner 
-                      whereby parties who directly benefit from the 
-                      authentication, configuration, or documentation features 
-                      of the Licensed Work are yourself, your employees or 
-                      contractors, and your customers or partners.
-
-Change Date:          2023-05-01
+                      The Licensed Work is (c) 2020 EnterpriseOSS, Inc.
+
+Additional Use Grant: You and your Authorized Users may make use of the 
+                      Licensed Work for your internal business purposes, 
+                      provided that you do not (i) rent, lease, copy, transfer,
+                      resell, sublicense, lease, time-share, or otherwise provide 
+                      access to the Licensed Work to a third party (except 
+                      Authorized Users) or (ii) incorporate the Licensed Work 
+                      (or any portion of such) with, or use it with or to provide,
+                      any site, product, or service, other than on sites/applications 
+                      owned and operated by you.
+                      
+                      An “Authorized User” is defined as an individual person 
+                      (e.g. your employee, contractor, agent) who is registered and 
+                      permitted by you to use the Licensed Work subject to these 
+                      restrictions.
+
+Change Date:          2025-10-01
 
 Change License:       Apache License, Version 2.0
 
 For information about alternative licensing arrangements for the Software,
-contact: hello@enterprise-oss.dev
+contact: hello@enterpriseoss.dev
 
 Notice
 
@@ -108,4 +106,4 @@ other recipients of the licensed work to be provided by Licensor:
 
 3. To specify a Change Date.
 
-4. Not to modify this License in any other way.
+4. Not to modify this License in any other way.

data/lib/omniauth-osso/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAuth
   module Osso
-    VERSION = '0.1.5'
+    VERSION = '0.1.9'
   end
 end

data/lib/omniauth/strategies/osso.rb

@@ -27,9 +27,8 @@ module OmniAuth
 
       def request_params
         {
-          redirect_uri: callback_url,
-          domain: request_domain
-        }
+          redirect_uri: callback_url
+        }.merge(user_param)
       end
 
       uid { raw_info['id'] }
@@ -42,7 +41,8 @@ module OmniAuth
 
       extra do
         {
-          idp: raw_info['idp']
+          idp: raw_info['idp'],
+          requested: raw_info['requested']
         }
       end
 
@@ -82,17 +82,19 @@ module OmniAuth
       protected
 
       def callback_url
-        ENV['OSSO_REDIRECT_URI'] || super
+        full_host + callback_path
       end
 
-      def request_domain
-        return @request_domain if defined?(@request_domain)
+      def user_param
+        return @user_param if defined?(@user_param)
 
-        @request_domain = request.params['domain'] || request.params['email'].split('@')[1]
+        params = request.params.reject { |_k, v| v.empty? }
 
-        raise StandardError if @request_domain.nil?
+        @user_param = {}
+        @user_param = { domain: request.params['domain'] } if params['domain']
+        @user_param = { email: request.params['email'] } if params['email']
 
-        @request_domain
+        @user_param
       end
     end
   end

data/omniauth-osso.gemspec

@@ -10,7 +10,8 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://github.com/enterprise-oss/omniauth-osso'
   gem.license       = 'BSL'
 
-  gem.add_dependency 'omniauth-oauth2', '~> 1.6.0'
+  gem.add_dependency 'omniauth', '< 2.0.0'
+  gem.add_dependency 'omniauth-oauth2', '>= 1.6', '< 1.8'
   gem.add_development_dependency 'bundler', '~> 2.1'
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
@@ -19,4 +20,5 @@ Gem::Specification.new do |gem|
   gem.name          = 'omniauth-osso'
   gem.require_paths = ['lib']
   gem.version       = OmniAuth::Osso::VERSION
+  gem.required_ruby_version = '~> 2.4'
 end

data/spec/omniauth/strategies/osso_spec.rb

@@ -57,12 +57,12 @@ describe OmniAuth::Strategies::Osso do
     subject { fresh_strategy }
 
     before do
-      ENV['OSSO_REDIRECT_URI'] = url
-      ENV['OSSO_BASE_URL'] = 'https://osso-base.com'
+      OmniAuth.config.full_host = 'https://osso-base.com'
     end
 
     it 'includes domain passed as a request param' do
       instance = subject.new('abc', 'def')
+      instance.env = {}
       allow(instance).to receive(:request) do
         double('Request', params: { 'domain' => 'example.com' }, scheme: 'https', url: url)
       end
@@ -70,14 +70,48 @@ describe OmniAuth::Strategies::Osso do
       expect(instance.request_params[:domain]).to eq('example.com')
     end
 
-    it 'includes domain when an email address is passed as an authorize option' do
+    it 'includes email passed as a request param' do
       instance = subject.new('abc', 'def')
-
+      instance.env = {}
       allow(instance).to receive(:request) do
         double('Request', params: { 'email' => 'user@example.com' }, scheme: 'https', url: url)
       end
 
+      expect(instance.request_params[:email]).to eq('user@example.com')
+    end
+
+    it 'only includes email as a request param when both keys are provided' do
+      instance = subject.new('abc', 'def')
+      instance.env = {}
+      allow(instance).to receive(:request) do
+        double('Request', params: { 'email' => 'user@example.com', 'domain' => 'example.com' }, scheme: 'https',
+                          url: url)
+      end
+
+      expect(instance.request_params[:email]).to eq('user@example.com')
+      expect(instance.request_params.keys).to_not include(:domain)
+    end
+
+    it 'domain as a request param when email key is a blank string' do
+      instance = subject.new('abc', 'def')
+      instance.env = {}
+      allow(instance).to receive(:request) do
+        double('Request', params: { 'email' => '', 'domain' => 'example.com' }, scheme: 'https',
+                          url: url)
+      end
+
       expect(instance.request_params[:domain]).to eq('example.com')
+      expect(instance.request_params.keys).to_not include(:email)
+    end
+
+    it 'only includes redirect_uri as a request param if neither email or domain are provided' do
+      instance = subject.new('abc', 'def')
+      instance.env = {}
+      allow(instance).to receive(:request) do
+        double('Request', params: {}, scheme: 'https', url: url)
+      end
+
+      expect(instance.request_params.keys).to eq([:redirect_uri])
     end
   end
 
@@ -96,7 +130,6 @@ describe OmniAuth::Strategies::Osso do
 
     before do
       OmniAuth.config.test_mode = true
-      ENV['OSSO_REDIRECT_URI'] = url
       ENV['OSSO_BASE_URL'] = 'https://osso-base.com'
       allow(instance).to receive(:auth_hash) { auth_hash }
       instance.env = {}
@@ -131,7 +164,6 @@ describe OmniAuth::Strategies::Osso do
     end
 
     it 'calls fail with the client error received' do
-      instance = subject.new('abc', 'def')
       allow(instance).to receive(:request) do
         double('Request', params: { 'error_reason' => 'user_denied', 'error' => 'access_denied' })
       end

metadata

@@ -1,29 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-osso
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.9
 platform: ruby
 authors:
 - Sam Bauch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-17 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: omniauth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -51,6 +71,8 @@ files:
 - ".buildkite/hooks/environment"
 - ".buildkite/hooks/pre-command"
 - ".buildkite/pipeline.yml"
+- ".github/dependabot.yml"
+- ".github/workflows/automerge.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -79,9 +101,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="