omniauth-osso 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56e18431f00e10031a36b55c2ebc0fbb472b27fb98cc794bd0925a80bd6a85f4
-  data.tar.gz: 9cf0b3999072a6cceb1ff764cb3c55d5f0c16d0dd122f24c1b8fee6c92eb29d6
+  metadata.gz: '060189c38f08e460d75fea568f52d1d91790e2be8e096e85ad40eb82e16ffbc9'
+  data.tar.gz: 3f40dd45f8ee43d1c5278e84d7fab10147f9281f8dd451b660184b96ace3b928
 SHA512:
-  metadata.gz: 26ac30a6016727d1a97bcd3c2b6a49911da1b044487fb626b111586552e9ccf4cd8dd30b2866e3c4bc84ceb7218fb6200a745ffcc4e34ad906105029a24f16a6
-  data.tar.gz: 92dc68770cc6445875a73375b02f5bc56704630ba735635d97b686476cdf80ad1cbb87a77cbcb030b4cb5c1a8e65a7b0bdc854de6bb3723b3c3fd2decd44d7aa
+  metadata.gz: 8b343a5cf6b1220f4bd10435790c862167e741cba2b2e8d798f137b2e4142628be1e06437fc76153ef298c817317e840befcc005090632e375cfbfd3e8431768
+  data.tar.gz: 6cbf6d78ac3229480f880c5082c781600fe5a42cd0cbd14aa34523d3b0997790310207a245b4d0acac1a4b900a0674b22fc5b7fb3ad352d9cf9e1c1720a62c56

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    omniauth-osso (0.1.8.pre)
-      omniauth (~> 2.0.1)
+    omniauth-osso (0.2.0)
+      omniauth (< 2.0.0)
       omniauth-oauth2 (>= 1.6, < 1.8)
 
 GEM
@@ -33,10 +33,9 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    omniauth (2.0.1)
+    omniauth (1.9.1)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
-      rack-protection
     omniauth-oauth2 (1.7.1)
       oauth2 (~> 1.4)
       omniauth (>= 1.9, < 3)
@@ -48,8 +47,6 @@ GEM
       method_source (~> 1.0)
     public_suffix (4.0.6)
     rack (2.2.3)
-    rack-protection (2.1.0)
-      rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rainbow (3.0.0)

data/lib/omniauth-osso/version.rb

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

data/lib/omniauth/strategies/osso.rb

@@ -88,10 +88,13 @@ module OmniAuth
       def user_param
         return @user_param if defined?(@user_param)
 
-        @user_param = {
-          domain: request.params['domain'],
-          email: request.params['email']
-        }.compact
+        params = request.params.reject { |_k, v| v.empty? }
+
+        @user_param = {}
+        @user_param = { domain: request.params['domain'] } if params['domain']
+        @user_param = { email: request.params['email'] } if params['email']
+
+        @user_param
       end
     end
   end

data/omniauth-osso.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://github.com/enterprise-oss/omniauth-osso'
   gem.license       = 'BSL'
 
-  gem.add_dependency 'omniauth', '~> 2.0.1'
+  gem.add_dependency 'omniauth', '< 2.0.0'
   gem.add_dependency 'omniauth-oauth2', '>= 1.6', '< 1.8'
   gem.add_development_dependency 'bundler', '~> 2.1'
 

data/spec/omniauth/strategies/osso_spec.rb

@@ -70,13 +70,48 @@ describe OmniAuth::Strategies::Osso do
       expect(instance.request_params[:domain]).to eq('example.com')
     end
 
-    it 'includes email 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
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-osso
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Sam Bauch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-25 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.1
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement