isaca-rails 0.4.7 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dde20172b97d248b8e2e00fb9c46eaf43cea9a6db696ea1b9c417b6ef81f8d2
-  data.tar.gz: 7a0b3892c71331f8ff528ee72106b5479d59e1656dd7d99556312677bccd68f2
+  metadata.gz: a754eb45099830e0ead40a91c429439a7d5d914e1037e870b9a7e550e775da78
+  data.tar.gz: 045334643d6a5caf2040600186f2767833c6bceb7449286562a7a9b465da6c74
 SHA512:
-  metadata.gz: 8ab36a1da69542c74981be964c30384570c886ade06124a9cda4c7c89da06612c50127988262660e01f4f04f4fc7607a798cd285bdefd9dc2e2a5a19d3f152a6
-  data.tar.gz: 6708f386489b9c44282c17d29affb64b5a0a42076baaf1412a11fcaee1cba1607464b49e3cd44e826486891546527883ae39129bafb754cee4bba8365eb45cc3
+  metadata.gz: c0b74bc7d53bc7b56eb6eb937596cb20bf20986f0b4c084e709038104aee2f5f646c68cafb1c5758bfa97be190fcca4ed9a63b74a6a56dbb37ce18f8760cb334
+  data.tar.gz: cb6f501e6792c203942871a3316d36326a86289507b63d7dc581b9087601507f9639bae747ffe3cea18fabd44186fe6191917f1da94039d3338df84af1ccf4de

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

@@ -8,8 +8,17 @@ class Isaca::Rails::UsersConsentController < Isaca::Rails::ApplicationController
   def create
     @form_object = UserConsent::Agreement::FormObject.new(agreement_params)
 
-    if @form_object.report_consent(current_isaca_user.imis_id)
-      flash.notice = t('isaca.rails.user_consent.consent_submitted')
+    if @form_object.valid?
+      response = Isaca::Request::ReportConsent.get(current_isaca_user.imis_id, current_isaca_user.email, {
+          marketing: agreement_params[:marketing_policy]
+      })
+
+      if response
+        flash.notice = t('isaca.rails.user_consent.consent_submitted')
+      else
+        flash.alert = t('isaca.rails.user_consent.consent_failed')
+      end
+
       redirect_after_sign_in_or(root_path)
     else
       render :show

data/app/models/user_consent/agreement/form_object.rb

@@ -1,25 +1,11 @@
 module UserConsent
   module Agreement
-    # Form object used for handling user consent
     class FormObject
       include ActiveModel::Model
 
       attr_accessor :privacy_policy, :marketing_policy
-      validates_acceptance_of :privacy_policy, allow_nil: false
-      validates_presence_of :marketing_policy
-
-
-      # Method used to report user consent of the privacy policy and marketing
-      #
-      # @param options [Hash] Optional. If not provided, marketing consent will default to NO [0].
-      #
-      # == Options
-      # [marketing] Consent for marketing. Acceptable values are 0 [for NO] and 1 [for YES].
-      #
-      # @return [Boolean] Whether or not the consent was successfully reported to ISACA
-      def report_consent(imis_id, options={})
-        Isaca::Request::ReportConsent.get(imis_id, options).success? if valid?
-      end
+      validates :privacy_policy, acceptance: {accept: %w(0 1)}, allow_nil: false
+      validates :marketing_policy, acceptance: {accept: %w(0 1)}, allow_nil: false
 
       # Defining this method allows us to use some ActiveModel patterns. For example, forms will be identified
       # as sign_in instead of session_sign_in_form_object.

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/config/locales/isaca-rails.en.yml

@@ -14,6 +14,7 @@ en:
       user_consent:
         consent_required: Your consent is required before proceeding.
         consent_submitted: You have successfully updated your privacy policy and marketing preferences.
+        consent_failed: An error occurred that prevented you from submitting your consent form.
       administrators:
         email_not_found: Could not find a record with the provided email.
         created: Administrator was successfully created.

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.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,7 @@ module Isaca
       end
 
       def user_has_privilege?(user, privilege)
-        user.claims.select {|c| c.privilege.to_sym == privilege}.any?
+        user.claims.where(privilege: privilege).any?
       end
 
       def claim_symbols(claim_params, state)

data/lib/isaca/rails/version.rb

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

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: isaca-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.5.1
 platform: ruby
 authors:
 - Matthew Orahood
-autorequire: 
+- Shaun Eutsey
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-26 00:00:00.000000000 Z
+date: 2021-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -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,9 +305,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.2.27
+signing_key:
 specification_version: 4
 summary: Summary of Isaca::Rails.
 test_files: []