isaca-rails 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a754eb45099830e0ead40a91c429439a7d5d914e1037e870b9a7e550e775da78
-  data.tar.gz: 045334643d6a5caf2040600186f2767833c6bceb7449286562a7a9b465da6c74
+  metadata.gz: 6edd40f7cdd28e7929a11d0403a7f8f7ee34442683be1c3923b2d4e7e5e1d43e
+  data.tar.gz: 34b8a7e2fc4914f8ed8545be148715a3b2ce21e00d6cff14076fd933c46a6d7c
 SHA512:
-  metadata.gz: c0b74bc7d53bc7b56eb6eb937596cb20bf20986f0b4c084e709038104aee2f5f646c68cafb1c5758bfa97be190fcca4ed9a63b74a6a56dbb37ce18f8760cb334
-  data.tar.gz: cb6f501e6792c203942871a3316d36326a86289507b63d7dc581b9087601507f9639bae747ffe3cea18fabd44186fe6191917f1da94039d3338df84af1ccf4de
+  metadata.gz: 02d0ba2a3806ee43a63b219ebd0ecfb3a16c780efc6b276eec1c9b47d6b8d4a6bc7d4feccb9d7695fa358490da45fa48937575b3cd793f077b2ddacf825964c3
+  data.tar.gz: 586e2bfe28b264e0be53127bdedb2c1aadeb00b7947a6f89f35750982bc4ab6194f556fd2fac0130f157cabf41924bce24cf724a588d699f52eca7af611d616f

data/app/controllers/isaca/rails/platform/administrators_controller.rb

@@ -3,6 +3,9 @@ module Isaca
     module Platform
       class AdministratorsController < ApplicationController
         def index
+          logger = Logger.new(STDOUT)
+          logger.debug "**** Isaca Rails ****"
+          logger.debug "**** Isaca Rails ****"
           @administrators = Isaca::Rails.configuration.user_model.where(admin: true)
         end
 

data/app/controllers/isaca/rails/sessions_controller.rb

@@ -5,7 +5,7 @@ class Isaca::Rails::SessionsController < Isaca::Rails::ApplicationController
 
   def create
     begin
-      authenticate(sign_in_params[:username], sign_in_params[:password])
+      # authenticate(sign_in_params[:username], sign_in_params[:password])
 
       respond_to do |format|
         format.html do

data/lib/isaca/rails/authentication.rb

@@ -15,23 +15,23 @@ 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
-            end
-          end
-        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
+        # end
       end
 
       # A helper method for referencing the user who is currently logged in.
@@ -41,7 +41,7 @@ module Isaca
         if @current_isaca_user
           @current_isaca_user
         else
-          set_current_isaca_user if token_cookie_exists?
+          @current_isaca_user = Isaca::Rails.configuration.user_model.find(session[:user_id])
         end
       end
 

data/lib/isaca/rails/authorization.rb

@@ -9,7 +9,7 @@ module Isaca
 
       def authorize_isaca_user(user = nil)
         # if current_isaca_user.admin?
-        if user.admin?
+        if (!user.nil? && user.admin?) || (!current_isaca_user.nil? && current_isaca_user.admin?)
           if %w(index new show create update destroy).include?(action_name)
             if %w(index show).include?(action_name)
               behavior = 'read'
@@ -61,7 +61,11 @@ module Isaca
       end
 
       def user_has_privilege?(user, privilege)
-        user.claims.where(privilege: privilege).any?
+        unless user.nil?
+          user.claims.where(privilege: privilege).any?
+        else
+          current_isaca_user.has_privilege?(privilege)
+        end
       end
 
       def claim_symbols(claim_params, state)

data/lib/isaca/rails/version.rb

@@ -1,5 +1,5 @@
 module Isaca
   module Rails
-    VERSION = '0.5.1'
+    VERSION = '0.5.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isaca-rails
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Matthew Orahood
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-11 00:00:00.000000000 Z
+date: 2021-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails