decidim-elections 0.27.9 → 0.28.0.rc4

data/app/commands/decidim/elections/admin/add_user_as_trustee.rb

@@ -42,21 +42,21 @@ module Decidim
           @trustee = Decidim.traceability.create!(
             Trustee,
             current_user,
-            user: user,
+            user:,
             organization: user.organization
           )
         end
 
-        # If a trustee exists for this participatory space, it won't get created again
+        # If a trustee exists for this participatory space, it will not get created again
         def existing_trustee_participatory_spaces?
-          trustees_space = TrusteesParticipatorySpace.where(participatory_space: participatory_space).includes(:trustee)
+          trustees_space = TrusteesParticipatorySpace.where(participatory_space:).includes(:trustee)
           @existing_trustee_participatory_spaces ||= Decidim::Elections::Trustee.joins(:trustees_participatory_spaces)
                                                                                 .includes([:user])
                                                                                 .where(trustees_participatory_spaces: trustees_space)
                                                                                 .where(decidim_user_id: user.id).any?
         end
 
-        # if there's no user - trustee relation, the trustee gets created and the notification
+        # if there is no user - trustee relation, the trustee gets created and the notification
         # gets send.
         def new_trustee?
           return @new_trustee if defined?(@new_trustee)
@@ -67,7 +67,7 @@ module Decidim
         def add_participatory_space
           trustee = Decidim::Elections::Trustee.find_by(decidim_user_id: user.id)
           trustee.trustees_participatory_spaces.create!(
-            participatory_space: participatory_space
+            participatory_space:
           )
         end
 

data/app/commands/decidim/elections/admin/create_answer.rb

@@ -6,7 +6,6 @@ module Decidim
       # This command is executed when the user creates an Answer
       # from the admin panel.
       class CreateAnswer < Decidim::Command
-        include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 
         def initialize(form)

data/app/commands/decidim/elections/admin/create_election.rb

@@ -6,7 +6,6 @@ module Decidim
       # This command is executed when the user creates an Election
       # from the admin panel.
       class CreateElection < Decidim::Command
-        include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 
         def initialize(form)

data/app/commands/decidim/elections/admin/destroy_answer.rb

@@ -6,7 +6,6 @@ module Decidim
       # This command is executed when the user destroys an Answer
       # from the admin panel.
       class DestroyAnswer < Decidim::Command
-        include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 
         def initialize(answer, current_user)

data/app/commands/decidim/elections/admin/destroy_election.rb

@@ -6,7 +6,6 @@ module Decidim
       # This command is executed when the user destroys an Election
       # from the admin panel.
       class DestroyElection < Decidim::Command
-        include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 
         def initialize(election, current_user)

data/app/commands/decidim/elections/admin/end_vote.rb

@@ -51,9 +51,9 @@ module Decidim
 
         def create_election_action(message_id)
           Decidim::Elections::Action.create!(
-            election: election,
+            election:,
             action: :end_vote,
-            message_id: message_id,
+            message_id:,
             status: :pending
           )
         end

data/app/commands/decidim/elections/admin/import_proposals_to_elections.rb

@@ -16,7 +16,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

data/app/commands/decidim/elections/admin/publish_election.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Elections
     module Admin
-      # This command gets called when a election is published from the admin panel.
+      # This command gets called when an election is published from the admin panel.
       class PublishElection < Decidim::Command
         # Public: Initializes the command.
         #

data/app/commands/decidim/elections/admin/publish_results.rb

@@ -51,9 +51,9 @@ module Decidim
 
         def create_election_action(message_id)
           Decidim::Elections::Action.create!(
-            election: election,
+            election:,
             action: :publish_results,
-            message_id: message_id,
+            message_id:,
             status: :pending
           )
         end

data/app/commands/decidim/elections/admin/report_missing_trustee.rb

@@ -56,9 +56,9 @@ module Decidim
 
         def create_election_action(message_id)
           Decidim::Elections::Action.create!(
-            election: election,
+            election:,
             action: :report_missing_trustee,
-            message_id: message_id,
+            message_id:,
             status: :pending
           )
         end

data/app/commands/decidim/elections/admin/setup_election.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Elections
     module Admin
-      # This command gets called when a election is setup from the admin panel.
+      # This command gets called when an election is setup from the admin panel.
       class SetupElection < Decidim::Command
         # Public: Initializes the command.
         #
@@ -95,7 +95,7 @@ module Decidim
               max_selections: question.max_selections,
               title: flatten_translations(question.title),
               # the bulletin_board gem (ruby client) expects a description for the question
-              # as development is in a separate repository, let's send an empty content for the moment
+              # as development is in a separate repository, we send an empty content for the moment
               description: {},
               answers: question_answers_data(question)
             }

data/app/commands/decidim/elections/admin/start_key_ceremony.rb

@@ -51,9 +51,9 @@ module Decidim
 
         def create_election_action(message_id)
           Decidim::Elections::Action.create!(
-            election: election,
+            election:,
             action: :start_key_ceremony,
-            message_id: message_id,
+            message_id:,
             status: :pending
           )
         end

data/app/commands/decidim/elections/admin/start_tally.rb

@@ -51,9 +51,9 @@ module Decidim
 
         def create_election_action(message_id)
           Decidim::Elections::Action.create!(
-            election: election,
+            election:,
             action: :start_tally,
-            message_id: message_id,
+            message_id:,
             status: :pending
           )
         end

data/app/commands/decidim/elections/admin/start_vote.rb

@@ -51,9 +51,9 @@ module Decidim
 
         def create_election_action(message_id)
           Decidim::Elections::Action.create!(
-            election: election,
+            election:,
             action: :start_vote,
-            message_id: message_id,
+            message_id:,
             status: :pending
           )
         end

data/app/commands/decidim/elections/admin/unpublish_election.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Elections
     module Admin
-      # This command gets called when a election is unpublished from the admin panel.
+      # This command gets called when an election is unpublished from the admin panel.
       class UnpublishElection < Decidim::Command
         # Public: Initializes the command.
         #

data/app/commands/decidim/elections/admin/update_answer.rb

@@ -6,7 +6,6 @@ module Decidim
       # This command is executed when the user updates an Answer
       # from the admin panel.
       class UpdateAnswer < Decidim::Command
-        include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 
         def initialize(form, answer)

data/app/commands/decidim/elections/admin/update_answer_selection.rb

@@ -32,7 +32,7 @@ module Decidim
 
         def update_answer_selection!
           answer.update!(
-            selected: selected
+            selected:
           )
         end
       end

data/app/commands/decidim/elections/admin/update_election.rb

@@ -6,7 +6,6 @@ module Decidim
       # This command is executed when the user updates an Election
       # from the admin panel.
       class UpdateElection < Decidim::Command
-        include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 
         def initialize(form, election)

data/app/commands/decidim/elections/trustee_zone/update_election_bulletin_board_status.rb

@@ -63,9 +63,9 @@ module Decidim
 
         def create_answer_result_for!(answer, value)
           params = {
-            value: value,
+            value:,
             question: answer.question,
-            answer: answer,
+            answer:,
             result_type: :valid_answers
           }
 
@@ -78,7 +78,7 @@ module Decidim
 
         def store_verifiable_results
           election.update!(
-            verifiable_results_file_url: verifiable_results_file_url,
+            verifiable_results_file_url:,
             verifiable_results_file_hash: verifiable_results[:hash]
           )
         end

data/app/commands/decidim/elections/voter/cast_vote.rb

@@ -41,7 +41,7 @@ module Decidim
 
         def create_vote(message_id)
           @vote = Vote.create!(
-            message_id: message_id,
+            message_id:,
             election: form.election,
             voter_id: form.voter_id,
             encrypted_vote_hash: form.encrypted_data_hash,

data/app/commands/decidim/elections/voter/update_vote_status.rb

@@ -69,8 +69,8 @@ module Decidim
             resource: vote.election,
             affected_users: [vote.user],
             extra: {
-              vote: vote,
-              verify_url: verify_url
+              vote:,
+              verify_url:
             }
           }
 

data/app/commands/decidim/votings/admin/create_ballot_style.rb

@@ -11,7 +11,7 @@ module Decidim
 
         # Executes the command. Broadcast this events:
         # - :ok when everything is valid
-        # - :invalid when the form wasn't valid and couldn't proceed
+        # - :invalid when the form was not valid and could not proceed
         #
         # Returns nothing.
         def call

data/app/commands/decidim/votings/admin/create_monitoring_committee_member.rb

@@ -19,7 +19,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call
@@ -54,8 +54,8 @@ module Decidim
             }
           ) do
             Decidim::Votings::MonitoringCommitteeMember.find_or_create_by!(
-              user: user,
-              voting: voting
+              user:,
+              voting:
             )
           end
         end
@@ -87,7 +87,7 @@ module Decidim
                          organization: voting.organization,
                          admin: false,
                          invited_by: current_user,
-                         invitation_instructions: invitation_instructions)
+                         invitation_instructions:)
         end
 
         def invitation_instructions

data/app/commands/decidim/votings/admin/create_polling_officer.rb

@@ -19,7 +19,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call
@@ -54,8 +54,8 @@ module Decidim
             }
           ) do
             Decidim::Votings::PollingOfficer.find_or_create_by!(
-              user: user,
-              voting: voting
+              user:,
+              voting:
             )
           end
         end
@@ -87,7 +87,7 @@ module Decidim
                          organization: voting.organization,
                          admin: false,
                          invited_by: current_user,
-                         invitation_instructions: invitation_instructions)
+                         invitation_instructions:)
         end
 
         def invitation_instructions

data/app/commands/decidim/votings/admin/create_polling_station.rb

@@ -15,7 +15,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

data/app/commands/decidim/votings/admin/create_voting.rb

@@ -15,7 +15,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

data/app/commands/decidim/votings/admin/destroy_ballot_style.rb

@@ -12,7 +12,7 @@ module Decidim
 
         # Executes the command. Broadcast this events:
         # - :ok when everything is valid
-        # - :invalid when the form wasn't valid and couldn't proceed
+        # - :invalid when the form was not valid and could not proceed
         #
         # Returns nothing.
         def call

data/app/commands/decidim/votings/admin/destroy_monitoring_committee_member.rb

@@ -17,7 +17,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

data/app/commands/decidim/votings/admin/destroy_polling_officer.rb

@@ -17,7 +17,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

data/app/commands/decidim/votings/admin/manage_polling_station.rb

@@ -51,7 +51,7 @@ module Decidim
             resource: voting,
             affected_users: [polling_officer_for(polling_officer_id).user],
             followers: [],
-            extra: { polling_officer_id: polling_officer_id }
+            extra: { polling_officer_id: }
           )
         end
 

data/app/commands/decidim/votings/admin/monitoring_committee_validate_polling_station_closure.rb

@@ -17,7 +17,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

data/app/commands/decidim/votings/admin/update_ballot_style.rb

@@ -12,7 +12,7 @@ module Decidim
 
         # Executes the command. Broadcast this events:
         # - :ok when everything is valid
-        # - :invalid when the form wasn't valid and couldn't proceed
+        # - :invalid when the form was not valid and could not proceed
         #
         # Returns nothing.
         def call

data/app/commands/decidim/votings/admin/update_voting.rb

@@ -20,7 +20,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

data/app/commands/decidim/votings/census/admin/create_dataset.rb

@@ -20,7 +20,7 @@ module Decidim
 
           # Executes the command. Broadcast this events:
           # - :ok when everything is valid
-          # - :invalid when the form wasn't valid and couldn't proceed-
+          # - :invalid when the form was not valid and could not proceed-
           #
           # Returns nothing.
           def call
@@ -36,7 +36,7 @@ module Decidim
               end
 
               if dataset
-                CSV.foreach(file_path, col_sep: ";", headers: true, converters: ->(f) { f&.strip }) do |row|
+                CSV.foreach(file_path, col_sep: Decidim.default_csv_col_sep, headers: true, converters: ->(f) { f&.strip }) do |row|
                   CreateDatumJob.perform_later(current_user, dataset, row.fields)
                 end
               end

data/app/commands/decidim/votings/census/admin/create_datum.rb

@@ -14,7 +14,7 @@ module Decidim
 
           # Executes the command. Broadcast this events:
           # - :ok when everything is valid
-          # - :invalid when the form wasn't valid and couldn't proceed-
+          # - :invalid when the form was not valid and could not proceed-
           #
           # Returns nothing.
           def call
@@ -40,8 +40,8 @@ module Decidim
             }
 
             Decidim::Votings::Census::Datum.create(
-              dataset: dataset,
-              attributes: attributes
+              dataset:,
+              attributes:
             )
           end
 

data/app/commands/decidim/votings/census/admin/destroy_dataset.rb

@@ -16,7 +16,7 @@ module Decidim
 
           # Executes the command. Broadcast this events:
           # - :ok when everything is valid
-          # - :invalid when the form wasn't valid and couldn't proceed-
+          # - :invalid when the form was not valid and could not proceed-
           #
           # Returns nothing.
           def call

data/app/commands/decidim/votings/census/admin/increment_dataset_processed_rows.rb

@@ -13,7 +13,7 @@ module Decidim
 
           # Executes the command. Broadcast this events:
           # - :ok when everything is valid
-          # - :invalid when the form wasn't valid and couldn't proceed-
+          # - :invalid when the form was not valid and could not proceed-
           #
           # Returns nothing.
           def call

data/app/commands/decidim/votings/census/admin/launch_access_codes_generation.rb

@@ -35,7 +35,7 @@ module Decidim
           end
 
           def update_dataset_status(dataset, status, user)
-            UpdateDataset.call(dataset, { status: status }, user)
+            UpdateDataset.call(dataset, { status: }, user)
           end
         end
       end

data/app/commands/decidim/votings/census/admin/update_dataset.rb

@@ -20,7 +20,7 @@ module Decidim
 
           # Executes the command. Broadcast this events:
           # - :ok when everything is valid
-          # - :invalid when the input wasn't valid and couldn't proceed
+          # - :invalid when the input was not valid and could not proceed
           #
           # Returns nothing.
           def call

data/app/commands/decidim/votings/certify_polling_station_closure.rb

@@ -4,7 +4,6 @@ module Decidim
   module Votings
     # A command with all the business logic when signing a closure of a polling station
     class CertifyPollingStationClosure < Decidim::Command
-      include ::Decidim::AttachmentMethods
       include ::Decidim::GalleryMethods
       # Public: Initializes the command.
       #
@@ -19,7 +18,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid.
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call

data/app/commands/decidim/votings/create_polling_station_closure.rb

@@ -14,7 +14,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid.
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call

data/app/commands/decidim/votings/create_polling_station_results.rb

@@ -16,7 +16,7 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid.
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call

data/app/commands/decidim/votings/send_access_code.rb

@@ -30,7 +30,7 @@ module Decidim
         when "email"
           AccessCodeMailer.send_access_code(datum).deliver_later
         when "sms"
-          sms_gateway.new(datum.mobile_phone_number, access_code).deliver_code
+          sms_gateway.new(datum.mobile_phone_number, access_code, sms_gateway_context).deliver_code
         else
           raise ArgumentError, "Medium parameter is invalid"
         end
@@ -40,6 +40,10 @@ module Decidim
         Decidim.sms_gateway_service.to_s.safe_constantize
       end
 
+      def sms_gateway_context
+        { organization: try(:current_organization) }
+      end
+
       def access_code
         @access_code ||= datum.access_code
       end

data/app/commands/decidim/votings/sign_polling_station_closure.rb

@@ -16,13 +16,13 @@ module Decidim
       # Executes the command. Broadcasts these events:
       #
       # - :ok when everything is valid.
-      # - :invalid if the form wasn't valid and we couldn't proceed.
+      # - :invalid if the form was not valid and we could not proceed.
       #
       # Returns nothing.
       def call
         return broadcast(:invalid) if form.invalid?
 
-        closure.update!(signed_at: signed_at, phase: :complete)
+        closure.update!(signed_at:, phase: :complete)
 
         broadcast(:ok)
       end

data/app/commands/decidim/votings/voter/in_person_vote.rb

@@ -44,7 +44,7 @@ module Decidim
             election: form.election,
             polling_station: form.polling_station,
             polling_officer: form.polling_officer,
-            message_id: message_id,
+            message_id:,
             voter_id: form.voter_id,
             status: :pending
           )

data/app/constraints/decidim/votings/current_voting.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Votings
-    # This class infers the current voting we're scoped to by
+    # This class infers the current voting we are scoped to by
     # looking at the request parameters and the organization in the request
     # environment, and injects it into the environment.
     class CurrentVoting

data/app/controllers/concerns/decidim/elections/content_security_policy.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Elections
+    module ContentSecurityPolicy
+      extend ActiveSupport::Concern
+
+      included do
+        before_action :append_csp_directives
+      end
+
+      private
+
+      def append_csp_directives
+        return unless Decidim::Elections.bulletin_board.configured?
+
+        content_security_policy.append_csp_directive("connect-src", Decidim::Elections.bulletin_board.bulletin_board_server)
+      end
+    end
+  end
+end