isaca-rails 0.4.8 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7afe3c204bc4c58d289096a6bd76b3361f1aeb73ff76f7c6c16d7867183dcd3e
-  data.tar.gz: b627a1002caab316552a2f8084e4fb9a17527c1567496ae5c6d4c388a5155f3f
+  metadata.gz: 6edd40f7cdd28e7929a11d0403a7f8f7ee34442683be1c3923b2d4e7e5e1d43e
+  data.tar.gz: 34b8a7e2fc4914f8ed8545be148715a3b2ce21e00d6cff14076fd933c46a6d7c
 SHA512:
-  metadata.gz: fb8446322b9a69b9318683bcc8891eb46a69a7b194ffdd071b136c21cd788fd7982366668a3aa48c0cc1ab3ae25ad74b30c84d5705ffc6d4ce44dff87a6dd53c
-  data.tar.gz: 507b7488b1eaa633c0087e2950ae60cb9a8af0dba73e5bd1ceeeff874e286ef74013474f7d3fb4971f1160da1e99259a63a34dd3f3adb3fb4f14579a94288477
+  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/app/views/isaca/rails/users_consent/_form.html.erb

@@ -6,7 +6,7 @@
       <%= f.check_box :privacy_policy %>
 
       ISACA has changed their privacy notice, to access the revised notice and terms,
-      <a href="https://www.isaca.org/pages/Privacy.aspx" target="_blank">click here</a>.
+      <a href="https://www.isaca.org/pages/Privacy.aspx" target="_blank">click here</a> and this Platform's Terms of Use <a href="/terms_of_use" target="_blank">click here</a>.
 
       By continuing to use the site you agree to the revised terms.
     </label>

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.8'
+    VERSION = '0.5.2'
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: isaca-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.5.2
 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-14 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: []