isaca-rails 0.4.9 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c752365d4f3c3c7ccf1ed087fa7006498a638d208adcc89fe3e608fb10cd9e6c
-  data.tar.gz: 9e188d05e4eec4f351fafeef745ac52438e9e84d12ada99dcaa6cb86c7a85190
+  metadata.gz: 9fe2347a3e86e465db9c9ec7730bf2807afc0708311667c165a6b0c51e1c0a93
+  data.tar.gz: 84cfaab2259df97943583d60810b0fb540f6b82b0004f6ac22cbcaf4b64cbd2b
 SHA512:
-  metadata.gz: 65f388ba725168dbf2a511de8b36b7520797272896be4aa0af81575331afd4c10e59f8daa4b6f9f06f4bda4365a3a8e46f87e8d1567dc1ad8950ee17e1186fca
-  data.tar.gz: f7e87b83341866b40fdb3d26e9638085bc0ff67d2599c7b94dfa803fa30e7a24307c3c44af7aa3042097f24b42c55b48c5c74675f8df55af9fb52a62b341905a
+  metadata.gz: 55eb6b4c84f4d315ca87869d745fb1bc6c6cfeaa146795839105491ca9aa3c134a8daf814ee9826adaac11c9e27624639318cfaa0c32d3861727236e35a80c11
+  data.tar.gz: c570e50b9fd9811faa85c2453c7bd30904bb391ad43a3599264f359b4363cd046967975a7de29dbedf209d29aa507a0eb183139b46db2a913eec6c3e451d3ee9

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

@@ -7,8 +7,9 @@ module Isaca
         helper_method :user_has_privilege?
       end
 
-      def authorize_isaca_user
-        if current_isaca_user.admin?
+      def authorize_isaca_user(user = nil)
+        # if current_isaca_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'
@@ -24,7 +25,8 @@ module Isaca
           end
 
           privilege = "#{behavior}_#{controller_name.underscore}".to_sym
-          unless user_has_privilege?(current_isaca_user, privilege)
+          # unless user_has_privilege?(current_isaca_user, privilege)
+          unless user_has_privilege?(user, privilege)
             respond_to do |format|
               message = "#{t('isaca.rails.claims.admin_required')} Missing claim: #{privilege}."
 
@@ -59,7 +61,11 @@ module Isaca
       end
 
       def user_has_privilege?(user, privilege)
-        user.claims.select {|c| c.privilege.to_sym == 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.4.9'
+    VERSION = '0.5.3'
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: isaca-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.3
 platform: ruby
 authors:
 - Matthew Orahood
-autorequire: 
+- Shaun Eutsey
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-10 00:00:00.000000000 Z
+date: 2021-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -223,6 +224,7 @@ dependencies:
 description: Description of Isaca::Rails.
 email:
 - morahood@gmail.com
+- seutsey@isaca.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -285,10 +287,10 @@ files:
 - lib/isaca/rails/user.rb
 - lib/isaca/rails/version.rb
 - lib/tasks/isaca/rails_tasks.rake
-homepage: 
+homepage:
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -303,8 +305,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.27
+signing_key:
 specification_version: 4
 summary: Summary of Isaca::Rails.
 test_files: []