isaca-rails 0.4.6 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7207131060a5c23b082caef1af6e6189638b4a7fed5092c39d3ef6a3928d4ae5
-  data.tar.gz: 3057cfea6dce1ec4c083e9e81cd5a67d12be8cb53edbb7ca1779bf4e0b40e4ca
+  metadata.gz: 90c702697899fa3268bb9f7e7b9520b40fd5d3b7effd2ed3de3b8626cb44bb4d
+  data.tar.gz: 799f89cdc87027c6330c3cb2a07545e6ea18068bcd7be37661c70afb1774e4bc
 SHA512:
-  metadata.gz: 6e9f19c73ad8bc73ec5044b1d7a6bbf976858a1b3c0b5345432d92d5a593b517001c45cc73aa13dcfeb05f8b37d0ff997cb1cc48edea37fe258c0c132c29d0f2
-  data.tar.gz: c153bcf2826ba59aa15d6c06485bd03ccc139a199eefa5897134603de3df0c5a0dd2213097f4f9f39b7ea7f9ed91e25e17122a0e0b553b407f0843f1761ade36
+  metadata.gz: 0a5961e510658f1922bbbe6dba3a0c58a6c83b8f045a6b605b66c36e5f4f17003087861ac58a7928dd892f6379acc930fb7733c8d8c42a57f359aacbe68c7522
+  data.tar.gz: 1c4efa1deb6a46bec6c88ff47bab3aceca1a19915f5fc33ac4eef6fd194cc1d5df720250a6e4a73480a0abd61cd760faf9749d0731a2da98232cb32a73446044

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/authentication.rb

@@ -160,14 +160,8 @@ module Isaca
         klass = Isaca::Rails.configuration.user_model
 
         # Fetch the first record with a matching imis id or initialize a new record with the given user data.
-        @current_isaca_user = klass.create_with(attributes).find_or_initialize_by(imis_id: isaca_user.imis_id)
-
-        # Update the old user record or save a new user record
-        if @current_isaca_user.new_record?
-          @current_isaca_user.save
-        else
-          @current_isaca_user.update_attributes(attributes)
-        end
+        @current_isaca_user = klass.where(imis_id: isaca_user.imis_id).first_or_initialize
+        @current_isaca_user.update_attributes(attributes)
 
         # Temporal data so we do not need dedicated columns for this but we do need to associate it with the user
         @current_isaca_user.privacy = isaca_user.privacy

data/lib/isaca/rails/authorization.rb

@@ -59,7 +59,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/user.rb

@@ -4,7 +4,7 @@ module Isaca
       extend ActiveSupport::Concern
 
       included do
-        attr_accessor :privacy, :marketing, :country
+        attr_accessor :privacy, :marketing
 
         has_many :claims
 

data/lib/isaca/rails/version.rb

@@ -1,5 +1,5 @@
 module Isaca
   module Rails
-    VERSION = '0.4.6'
+    VERSION = '0.5.0'
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: isaca-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.0
 platform: ruby
 authors:
 - Matthew Orahood
-autorequire: 
+- Shaun Eutsey
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-22 00:00:00.000000000 Z
+date: 2021-09-08 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: []