devise_g5_authenticatable 1.0.2.rc.1 → 1.0.2.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad0eee25a4da3d85235fb21e4e0faae07e09debedf49e94fb7a02935936842c8
-  data.tar.gz: 98401d80d28e50845b8617362ee778ba0d62fb1c6f2b11840470d3ed808b7f5c
+  metadata.gz: c067c7d918fd55154bae4b5e4e806d7b1f5d0b2c04b577874af118493c110814
+  data.tar.gz: 0d8c7dc8a43e3a89df88f62fd431d575ba4797ad9cbc9dcda30598f870724bd7
 SHA512:
-  metadata.gz: 2482e59fdd4ea7835a75f6c096d85d6fd51b4b207b7cb1cb856944da96ee687f7e49ace5b5d02c0beecb956c560e0ad2083768c3362ca57eb0aa0bbbc83db116
-  data.tar.gz: 3c7c5cea38df574c91065854aa7774c39d75cf581c3ab1635737e890a12095b90af08b371bba352f2c5ada5b71257ca0787409d1ca7580e62e50cd61b7de91a7
+  metadata.gz: 1ff77d6f4d550e2d6ffe66f5d2d3a5931b3ecd94bd4118bb58c14073291641998ad72a7475c34ea2bb62145e08ad9449b1d7fb6827e3081a43f3e93b45158cbd
+  data.tar.gz: e3b67044ef47951292f8158f38ecfd31587164ab0c8e13cc2e6dba42ced0e1205b2cb5d0af549532bfcc3e7c2474c7097003c45fd8c9169eecccd69109a51306

data/Gemfile

@@ -16,7 +16,6 @@ group :test, :development do
   gem 'appraisal'
   gem 'pry-byebug'
   gem 'rspec-rails', '~> 3.6'
-  gem 'rb-readline'
 end
 
 group :test do

data/app/controllers/devise_g5_authenticatable/sessions_controller.rb

@@ -17,7 +17,8 @@ module DeviseG5Authenticatable
       if authorized?
         sign_in_or_register
       else
-        redirect_to(restricted_application_redirect_url)
+        params = { restricted: base_url }
+        redirect_to(restricted_application_redirect_url + params.to_query)
       end
     end
 
@@ -30,7 +31,11 @@ module DeviseG5Authenticatable
     protected
 
     def authorized?
-      accessible_applications.map(&:url).include?(request.base_url) || accessible_applications.map(&:url).include?('global')
+      accessible_applications.map(&:url).include?(base_url) || accessible_applications.map(&:url).include?('global')
+    end
+
+    def base_url
+      request.base_url
     end
 
     def accessible_applications
@@ -66,7 +71,7 @@ module DeviseG5Authenticatable
     end
 
     def remote_sign_out
-      redirect_url = URI.join(request.base_url,
+      redirect_url = URI.join(base_url,
                               after_sign_out_path_for(resource_name))
       redirect_to auth_client.sign_out_url(redirect_url.to_s)
     end

data/lib/devise_g5_authenticatable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DeviseG5Authenticatable
-  VERSION = '1.0.2.rc.1'
+  VERSION = '1.0.2.rc.2'
 end

data/spec/controllers/sessions_controller_spec.rb

@@ -193,7 +193,8 @@ RSpec.describe DeviseG5Authenticatable::SessionsController do
 
       it 'should redirect the user to the restricted_application_redirect_url' do
         create_session
-        expect(subject).to redirect_to(auth_hash.extra.raw_info.restricted_application_redirect_url)
+        params = { restricted: subject.request.base_url }
+        expect(subject).to redirect_to(auth_hash.extra.raw_info.restricted_application_redirect_url + params.to_query)
       end
 
       it 'should not sign in a user' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_g5_authenticatable
 version: !ruby/object:Gem::Version
-  version: 1.0.2.rc.1
+  version: 1.0.2.rc.2
 platform: ruby
 authors:
 - Maeve Revels
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-29 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise