decidim-decidim_awesome 0.12.3 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e111d7d8a993a82615ebe5876f238141d046d140d17cc2ce8a47bd57a6e4028b
-  data.tar.gz: 21012c001100d7bb1fdc7555a6650b695ba990bca5b38e0014ac78082af6f15e
+  metadata.gz: 85eb621adc0f8d42ade17d24162061418885a2d566fab94af0ede1a195c1cf06
+  data.tar.gz: ae6688521eb2a8f81d02f67790ea25e6ca1be0466e0874d6f624431b65a73c31
 SHA512:
-  metadata.gz: 70df95271a2b16f3510ee8fa6549ec616f9c38963b5266291acfa8ec0bf572980af1781474be44b55ee0bd4cdff04efbfb6c135ca48bafe2676ab9d8a2ffc3c6
-  data.tar.gz: 6e75d54f61ffde030812ff30e6f4ec58b6db4d2e1ce8168f38c58921efa3bf8a648c4c5c58801a714e0740beeabb3d16df97319badab04bae70cd6171169114b
+  metadata.gz: b4b183a80725bc02a7c518f1de438eb182e2b1108c4d2ab935d47cd959abf8890da6d587990dc5de64194a69513bf7d758c9d763084c853ae83b62998c0d850c
+  data.tar.gz: 75aa3a809688d9d5f8a4cfa51a2cea964b1deeb214d9ad774a6869dadc6c81bcf640182ec9577a7b3dd840f5a74916a73c28e1c1913f03ed30ab8b5569605bab

data/CHANGELOG.md

@@ -1,7 +1,19 @@
 CHANGELOG
 =========
 
-v0.12.2
+v0.12.4
+-------
+Compatibility:
+  - Decidim 0.29.x
+
+Features:
+  - Added application context for config constraints (whether the user is logged or not)
+  - Allow to granular permissions to forced verifications.
+    **NOTE** Config var `force_authorization_after_login` has changed to `force_authorizations`
+  - Fix use of Hashcash in loginModals
+  - Fix validation overrides in the admin for proposals
+
+v0.12.3
 -------
 
 Compatibility:

data/README.md

@@ -387,7 +387,7 @@ Admins can manage these settings in the Awesome admin panel under the "Verificat
 ![Forced verifications admin side](examples/forced_verifications_admin.png)
 ![Forced verifications public side](examples/forced_verifications_public.png)
 
-Note that some pages are allowed, you can even configure which controller are allowed by creating an initializer ("required_authorizations" and "authorizations" are always allowed):
+You can configure which controller are allowed by creating an initializer (some controllers like the login, terms and conditions, etc. are always allowed):
 
 ```ruby
 # config/initializers/decidim_awesome.rb

data/app/commands/concerns/decidim/decidim_awesome/admin/needs_constraint_helpers.rb

@@ -6,12 +6,46 @@ module Decidim
       module NeedsConstraintHelpers
         private
 
-        def create_constraint_never(var)
-          settings = { "participatory_space_manifest" => "none" }
-          subconfig = AwesomeConfig.find_or_initialize_by(var: "#{var}_#{@ident}", organization: @organization)
+        attr_reader :organization, :config_var
+
+        def ident
+          @ident ||= rand(36**8).to_s(36)
+        end
+
+        def find_var
+          @find_var ||= AwesomeConfig.find_or_initialize_by(var: config_var, organization:)
+        end
+
+        def find_sub_var
+          @find_sub_var ||= AwesomeConfig.find_or_initialize_by(var: "#{config_var.to_s.singularize}_#{ident}", organization:)
+        end
+
+        def create_array_config!(default_attributes = nil)
+          find_var.value = [] unless find_var.value.is_a?(Array)
+          find_var.value << default_attributes if default_attributes
+          find_var.save!
+          find_var
+        end
+
+        def create_hash_config!(default_attributes = nil)
+          find_var.value = {} unless find_var.value.is_a?(Hash)
+          find_var.value[ident] = default_attributes if default_attributes
+          find_var.save!
+          find_var
+        end
+
+        def destroy_hash_ident!
+          find_var.value.except!(ident)
+          find_var.save!
+
+          # remove associated sub var (dependents will be destroyed automatically via ActiveRecord triggers)
+          find_sub_var.destroy! if find_sub_var.present?
+        end
+
+        def create_constraint_never!
           @constraint = ConfigConstraint.create!(
-            awesome_config: subconfig,
-            settings:
+            awesome_config: find_sub_var,
+            settings: { "participatory_space_manifest" => "none" }
           )
         end
 

data/app/commands/decidim/decidim_awesome/admin/create_authorization_group.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class CreateAuthorizationGroup < Command
+        include NeedsConstraintHelpers
+        # Public: Initializes the command.
+        #
+        def initialize(organization, config_var = :force_authorizations)
+          @organization = organization
+          @config_var = config_var
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          create_hash_config!(attributes)
+
+          create_constraint_never!
+
+          broadcast(:ok, ident)
+        rescue StandardError => e
+          broadcast(:invalid, e.message)
+        end
+
+        private
+
+        def attributes
+          {
+            "authorization_handlers" => {},
+            "force_authorization_help_text" => {}
+          }
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/decidim_awesome/admin/create_custom_redirect.rb

@@ -4,11 +4,14 @@ module Decidim
   module DecidimAwesome
     module Admin
       class CreateCustomRedirect < Command
+        include NeedsConstraintHelpers
         # Public: Initializes the command.
         #
         def initialize(form)
           @form = form
-          @redirections = AwesomeConfig.find_or_initialize_by(var: :custom_redirects, organization: form.current_organization)
+          @ident = form.to_params[0]
+          @organization = form.current_organization
+          @config_var = :custom_redirects
         end
 
         # Executes the command. Broadcasts these events:
@@ -21,7 +24,8 @@ module Decidim
           return broadcast(:invalid) if form.invalid?
           return broadcast(:invalid, I18n.t("custom_redirects.origin_exists", scope: "decidim.decidim_awesome.admin")) if url_exists?
 
-          create_redirection!
+          create_hash_config!(form.to_params[1])
+
           broadcast(:ok)
         rescue StandardError => e
           broadcast(:invalid, e.message)
@@ -29,21 +33,13 @@ module Decidim
 
         private
 
-        attr_reader :form, :redirections
-
-        delegate :to_params, to: :form
-
-        def create_redirection!
-          redirections.value = {} unless redirections.value.is_a? Hash
-          redirections.value[to_params[0]] = to_params[1]
-          redirections.save!
-        end
+        attr_reader :form
 
         def url_exists?
-          return false unless redirections
-          return false unless redirections.value.is_a? Hash
+          return false unless find_var
+          return false unless find_var.value.is_a? Hash
 
-          redirections.value[form.origin].present?
+          find_var.value[form.origin].present?
         end
       end
     end

data/app/commands/decidim/decidim_awesome/admin/create_menu_hack.rb

@@ -4,11 +4,13 @@ module Decidim
   module DecidimAwesome
     module Admin
       class CreateMenuHack < Command
+        include NeedsConstraintHelpers
         # Public: Initializes the command.
         #
         def initialize(form, menu_name)
           @form = form
-          @menu = AwesomeConfig.find_or_initialize_by(var: menu_name, organization: form.current_organization)
+          @config_var = menu_name
+          @organization = form.current_organization
         end
 
         # Executes the command. Broadcasts these events:
@@ -21,22 +23,21 @@ module Decidim
           return broadcast(:invalid) if form.invalid?
           return broadcast(:invalid, I18n.t("menu_hacks.url_exists", scope: "decidim.decidim_awesome.admin")) if url_exists?
 
-          menu.value = [] unless menu.value.is_a? Array
-          menu.value << to_params
-          menu.save!
-          broadcast(:ok, menu)
+          create_array_config!(to_params)
+
+          broadcast(:ok, find_var)
         rescue StandardError => e
           broadcast(:invalid, e.message)
         end
 
         private
 
-        attr_reader :form, :menu
+        attr_reader :form
 
         def url_exists?
-          return false unless menu
+          return false unless find_var
 
-          menu.value&.detect { |i| i["url"] == form.url.gsub(/\?.*/, "") }
+          find_var.value&.detect { |i| i["url"] == form.url.gsub(/\?.*/, "") }
         end
 
         def to_params

data/app/commands/decidim/decidim_awesome/admin/create_proposal_custom_field.rb

@@ -10,7 +10,6 @@ module Decidim
         #
         def initialize(organization, config_var = :proposal_custom_fields)
           @organization = organization
-          @ident = rand(36**8).to_s(36)
           @config_var = config_var
         end
 
@@ -21,15 +20,11 @@ module Decidim
         #
         # Returns nothing.
         def call
-          fields = AwesomeConfig.find_or_initialize_by(var: @config_var, organization: @organization)
-          fields.value = {} unless fields.value.is_a? Hash
-          # TODO: prevent (unlikely) colisions with exisiting values
-          fields.value[@ident] = default_definition
-          fields.save!
+          create_hash_config!(default_definition)
 
-          create_constraint_never(@config_var == :proposal_custom_fields ? :proposal_custom_field : :proposal_private_custom_field)
+          create_constraint_never!
 
-          broadcast(:ok, @ident)
+          broadcast(:ok, ident)
         rescue StandardError => e
           broadcast(:invalid, e.message)
         end

data/app/commands/decidim/decidim_awesome/admin/create_scoped_admin.rb

@@ -10,7 +10,7 @@ module Decidim
         #
         def initialize(organization)
           @organization = organization
-          @ident = rand(36**8).to_s(36)
+          @config_var = :scoped_admins
         end
 
         # Executes the command. Broadcasts these events:
@@ -20,15 +20,11 @@ module Decidim
         #
         # Returns nothing.
         def call
-          admins = AwesomeConfig.find_or_initialize_by(var: :scoped_admins, organization: @organization)
-          admins.value = {} unless admins.value.is_a? Hash
-          # TODO: prevent (unlikely) colisions with exisiting values
-          admins.value[@ident] = []
-          admins.save!
+          create_hash_config!([])
 
-          create_constraint_never(:scoped_admin)
+          create_constraint_never!
 
-          broadcast(:ok, @ident)
+          broadcast(:ok, ident)
         rescue StandardError => e
           broadcast(:invalid, e.message)
         end

data/app/commands/decidim/decidim_awesome/admin/create_scoped_style.rb

@@ -4,11 +4,11 @@ module Decidim
   module DecidimAwesome
     module Admin
       class CreateScopedStyle < Command
+        include NeedsConstraintHelpers
         # Public: Initializes the command.
         #
         def initialize(organization, config_var = :scoped_styles)
           @organization = organization
-          @ident = rand(36**8).to_s(36)
           @config_var = config_var
         end
 
@@ -19,13 +19,9 @@ module Decidim
         #
         # Returns nothing.
         def call
-          styles = AwesomeConfig.find_or_initialize_by(var: @config_var, organization: @organization)
-          styles.value = {} unless styles.value.is_a? Hash
-          # TODO: prevent (unlikely) colisions with exisiting values
-          styles.value[@ident] = ""
-          styles.save!
+          create_hash_config!("")
 
-          broadcast(:ok, @ident)
+          broadcast(:ok, ident)
         rescue StandardError => e
           broadcast(:invalid, e.message)
         end

data/app/commands/decidim/decidim_awesome/admin/destroy_authorization_group.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      class DestroyAuthorizationGroup < Command
+        include NeedsConstraintHelpers
+        # Public: Initializes the command.
+        #
+        # key - the key to destroy inside force_authorizations
+        # organization - the organization to which the config belongs
+        def initialize(key, organization, config_var = :force_authorizations)
+          @ident = key
+          @organization = organization
+          @config_var = config_var
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid, "Not a hash") unless find_var&.value.is_a?(Hash)
+          return broadcast(:invalid, "#{ident} key invalid") unless find_var.value.has_key?(ident)
+
+          destroy_hash_ident!
+
+          broadcast(:ok, ident)
+        rescue StandardError => e
+          broadcast(:invalid, e.message)
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/decidim_awesome/admin/destroy_custom_redirect.rb

@@ -4,14 +4,15 @@ module Decidim
   module DecidimAwesome
     module Admin
       class DestroyCustomRedirect < Command
+        include NeedsConstraintHelpers
         # Public: Initializes the command.
         #
-        # item - the redirections item to destroy
+        # item - the redirects item to destroy
         # organization
         def initialize(item, organization)
           @item = item
           @organization = organization
-          @redirections = AwesomeConfig.find_by(var: :custom_redirects, organization:)
+          @config_var = :custom_redirects
         end
 
         # Executes the command. Broadcasts these events:
@@ -23,23 +24,23 @@ module Decidim
         def call
           return broadcast(:invalid) unless url_exists?
 
-          redirections.value&.except!(item.origin)
-          redirections.save!
+          find_var.value&.except!(item.origin)
+          find_var.save!
 
-          broadcast(:ok, @item)
+          broadcast(:ok, item)
         rescue StandardError => e
           broadcast(:invalid, e.message)
         end
 
         private
 
-        attr_reader :organization, :item, :redirections
+        attr_reader :item
 
         def url_exists?
-          return false unless redirections
-          return false unless redirections.value.is_a? Hash
+          return false unless find_var
+          return false unless find_var.value.is_a? Hash
 
-          redirections.value[item.origin].present?
+          find_var.value[item.origin].present?
         end
       end
     end

data/app/commands/decidim/decidim_awesome/admin/destroy_menu_hack.rb

@@ -4,6 +4,7 @@ module Decidim
   module DecidimAwesome
     module Admin
       class DestroyMenuHack < Command
+        include NeedsConstraintHelpers
         # Public: Initializes the command.
         #
         # item - the menu item to destroy
@@ -11,7 +12,7 @@ module Decidim
         def initialize(item, menu_name, organization)
           @item = item
           @organization = organization
-          @menu = AwesomeConfig.find_by(var: menu_name, organization:)
+          @config_var = menu_name
         end
 
         # Executes the command. Broadcasts these events:
@@ -23,8 +24,8 @@ module Decidim
         def call
           return broadcast(:invalid) unless url_exists?
 
-          menu.value&.reject! { |i| i["url"] == item.url }
-          menu.save!
+          find_var.value&.reject! { |i| i["url"] == item.url }
+          find_var.save!
 
           broadcast(:ok, @item)
         rescue StandardError => e
@@ -33,13 +34,13 @@ module Decidim
 
         private
 
-        attr_reader :organization, :item, :menu
+        attr_reader :organization, :item
 
         def url_exists?
-          return false unless menu
-          return false unless menu.value.is_a? Array
+          return false unless find_var
+          return false unless find_var.value.is_a? Array
 
-          menu.value&.detect { |i| i["url"] == item.url }
+          find_var.value&.detect { |i| i["url"] == item.url }
         end
       end
     end

data/app/commands/decidim/decidim_awesome/admin/destroy_proposal_custom_field.rb

@@ -4,12 +4,13 @@ module Decidim
   module DecidimAwesome
     module Admin
       class DestroyProposalCustomField < Command
+        include NeedsConstraintHelpers
         # Public: Initializes the command.
         #
-        # key - the key to destroy inise proposal_custom_fields
+        # key - the key to destroy init proposal_custom_fields
         # organization
         def initialize(key, organization, config_var = :proposal_custom_fields)
-          @key = key
+          @ident = key
           @organization = organization
           @config_var = config_var
         end
@@ -21,19 +22,12 @@ module Decidim
         #
         # Returns nothing.
         def call
-          fields = AwesomeConfig.find_by(var: @config_var, organization: @organization)
-          return broadcast(:invalid, "Not a hash") unless fields&.value.is_a? Hash
-          return broadcast(:invalid, "#{key} key invalid") unless fields.value.has_key?(@key)
+          return broadcast(:invalid, "Not a hash") unless find_var&.value.is_a? Hash
+          return broadcast(:invalid, "#{ident} key invalid") unless find_var.value.has_key?(ident)
 
-          fields.value.except!(@key)
-          fields.save!
+          destroy_hash_ident!
 
-          # remove constrains associated (a new config var is generated automatically, by removing it, it will trigger destroy on dependents)
-          constraint = @config_var == :proposal_custom_fields ? :proposal_custom_field : :proposal_private_custom_field
-          constraint = AwesomeConfig.find_by(var: "#{constraint}_#{@key}", organization: @organization)
-          constraint.destroy! if constraint.present?
-
-          broadcast(:ok, @key)
+          broadcast(:ok, ident)
         rescue StandardError => e
           broadcast(:invalid, e.message)
         end

data/app/commands/decidim/decidim_awesome/admin/destroy_scoped_admin.rb

@@ -4,13 +4,15 @@ module Decidim
   module DecidimAwesome
     module Admin
       class DestroyScopedAdmin < Command
+        include NeedsConstraintHelpers
         # Public: Initializes the command.
         #
         # key - the key to destroy inside scoped_admins
         # organization
         def initialize(key, organization)
-          @key = key
+          @ident = key
           @organization = organization
+          @config_var = :scoped_admins
         end
 
         # Executes the command. Broadcasts these events:
@@ -20,17 +22,12 @@ module Decidim
         #
         # Returns nothing.
         def call
-          admins = AwesomeConfig.find_by(var: :scoped_admins, organization: @organization)
-          return broadcast(:invalid, "Not a hash") unless admins&.value.is_a? Hash
-          return broadcast(:invalid, "#{key} key invalid") unless admins.value.has_key?(@key)
+          return broadcast(:invalid, "Not a hash") unless find_var&.value.is_a? Hash
+          return broadcast(:invalid, "#{ident} key invalid") unless find_var.value.has_key?(ident)
 
-          admins.value.except!(@key)
-          admins.save!
-          # remove constrains associated (a new config var is generated automatically, by removing it, it will trigger destroy on dependents)
-          constraint = AwesomeConfig.find_by(var: "scoped_admin_#{@key}", organization: @organization)
-          constraint.destroy! if constraint.present?
+          destroy_hash_ident!
 
-          broadcast(:ok, @key)
+          broadcast(:ok, ident)
         rescue StandardError => e
           broadcast(:invalid, e.message)
         end

data/app/commands/decidim/decidim_awesome/admin/destroy_scoped_style.rb

@@ -4,12 +4,13 @@ module Decidim
   module DecidimAwesome
     module Admin
       class DestroyScopedStyle < Command
+        include NeedsConstraintHelpers
         # Public: Initializes the command.
         #
         # key - the key to destroy inside scoped_styles/scoped_admin_styles
         # organization
         def initialize(key, organization, config_var = :scoped_styles)
-          @key = key
+          @ident = key
           @organization = organization
           @config_var = config_var
         end
@@ -21,18 +22,12 @@ module Decidim
         #
         # Returns nothing.
         def call
-          styles = AwesomeConfig.find_by(var: @config_var, organization: @organization)
-          return broadcast(:invalid, "Not a hash") unless styles&.value.is_a? Hash
-          return broadcast(:invalid, "#{key} key invalid") unless styles.value.has_key?(@key)
+          return broadcast(:invalid, "Not a hash") unless find_var&.value.is_a? Hash
+          return broadcast(:invalid, "#{ident} key invalid") unless find_var.value.has_key?(ident)
 
-          styles.value.except!(@key)
-          styles.save!
-          # remove constrains associated (a new config var is generated automatically, by removing it, it will trigger destroy on dependents)
-          constraint = @config_var == :scoped_styles ? :scoped_style : :scoped_admin_style
-          constraint = AwesomeConfig.find_by(var: "#{constraint}_#{@key}", organization: @organization)
-          constraint.destroy! if constraint.present?
+          destroy_hash_ident!
 
-          broadcast(:ok, @key)
+          broadcast(:ok, ident)
         rescue StandardError => e
           broadcast(:invalid, e.message)
         end

data/app/commands/decidim/decidim_awesome/admin/update_config.rb

@@ -30,7 +30,18 @@ module Decidim
               next unless form.valid_keys.include?(key.to_sym)
 
               setting = AwesomeConfig.find_or_initialize_by(var: key, organization: form.current_organization)
-              setting.value = val.respond_to?(:attributes) ? val.attributes : val
+
+              value = if form.respond_to?("#{key}_attributes")
+                        # for complex cases
+                        form.public_send("#{key}_attributes")
+                      elsif val.respond_to?(:attributes)
+                        # when the value is another form
+                        val.attributes
+                      else
+                        val
+                      end
+
+              setting.value = value
               setting.save!
             end
 

data/app/commands/decidim/decidim_awesome/admin/update_custom_redirect.rb

@@ -4,12 +4,14 @@ module Decidim
   module DecidimAwesome
     module Admin
       class UpdateCustomRedirect < Command
+        include NeedsConstraintHelpers
         # Public: Initializes the command.
         #
         def initialize(form, item)
           @form = form
           @item = item
-          @redirects = AwesomeConfig.find_by(var: :custom_redirects, organization: form.current_organization)
+          @config_var = :custom_redirects
+          @organization = form.current_organization
         end
 
         # Executes the command. Broadcasts these events:
@@ -22,26 +24,24 @@ module Decidim
           return broadcast(:invalid) if form.invalid?
           return broadcast(:invalid, I18n.t("custom_redirects.origin_missing", scope: "decidim.decidim_awesome.admin")) unless url_exists?
 
-          redirects.value&.except!(item.origin)
-          redirects.value[to_params[0]] = to_params[1]
-          redirects.save!
+          find_var.value&.except!(item.origin)
+          find_var.value[form.to_params[0]] = form.to_params[1]
+          find_var.save!
 
-          broadcast(:ok, redirects)
+          broadcast(:ok, find_var)
         rescue StandardError => e
           broadcast(:invalid, e.message)
         end
 
         private
 
-        attr_reader :form, :redirects, :item
-
-        delegate :to_params, to: :form
+        attr_reader :form, :item
 
         def url_exists?
-          return false unless redirects
-          return false unless redirects.value.is_a? Hash
+          return false unless find_var
+          return false unless find_var.value.is_a? Hash
 
-          redirects.value[item.origin].present?
+          find_var.value[item.origin].present?
         end
       end
     end