isaca-rails 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 922003fa31906822aca1d5eb508147323572e9cee1af0895a74cf0114a22c871
-  data.tar.gz: 5d095db805d31498d3d78c9b1abcd0a6039a535be6abe4d2afe38ce68dadf809
+  metadata.gz: d06cecd0537c57b9972bccd8f147bd4e5dd5827aa8a139960c84dd6c9545bb29
+  data.tar.gz: 2dacf9bbc7b3e89e343952aec7aa937549f93e49dc8c8aeeb9560716d9fcc7c8
 SHA512:
-  metadata.gz: 265a170b8f57a5ce3f063aeac6561c8caa41d37171fb51792cb32bce2ae89e045d3f6707c8a1ec97159a8f8b4edf8a4dd0cba2ab1cb9d190c9219396512ddbe6
-  data.tar.gz: 18e99a0d95d6ba22b80708173052dd5582e4b670861451ada70eafbf2526f2df0639a3f4410752dd417dbcb58e336b1882672de24d9c8489bba63b7d4241dfba
+  metadata.gz: aa885ba20b5b7d46ecc6036fff7d3577e60b95dcd44eba908f87a85cdc9e421acf41895a4a862019cdd38327bdc3fedad76c004441d410dcbf58d23a72b0e5f6
+  data.tar.gz: e1397c6576e41eae69fa3eabb4213d40a3174f409c4027eadef29b11dc8d6e837647fdb44054034560ba588c544b89dc4ad3b92bc27da6f913bce729bc6c2e9c

data/lib/isaca/rails/authentication.rb

@@ -15,22 +15,29 @@ module Isaca
       #
       # @return nil
       def authenticate_isaca_user
-        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
+        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
             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
 

data/lib/isaca/rails/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isaca-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Matthew Orahood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-15 00:00:00.000000000 Z
+date: 2019-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement