omniauth-osso 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0103d6e8c37362ce1b7280de5ebfd9ee2c7fcb38fb27b7625990cbc880707d8
-  data.tar.gz: 166b30efdda9703dbe1b9d9b1162d076404eb3235972219e7eb793a06f0c12f2
+  metadata.gz: ef269453ed0ad4abbd20a3b0fef2798314458a191e8328ab324cb2d901756bf8
+  data.tar.gz: ff3b08d2e09711b81e9200e274c323f01da0b84e0b6006197383cb2a96a30cd8
 SHA512:
-  metadata.gz: 7fee3a7e97f1d37c9e3b5ae94ce82939dcd71c9b9e1c39d2bb9b08516e9e37cb040a96e432ce3845126fa8f3a1e02ec049a616b519a7905ef39aa1d70c4339e8
-  data.tar.gz: dc3e14fbc609efac8ea657fcfecffd9454eb88b60eb244de699bc40097e3eb1785fbabbc4dfdb1d40ff6e97cba8362fe7539510bd1e04ab63ee755c53f8f148e
+  metadata.gz: bebba8a9c1fa6cbf764cd8d524c474095f954c9349fe0f471e8746bb3f72f6f2adba774d32a96fbb29a3c28b7960b8d1770fb8f0967955e4b455ffb92fe7afa1
+  data.tar.gz: d8efb2480199d7ea9d48ad5b296dc10df47f2e001ddad06b01664e4f416e7c82222163ce3845ee1b3aed2920077d4d15ed088789844aa3e692e4e775dbc958d1

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.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    omniauth-osso (0.1.5)
+    omniauth-osso (0.1.6)
       omniauth-oauth2 (~> 1.6.0)
 
 GEM
@@ -14,12 +14,13 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
-    faraday (1.0.1)
+    faraday (1.1.0)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords
     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)
@@ -70,6 +71,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
     ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.2)
     safe_yaml (1.0.5)
     unicode-display_width (1.7.0)
     webmock (3.8.3)

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.6'
   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
 
@@ -85,14 +85,17 @@ module OmniAuth
         ENV['OSSO_REDIRECT_URI'] || super
       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]
+        @user_param = {
+          domain: request.params['domain'],
+          email: request.params['email']
+        }.compact
 
-        raise StandardError if @request_domain.nil?
+        raise StandardError if @user_param.nil?
 
-        @request_domain
+        @user_param
       end
     end
   end

data/omniauth-osso.gemspec

@@ -19,4 +19,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

@@ -70,14 +70,14 @@ 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 when an email address is passed as an authorize option' do
       instance = subject.new('abc', 'def')
 
       allow(instance).to receive(:request) do
         double('Request', params: { 'email' => 'user@example.com' }, scheme: 'https', url: url)
       end
 
-      expect(instance.request_params[:domain]).to eq('example.com')
+      expect(instance.request_params[:email]).to eq('user@example.com')
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-osso
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Sam Bauch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-17 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -51,6 +51,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 +81,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:
   - - ">="