isaca-rails 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d06cecd0537c57b9972bccd8f147bd4e5dd5827aa8a139960c84dd6c9545bb29
-  data.tar.gz: 2dacf9bbc7b3e89e343952aec7aa937549f93e49dc8c8aeeb9560716d9fcc7c8
+  metadata.gz: 2e44dfe8d028791c15af16dbff0c76fd7856c039549c38992fec7f3009f60949
+  data.tar.gz: 4c02af179978947338db02822a276e0bb7f399c6b58e9a489c6ab31d10e83585
 SHA512:
-  metadata.gz: aa885ba20b5b7d46ecc6036fff7d3577e60b95dcd44eba908f87a85cdc9e421acf41895a4a862019cdd38327bdc3fedad76c004441d410dcbf58d23a72b0e5f6
-  data.tar.gz: e1397c6576e41eae69fa3eabb4213d40a3174f409c4027eadef29b11dc8d6e837647fdb44054034560ba588c544b89dc4ad3b92bc27da6f913bce729bc6c2e9c
+  metadata.gz: 646dc489fcab3ae19756a482f231a9d87ccc7282589535f49db71a9787a688c45bcb1fe08574a49243afcc11da804e39bc243a0757e108d3dd5d3142baef0cb5
+  data.tar.gz: 1150b56df2379d68f500a1af8fba5dab5cfd09ffb4017ee6b8fd527b8635e1cf274991b1067a5fa2561c2251107bad3b8a4224d0ea287bca1678f1b14c850e28

data/lib/isaca/rails/authentication.rb

@@ -15,29 +15,22 @@ module Isaca
       #
       # @return nil
       def authenticate_isaca_user
-        begin
-          if user_signed_in?
-            if request.path != user_consent_path && redirect_for_consent?
-              session[:after_sign_in_path] = request.fullpath if request.get? && request.format.html?
-              flash.alert = t('isaca.rails.user_consent.consent_required')
-              redirect_to user_consent_path
-            end
-          else
-            session[:after_sign_in_path] = request.fullpath if request.get?
-            flash.alert = t('isaca.rails.sessions.sign_in_required')
-
-            respond_to do |format|
-              format.html {redirect_to sign_in_path}
-              format.json do
-                render json: {error: t('isaca.rails.sessions.sign_in_required')}.to_json, status: :unauthorized
-              end
+        if user_signed_in?
+          if request.path != user_consent_path && redirect_for_consent?
+            session[:after_sign_in_path] = request.fullpath if request.get? && request.format.html?
+            flash.alert = t('isaca.rails.user_consent.consent_required')
+            redirect_to user_consent_path
+          end
+        else
+          session[:after_sign_in_path] = request.fullpath if request.get?
+          flash.alert = t('isaca.rails.sessions.sign_in_required')
+
+          respond_to do |format|
+            format.html {redirect_to sign_in_path}
+            format.json do
+              render json: {error: t('isaca.rails.sessions.sign_in_required')}.to_json, status: :unauthorized
             end
           end
-        rescue Isaca::ServiceError => e
-          cookies.delete('Token', domain: :all) if token_cookie_exists?
-          @current_isaca_user = nil
-          reset_session
-          redirect_to sign_in_path, alert: "ISACA Service Error: #{e.message}"
         end
       end
 
@@ -127,12 +120,18 @@ module Isaca
       # @raise [Isaca::ServiceError] An error can be raised by {Isaca::Request::GetUserDetailsByToken#get} or {Isaca::Request::GetUserByID#get}
       def set_current_isaca_user
         # Using the Token cookie we can fetch our users details from isaca
-        if Isaca::Rails.configuration.cache_sso
-          isaca_user = ::Rails.cache.fetch("isaca/request/get_user_details_by_token/#{cookies['Token']}", expires_in: 2.minutes) do
-            Isaca::Request::GetUserDetailsByToken.get(cookies['Token'])
+        begin
+          if Isaca::Rails.configuration.cache_sso
+            isaca_user = ::Rails.cache.fetch("isaca/request/get_user_details_by_token/#{cookies['Token']}", expires_in: 2.minutes) do
+              Isaca::Request::GetUserDetailsByToken.get(cookies['Token'])
+            end
+          else
+            isaca_user = Isaca::Request::GetUserDetailsByToken.get(cookies['Token'])
           end
-        else
-          isaca_user = Isaca::Request::GetUserDetailsByToken.get(cookies['Token'])
+        rescue Isaca::ExpiredTokenError => e
+          cookies.delete('Token', domain: :all) if token_cookie_exists?
+          reset_session
+          return nil
         end
 
         # The GetUserDetailsByToken endpoint does not return everything we need, we need to supplement our attributes

data/lib/isaca/rails/version.rb

@@ -1,5 +1,5 @@
 module Isaca
   module Rails
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isaca-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Matthew Orahood