go_sso 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74e802c1f65aec69060e5b79aa378ab4d2470c0a4f3adf7466add39a2875c569
-  data.tar.gz: 60a13a8e3b6045086887e3c1687cf5ae7f03f677d47eee2fc630b19c28a91a01
+  metadata.gz: 904cedd809a2f4bb6f9ddc5ab11b8ed3cae039228ab577d69179141b0cdaf1e5
+  data.tar.gz: 1f5e0e051a65b642a2cd67451fed20331addafd217f9743811fc737128debb13
 SHA512:
-  metadata.gz: 17746ae23a5d433886c56c60b922cb7a43b0abcab8a4f8907badac7107000b2252a3066a951094540a2217515139c303f2dae8830c54fcbd346c46fda4289dca
-  data.tar.gz: 88136bf0a22d248db516aded9bd146efd6c0d3bfbe5458119144604e71e9f00b2d440e49fb1de0fdc706ed725ff1acd24096dbec5a0fa9f28a33ba607a98d19a
+  metadata.gz: '079edece6cd52dc37af2f776c93dcbf25f98c33761d05b1b9aaa5fe2157257fbfb8a5680d0eb335208a643f69a1db9a7c6dd0f038cd44ac4e8b3c7eb075ab644'
+  data.tar.gz: b19abc01a2637483138f1c11d420eb34f004118e9494b45dff14b173c16dda5ecb0c9a02e989eb3de80cea6936dbaf287484e3bb6ef61f0d891df5a56104ddd2

data/lib/go_sso/controllers/helpers.rb

@@ -26,7 +26,7 @@ module GoSso
 
       def authenticate_sso_user_permission
         unless current_sso_user
-          return redirect_to(go_sso_auth_url(redirect_url: request.url))
+          return redirect_to(main_app.go_sso_auth_url(redirect_url: request.url))
         end
 
         unless current_sso_user.can_access?(GoSso.main_app_module_name)

data/lib/go_sso/middleware.rb

@@ -34,8 +34,9 @@ module GoSso
 
     def request_call
       session[:go_sso_referrer] = request.params["redirect_url"] || request.referrer || request.base_url
+
       if GoSso.test_mode?
-        redirect callback_path
+        redirect client_callback_path
       else
         redirect GoSso.authorize_url
       end
@@ -54,18 +55,16 @@ module GoSso
       fail!({ code: error.code, description: error.description })
     end
 
-    def callback_path
-      "#{GoSso.routes_prefix}/callback"
+    def client_callback_path
+      path_with_script_name("#{GoSso.routes_prefix}/callback")
     end
 
     def on_path?(path)
       current_path.casecmp(path).zero?
     end
 
-    CURRENT_PATH_REGEX = %r{/$}.freeze
-    EMPTY_STRING       = ''.freeze
     def current_path
-      @current_path ||= request.path.downcase.sub(CURRENT_PATH_REGEX, EMPTY_STRING)
+      @request.path_info
     end
 
     def request
@@ -93,5 +92,11 @@ module GoSso
     def fail!(hash)
       [200, { 'Content-Type' => 'application/json' }, [hash.to_json]]
     end
+
+    private
+    def path_with_script_name(_path)
+      path = request.script_name.to_s.chomp("/")
+      path << _path if _path.present?
+    end
   end
 end

data/lib/go_sso/version.rb

@@ -1,3 +1,3 @@
 module GoSso
-  VERSION = '0.4.2'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: go_sso
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Yi Feng
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-26 00:00:00.000000000 Z
+date: 2023-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Summary of GoSso.