omniauth-osso 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d06f1431dfda1ada1148f0bab1f236e31c80ed15e3e3050f1938f30dd508e9e
-  data.tar.gz: c12528d4977371f2d235cb4abcf7630655fb87efd64a4e940cf189d02adb2c5d
+  metadata.gz: df66e95e6c84e90d6a829873da316c0d3cdb336b3b2e126048f25bcea0bfa7c3
+  data.tar.gz: 5ce9214a84bab031917d274952deebbc459817d8e0239ba26bc403a0747ac3ee
 SHA512:
-  metadata.gz: fca2e07d268d7d06f4146ec7cc1ddef34cf13480853e6900d5da33fa445e8512cdb222fc32d30636e9ec682df52a5802d7b8509040a4008102f41179198b153c
-  data.tar.gz: 75b3acc3b3c4af7d898e4f974295ef7d6884fd2b3d661fd3de3352d28af9524d02a250630898bd88f949c2f23d4cfbe372a80227eb08b108de07a2d4c5c2311c
+  metadata.gz: fa41259af8b031cc3acb9a31ae790f698ed8b67bee7b8b795ffc673ed421fcff741460b259cf2003832b8348746510561337bd8002b95357c02cba83ff94f3ec
+  data.tar.gz: 0a0495472379faa31531b12ab6bfd9d4e2c58ca4704c5d411c7ed2c33a5e0eb4fe79a0989ae3abbad9ae5ca2f9d7beaf6e9c079b8c0945212442a46c8283ee22

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/.rubocop.yml

@@ -5,6 +5,10 @@ Metrics/BlockLength:
   Exclude:
     - 'spec/**/*'
 
+Naming/FileName:
+  Exclude:
+    - 'lib/omniauth-osso.rb'
+
 Style/Documentation:
   Exclude:
     - 'spec/**/*'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    omniauth-osso (0.1.0)
+    omniauth-osso (0.1.1)
       omniauth-oauth2 (~> 1.6.0)
 
 GEM

data/bin/console

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 require 'bundler/setup'
-require 'omniauth_osso'
+require 'omniauth-osso'
 
 require 'irb'
 IRB.start(__FILE__)

data/lib/omniauth-osso/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAuth
   module Osso
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/lib/omniauth/strategies/osso.rb

@@ -14,17 +14,28 @@ module OmniAuth
       option :client_secret, nil
       option :client_options, { site: ENV['OSSO_BASE_URL'] }
       option :authorize_params, { state: SecureRandom.hex(24) }
-      option :authorize_options, %i[state domain]
+      option :authorize_options, %i[state]
       option :token_params, {}
       option :token_options, []
       option :auth_token_params, {}
       option :provider_ignores_state, false
 
+      def request_phase
+        redirect(
+          client
+            .auth_code
+            .authorize_url(
+              {
+                redirect_uri: callback_url,
+                domain: request_domain
+              }.merge(authorize_params)
+            )
+        )
+      end
+
       def authorize_params
         params = options.authorize_params.merge(options_for('authorize')) || {}
 
-        raise StandardError if params[:domain].nil?
-
         if OmniAuth.config.test_mode
           @env ||= {}
           @env['rack.session'] ||= {}
@@ -55,14 +66,14 @@ module OmniAuth
 
       protected
 
-      def options_for(option)
-        options_for = options.send(:"#{option}_options")
-        params_for = options.send(:"#{option}_params")
+      def request_domain
+        return @request_domain if defined?(@request_domain)
 
-        options_for.each_with_object({}) do |key, hash|
-          value = params_for[key] || options[key]
-          hash[key.to_sym] = value.respond_to?(:call) ? value.call : value
-        end
+        @request_domain = request.params['domain'] || request.params['email'].split('@')[1]
+
+        raise StandardError if @request_domain.nil?
+
+        @request_domain
       end
     end
   end

data/spec/omniauth/strategies/osso_spec.rb

@@ -39,33 +39,17 @@ describe OmniAuth::Strategies::Osso do
   describe '#authorize_params' do
     subject { fresh_strategy }
 
-    it 'includes the domain authorize param passed in the :authorize_params option' do
-      instance = subject.new('abc', 'def', authorize_params: { domain: 'bar.com' })
-      expect(instance.authorize_params['domain']).to eq('bar.com')
-    end
-
-    it 'includes top-level domain' do
-      instance = subject.new('abc', 'def', domain: 'bar.com')
-      expect(instance.authorize_params['domain']).to eq('bar.com')
-      expect(instance.authorize_params['state']).not_to be_empty
-    end
-
     it 'includes random state in the authorize params' do
-      instance = subject.new('abc', 'def', authorize_params: { domain: 'bar.com' })
+      instance = subject.new('abc', 'def')
       expect(instance.authorize_params.keys).to include('state')
       expect(instance.session['omniauth.state']).not_to be_empty
     end
 
     it 'includes custom state in the authorize params' do
-      instance = subject.new('abc', 'def', authorize_params: { state: proc { 'qux' }, domain: 'foo.com' })
+      instance = subject.new('abc', 'def', authorize_params: { state: 'qux' })
       expect(instance.authorize_params.keys).to include('state')
       expect(instance.session['omniauth.state']).to eq('qux')
     end
-
-    it 'includes state and domain as authorize options' do
-      instance = subject.new('abc', 'def', domain: 'foo.com')
-      expect(instance.authorize_params.keys).to eq(%w[state domain])
-    end
   end
 
   describe '#token_params' do

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@
 $LOAD_PATH.unshift File.expand_path(__dir__)
 $LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 
-require 'omniauth_osso'
+require 'omniauth-osso'
 
 require 'omniauth'
 require 'omniauth-oauth2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-osso
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Sam Bauch
@@ -56,9 +56,9 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- lib/omniauth-osso.rb
 - lib/omniauth-osso/version.rb
 - lib/omniauth/strategies/osso.rb
-- lib/omniauth_osso.rb
 - omniauth-osso.gemspec
 - spec/omniauth/strategies/osso_spec.rb
 - spec/spec_helper.rb