oauth_im 0.13.2 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d151de8c9c45dbbe2a8e5a92eca440e59e770432d57b51895982f0ed36d40aa8
-  data.tar.gz: 4b3a5b694824aea1d6456f2efec755b8cbf91209601d9c8e383db5d45dd484bf
+  metadata.gz: cbc27c0f6156c8c268aa642b7bb93ec558df3242ba4935bf6108d25b943e22a7
+  data.tar.gz: bd9bcc76ee46fef4b1d592bf6ad1f27d847aac830195e82d13c878009858fb0c
 SHA512:
-  metadata.gz: 3ea7f1c9800b99a69fd527915c10d9204a47dc13bbcd894b0bb73fab378d68992d14a69f69717a9fda56d86a52e6a3097ab8beeb47990c41fc8c753f43c3a1dd
-  data.tar.gz: a598389dbe4346711a9aed715b41b215a24074eca9b3115b0a27ebe88f5d79aaf84d732cd4e12b12420ddc61b41c954f665278293c390c1dec37b7fbc622060d
+  metadata.gz: b00319d1bf052c6bcfbceac00337ee736d029f797be234dbe96e90c0d02a266dff7382a7075779947aec7b5f3dd448fbd366b84baff2ffa41b8803885cdc32fe
+  data.tar.gz: eb03efb12c05c9f5785ce4cb5d852a940f082c269decc536ffe2bcb98698931a742c885f92db1b666c0bed51d88d5c214a3f9295dab76f537aced0cd0b965de4

data/app/controllers/oauth_im/client_controller.rb

@@ -9,13 +9,27 @@ module OauthIm
 
     def callback
       session[:user_jwt] = user_jwt
-      redirect_to main_app.root_path
+      callback_redirect
     rescue StandardError => e
       Rollbar.warning "rescue OauthIm::ClientController#callback: #{request.original_url} #{e.message}"
       redirect_to oauth_rescue_redirect_path
     end
 
+    def callback_redirect
+      # Fetch the original page the user was on just prior to logging in.
+      # If it's not available, default to the root path.
+      referer_path = session.fetch(:oauth_im_login_referer, '').strip
+      if referer_path.empty?
+        redirect_to main_app.root_path
+      else
+        redirect_to referer_path
+      end
+    end
+
     def login
+      # Set the referer path, if available, so that we can put the user
+      # back on the page they were at before they decided the log in.
+      session[:oauth_im_login_referer] = request.referer
       redirect_to oauth_client.login_url
     end
 

data/app/services/oauth_im/user_client.rb

@@ -25,7 +25,9 @@ module OauthIm
       jwt_token[:roles].include? 'admin'
     end
 
-    alias current_user_id user_id
+    def current_user_id
+      @current_user_id ||= jwt_token[:sub]
+    end
 
     private
 

data/lib/oauth_im/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OauthIm
-  VERSION = '0.13.2'
+  VERSION = '0.14.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oauth_im
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.14.0
 platform: ruby
 authors:
 - Eric Connally
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-18 00:00:00.000000000 Z
+date: 2022-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fusionauth_client