decidim-initiatives 0.30.1 → 0.31.0.rc1

data/app/controllers/decidim/initiatives/initiative_signatures_controller.rb

@@ -1,19 +1,17 @@
 # frozen_string_literal: true
 
-# i18n-tasks-use t('layouts.decidim.initiative_signature_creation_header.fill_personal_data')
-# i18n-tasks-use t('layouts.decidim.initiative_signature_creation_header.finish')
-# i18n-tasks-use t('layouts.decidim.initiative_signature_creation_header.sms_code')
-# i18n-tasks-use t('layouts.decidim.initiative_signature_creation_header.sms_phone_number')
-# i18n-tasks-use t('layouts.decidim.initiative_signature_creation_header.finish')
 module Decidim
   module Initiatives
     class InitiativeSignaturesController < Decidim::Initiatives::ApplicationController
       layout "layouts/decidim/initiative_signature_creation"
       include Decidim::Initiatives::NeedsInitiative
       include Decidim::FormFactory
+      include Decidim::Initiatives::HasSignatureWorkflow
 
       prepend_before_action :set_wizard_steps
-      before_action :authenticate_user!
+      before_action :authenticate_user!, unless: :ephemeral_signature_workflow?
+      skip_before_action :check_ephemeral_user_session
+
       before_action :authorize_wizard_step, only: [
         :fill_personal_data,
         :store_personal_data,
@@ -24,6 +22,8 @@ module Decidim
         :finish
       ]
 
+      before_action :set_ephemeral_user, if: :ephemeral_signature_workflow?, only: :index
+
       helper InitiativeHelper
 
       helper_method :initiative_type, :extra_data_legal_information, :sms_step?, :fill_personal_data_step?
@@ -36,11 +36,10 @@ module Decidim
       def create
         enforce_permission_to :vote, :initiative, initiative: current_initiative
 
-        @form = form(Decidim::Initiatives::VoteForm)
-                .from_params(
-                  initiative: current_initiative,
-                  signer: current_user
-                )
+        @form = form(signature_form_class).from_params(
+          initiative: current_initiative,
+          user: current_user
+        )
 
         VoteInitiative.call(@form) do
           on(:ok) do
@@ -57,11 +56,10 @@ module Decidim
       def fill_personal_data
         redirect_to(sms_phone_number_path) && return unless fill_personal_data_step?
 
-        @form = form(Decidim::Initiatives::VoteForm)
-                .from_params(
-                  initiative: current_initiative,
-                  signer: current_user
-                )
+        @form = form(signature_form_class).from_params(
+          initiative: current_initiative,
+          user: current_user
+        )
       end
 
       def store_personal_data
@@ -69,8 +67,11 @@ module Decidim
 
         build_vote_form(params)
 
-        if @vote_form.invalid?
-          flash[:alert] = I18n.t("personal_data.invalid", scope: "decidim.initiatives.initiative_votes")
+        if @vote_form.already_voted?
+          flash[:alert] = I18n.t("create.already_voted", scope: "decidim.initiatives.initiative_votes")
+          clear_authorization_path
+          redirect_to initiative_path(current_initiative)
+        elsif @vote_form.invalid?
           @form = @vote_form
 
           render :fill_personal_data
@@ -80,25 +81,26 @@ module Decidim
       end
 
       def sms_phone_number
-        redirect_to(finish_path) && return unless sms_step?
+        return redirect_to fill_personal_data_path if fill_personal_data_step? && session[:initiative_vote_form].blank?
+        return redirect_to(finish_path) unless sms_step?
 
-        @form = Decidim::Verifications::Sms::MobilePhoneForm.new
+        @form = sms_mobile_phone_form_class.new
       end
 
       def store_sms_phone_number
         redirect_to(finish_path) && return unless sms_step?
 
-        @form = Decidim::Verifications::Sms::MobilePhoneForm.from_params(params.merge(user: current_user))
+        @form = sms_mobile_phone_form_class.from_params(params.merge(user: current_user))
 
-        ValidateMobilePhone.call(@form, current_user) do
+        sms_mobile_phone_validator_class.call(@form, current_user) do
           on(:ok) do |metadata|
-            store_session_sms_code(metadata)
+            store_session_sms_code(metadata, @form.mobile_phone_number)
             redirect_to sms_code_path
           end
 
           on(:invalid) do
             flash[:alert] = I18n.t("sms_phone.invalid", scope: "decidim.initiatives.initiative_votes")
-            render :sms_phone_number
+            render :sms_phone_number, status: :unprocessable_entity
           end
         end
       end
@@ -106,24 +108,41 @@ module Decidim
       def sms_code
         redirect_to(finish_path) && return unless sms_step?
 
-        redirect_to sms_phone_number_path && return if session_sms_code.blank?
+        return redirect_to sms_phone_number_path if session_sms_code.blank?
 
-        @form = Decidim::Verifications::Sms::ConfirmationForm.new
+        @sms_code_form = Decidim::Verifications::Sms::ConfirmationForm.new
+        @phone_number_form = sms_mobile_phone_form_class.from_params(mobile_phone_number: session_sms_code[:phone_number], user: current_user)
       end
 
       def store_sms_code
         redirect_to(finish_path) && return unless sms_step?
 
-        @form = Decidim::Verifications::Sms::ConfirmationForm.from_params(params)
-        ValidateSmsCode.call(@form, session_sms_code) do
+        @sms_code_form = Decidim::Verifications::Sms::ConfirmationForm.from_params(params)
+        sms_code_validator_class.call(@sms_code_form, session_sms_code) do
           on(:ok) do
-            clear_session_sms_code
-            redirect_to finish_path
+            respond_to do |format|
+              format.js do
+                render json: { sms_code: "OK" }
+              end
+
+              format.html do
+                clear_session_sms_code
+                redirect_to finish_path
+              end
+            end
           end
 
           on(:invalid) do
-            flash[:alert] = I18n.t("sms_code.invalid", scope: "decidim.initiatives.initiative_votes")
-            render :sms_code
+            respond_to do |format|
+              format.js do
+                render json: { sms_code: "KO" }
+              end
+
+              format.html do
+                flash[:alert] = I18n.t("sms_code.invalid", scope: "decidim.initiatives.initiative_votes")
+                render :sms_code, status: :unprocessable_entity
+              end
+            end
           end
         end
       end
@@ -135,9 +154,12 @@ module Decidim
           check_session_personal_data
         end
 
+        return if @vote_form.blank?
+
         VoteInitiative.call(@vote_form) do
           on(:ok) do
             session[:initiative_vote_form] = {}
+            clear_authorization_path
           end
 
           on(:invalid) do |vote|
@@ -169,13 +191,35 @@ module Decidim
       end
 
       def build_vote_form(parameters)
-        @vote_form = form(Decidim::Initiatives::VoteForm).from_params(parameters).tap do |form|
+        @vote_form = form(signature_form_class).from_params(parameters).tap do |form|
           form.initiative = current_initiative
-          form.signer = current_user
+          form.user = current_user
+        end
+
+        @vote_form.validate
+
+        if @vote_form.transfer_status == :transfer_user && @vote_form.user != current_user
+          new_user = @vote_form.user
+          new_user.update(last_sign_in_at: Time.current, deleted_at: nil)
+          sign_out(current_user)
+          sign_in(new_user)
+        elsif @vote_form.transfer_status.is_a?(Decidim::AuthorizationTransfer)
+          transfer = @vote_form.transfer_status
+
+          message = t("authorizations.create.success", scope: "decidim.verifications")
+          if transfer.records.any?
+            message = <<~HTML
+              <p>#{CGI.escapeHTML(message)}</p>
+              <p>#{CGI.escapeHTML(t("authorizations.create.transferred", scope: "decidim.verifications"))}</p>
+              #{transfer.presenter.records_list_html}
+            HTML
+          end
+
+          flash[:notice] = message
         end
 
         session[:initiative_vote_form] ||= {}
-        session[:initiative_vote_form] = session[:initiative_vote_form].merge(@vote_form.attributes_with_values.except(:initiative, :signer))
+        session[:initiative_vote_form] = session[:initiative_vote_form].merge(@vote_form.attributes_with_values.except(:initiative, :user, :transfer_status))
       end
 
       def initiative_type
@@ -183,11 +227,11 @@ module Decidim
       end
 
       def sms_step?
-        current_initiative.validate_sms_code_on_votes?
+        current_initiative.organization.available_authorizations.include?("sms") && signature_workflow_manifest.sms_verification
       end
 
       def fill_personal_data_step?
-        initiative_type.collect_user_extra_fields?
+        signature_form_class.requires_extra_attributes?
       end
 
       def authorize_wizard_step
@@ -205,9 +249,9 @@ module Decidim
       end
 
       def session_vote_form
-        attributes = session[:initiative_vote_form].merge(initiative: current_initiative, signer: current_user)
+        attributes = session[:initiative_vote_form].merge(initiative: current_initiative, user: current_user)
 
-        @vote_form = form(Decidim::Initiatives::VoteForm).from_params(attributes)
+        @vote_form = form(signature_form_class).from_params(attributes)
       end
 
       def check_session_personal_data
@@ -221,12 +265,59 @@ module Decidim
         session[:initiative_sms_code] = {}
       end
 
-      def store_session_sms_code(metadata)
-        session[:initiative_sms_code] = metadata
+      def store_session_sms_code(metadata, phone_number)
+        session[:initiative_sms_code] = metadata.merge(phone_number:)
       end
 
       def session_sms_code
-        session[:initiative_sms_code]
+        (session[:initiative_sms_code] || {}).symbolize_keys
+      end
+
+      def clear_authorization_path
+        return unless current_user.ephemeral? && onboarding_manager.authorization_path.present?
+
+        base_path = initiatives_path
+        return if onboarding_manager.authorization_path == base_path
+
+        current_user.update(extended_data: current_user.extended_data.deep_merge("onboarding" => { "authorization_path" => base_path }))
+      end
+
+      def set_ephemeral_user
+        if user_signed_in?
+          update_onboarding_data
+        else
+          create_ephemeral_user
+        end
+      end
+
+      def update_onboarding_data
+        return unless current_user.ephemeral?
+        return if onboarding_manager.model == current_initiative
+
+        current_user.update(extended_data: current_user.extended_data.deep_merge("onboarding" => current_initiative_onboarding_data))
+      end
+
+      def create_ephemeral_user
+        form = Decidim::EphemeralUserForm.new(
+          organization: current_organization,
+          locale: current_locale,
+          onboarding_data: current_initiative_onboarding_data
+        )
+        CreateEphemeralUser.call(form) do
+          on(:ok) do |ephemeral_user|
+            sign_in(ephemeral_user)
+          end
+        end
+      end
+
+      def current_initiative_onboarding_data
+        {
+          "model" => current_initiative.to_gid,
+          "permissions_holder" => initiative_type.to_gid,
+          "action" => "vote",
+          "redirect_path" => initiative_path(current_initiative),
+          "authorization_path" => initiative_signatures_path(current_initiative)
+        }
       end
     end
   end

data/app/controllers/decidim/initiatives/initiative_votes_controller.rb

@@ -6,6 +6,7 @@ module Decidim
     class InitiativeVotesController < Decidim::Initiatives::ApplicationController
       include Decidim::Initiatives::NeedsInitiative
       include Decidim::FormFactory
+      include Decidim::Initiatives::HasSignatureWorkflow
 
       before_action :authenticate_user!
 
@@ -15,9 +16,9 @@ module Decidim
       def create
         enforce_permission_to :vote, :initiative, initiative: current_initiative
 
-        @form = form(Decidim::Initiatives::VoteForm).from_params(
+        @form = form(signature_form_class).from_params(
           initiative: current_initiative,
-          signer: current_user
+          user: current_user
         )
 
         VoteInitiative.call(@form) do

data/app/controllers/decidim/initiatives/initiatives_controller.rb

@@ -26,13 +26,15 @@ module Decidim
       include Decidim::Initiatives::Orderable
       include TypeSelectorOptions
       include NeedsInitiative
+      include HasSignatureWorkflow
       include SingleInitiativeType
       include Decidim::IconHelper
 
-      helper_method :collection, :initiatives, :filter, :stats, :tabs, :panels
+      helper_method :collection, :initiatives, :pending_initiatives, :filter, :stats, :tabs, :panels
       helper_method :initiative_type, :available_initiative_types
 
       before_action :authorize_participatory_space, only: [:show]
+      skip_before_action :check_ephemeral_user_session, only: [:index, :show]
 
       # GET /initiatives
       def index
@@ -102,11 +104,24 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = I18n.t("error", scope: "decidim.initiatives.update")
-            render :edit, layout: "decidim/initiative"
+            render :edit, layout: "decidim/initiative", status: :unprocessable_entity
           end
         end
       end
 
+      # DELETE /initiatives/:id/discard
+      def discard
+        enforce_permission_to :discard, :initiative, initiative: current_initiative
+
+        Decidim.traceability.perform_action!(:discard, current_initiative, current_user) do
+          current_initiative.discarded!
+          current_initiative
+        end
+
+        flash[:notice] = I18n.t("initiatives.discard.success", scope: "decidim.initiatives.admin")
+        redirect_to decidim_initiatives.initiatives_path
+      end
+
       def print
         enforce_permission_to :print, :initiative, initiative: current_initiative
         output = Decidim::Initiatives::ApplicationFormPDF.new(current_initiative).render
@@ -133,6 +148,10 @@ module Decidim
         @initiatives = paginate(@initiatives)
       end
 
+      def pending_initiatives
+        @pending_initiatives ||= Initiative.where(state: %w(created validating)).where(author: current_user)
+      end
+
       alias collection initiatives
 
       def search_collection

data/app/forms/decidim/initiatives/admin/initiative_form.rb

@@ -18,7 +18,6 @@ module Decidim
         attribute :signature_type, String
         attribute :signature_start_date, Decidim::Attributes::LocalizedDate
         attribute :signature_end_date, Decidim::Attributes::LocalizedDate
-        attribute :hashtag, String
         attribute :offline_votes, Hash
         attribute :state, String
         attribute :attachment, AttachmentForm

data/app/forms/decidim/initiatives/initiative_form.rb

@@ -13,12 +13,10 @@ module Decidim
       attribute :description, String
       attribute :type_id, Integer
       attribute :area_id, Integer
-      attribute :decidim_user_group_id, Integer
       attribute :signature_type, String
       attribute :signature_end_date, Date
       attribute :state, String
       attribute :attachment, AttachmentForm
-      attribute :hashtag, String
       attribute :scope_id, Integer
 
       attachments_attribute :photos
@@ -39,7 +37,6 @@ module Decidim
       def map_model(model)
         self.type_id = model.type.id
         self.scope_id = model.scope&.id
-        self.decidim_user_group_id = model.decidim_user_group_id
         self.signature_type = model.signature_type || initiative_type.signature_type
         self.title = translated_attribute(model.title)
         self.description = translated_attribute(model.description)

data/app/helpers/decidim/initiatives/application_helper.rb

@@ -7,6 +7,8 @@ module Decidim
     module ApplicationHelper
       include Decidim::CheckBoxesTreeHelper
       include Decidim::DateRangeHelper
+      include Decidim::AnimationsHelper
+      include Decidim::Initiatives::ScopesHelper
       include InitiativesHelper
 
       def filter_states_values

data/app/helpers/decidim/initiatives/initiatives_helper.rb

@@ -34,7 +34,6 @@ module Decidim
                           id: "type")
         end
         sections.append(method: :with_any_area, collection: filter_areas_values, label: t("decidim.initiatives.initiatives.filters.area"), id: "area")
-        sections.append(method: :author, collection: filter_author_values, label: t("decidim.initiatives.initiatives.filters.author"), id: "author") if current_user
         sections.reject { |item| item[:collection].blank? }
       end
 

data/app/models/decidim/initiative.rb

@@ -34,6 +34,7 @@ module Decidim
     delegate :document_number_authorization_handler, :promoting_committee_enabled?, :attachments_enabled?,
              :promoting_committee_enabled?, :custom_signature_end_date_enabled?, :area_enabled?, to: :type
     delegate :name, to: :area, prefix: true, allow_nil: true
+    delegate :name, to: :author, prefix: true
 
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
@@ -65,12 +66,10 @@ module Decidim
              dependent: :destroy,
              as: :participatory_space
 
-    enum signature_type: [:online, :offline, :any], _suffix: true
-    enum state: [:created, :validating, :discarded, :open, :rejected, :accepted]
+    enum :signature_type, [:online, :offline, :any], suffix: true
+    enum :state, [:created, :validating, :discarded, :open, :rejected, :accepted]
 
     validates :title, :description, :state, :signature_type, presence: true
-    validates :hashtag,
-              uniqueness: { allow_blank: true, case_sensitive: false }
 
     validate :signature_type_allowed
 
@@ -146,7 +145,6 @@ module Decidim
 
     before_update :set_offline_votes_total
     after_commit :notify_state_change
-    after_create :notify_creation
 
     searchable_fields({
                         participatory_space: :itself,
@@ -166,6 +164,10 @@ module Decidim
       Decidim::Initiatives::AdminLog::InitiativePresenter
     end
 
+    def presenter
+      Decidim::InitiativePresenter.new(self)
+    end
+
     def self.ransackable_attributes(auth_object = nil)
       base = %w(search_text title description id id_string supports_count author_name author_nickname)
 
@@ -195,22 +197,6 @@ module Decidim
       type.comments_enabled?
     end
 
-    # Public: Check if an initiative has been created by an individual person.
-    # If it is false, then it has been created by an authorized organization.
-    #
-    # Returns a Boolean
-    def created_by_individual?
-      decidim_user_group_id.nil?
-    end
-
-    # Public: Returns the author name. If it has been created by an organization it will
-    # return the organization's name. Otherwise it will return author's name.
-    #
-    # Returns a string
-    def author_name
-      user_group&.name || author.name
-    end
-
     # Public: Overrides the `reported_attributes` Reportable concern method.
     def reported_attributes
       [:title, :description]
@@ -278,11 +264,6 @@ module Decidim
       signature_end_date.present? && signature_start_date.present?
     end
 
-    # Public: Returns the hashtag for the initiative.
-    def hashtag
-      attributes["hashtag"].to_s.delete("#")
-    end
-
     # Public: Calculates the number of total current supports.
     #
     # Returns an Integer.
@@ -504,11 +485,6 @@ module Decidim
       notifier.notify
     end
 
-    def notify_creation
-      notifier = Decidim::Initiatives::StatusChangeNotifier.new(initiative: self)
-      notifier.notify
-    end
-
     # Allow ransacker to search for a key in a hstore column (`title`.`en`)
     [:title, :description].each { |column| ransacker_i18n(column) }
 

data/app/models/decidim/initiatives_committee_member.rb

@@ -12,7 +12,7 @@ module Decidim
                foreign_key: "decidim_users_id",
                class_name: "Decidim::User"
 
-    enum state: [:requested, :rejected, :accepted]
+    enum :state, [:requested, :rejected, :accepted]
 
     validates :state, presence: true
     validates :user, uniqueness: { scope: :initiative }

data/app/models/decidim/initiatives_type.rb

@@ -24,10 +24,9 @@ module Decidim
              through: :scopes,
              class_name: "Decidim::Initiative"
 
-    enum signature_type: [:online, :offline, :any], _suffix: true
+    enum :signature_type, [:online, :offline, :any], suffix: true
 
     validates :title, :description, :signature_type, presence: true
-    validates :document_number_authorization_handler, presence: true, if: ->(form) { form.collect_user_extra_fields? }
 
     has_one_attached :banner_image
     validates_upload :banner_image, uploader: Decidim::BannerImageUploader
@@ -53,5 +52,9 @@ module Decidim
     def self.log_presenter_class_for(_log)
       Decidim::Initiatives::AdminLog::InitiativesTypePresenter
     end
+
+    def signature_workflow_manifest
+      Decidim::Initiatives::Signatures.find_workflow_manifest(document_number_authorization_handler)
+    end
   end
 end

data/app/models/decidim/initiatives_vote.rb

@@ -39,13 +39,13 @@ module Decidim
     end
 
     def decrypted_metadata
-      @decrypted_metadata ||= encrypted_metadata ? encryptor.decrypt(encrypted_metadata) : {}
+      @decrypted_metadata ||= (encrypted_metadata ? encryptor.decrypt(encrypted_metadata) : {}).with_indifferent_access
     end
 
     private
 
     def encryptor
-      @encryptor ||= Decidim::Initiatives::DataEncryptor.new(secret: "personal user metadata")
+      @encryptor ||= Decidim::Initiatives::DataEncryptor.new(secret: Decidim::Initiatives.signature_handler_encryption_secret)
     end
 
     def authorization_unique_id

data/app/packs/entrypoints/decidim_initiatives.js

@@ -1,6 +1,6 @@
 import "src/decidim/initiatives/application"
-import "src/decidim/initiatives/identity_selector_dialog"
 import "src/decidim/initiatives/scoped_type"
+import "src/decidim/initiatives/initiative_creation_wizard"
 
 // Images
 require.context("../images", true)

data/app/packs/entrypoints/decidim_initiatives_admin.scss

@@ -1 +1 @@
-@import "stylesheets/decidim/initiatives/admin/initiatives.scss";
+@use "stylesheets/decidim/initiatives/admin/initiatives";

data/app/packs/src/decidim/initiatives/admin/initiatives_types.js

@@ -1,4 +1,4 @@
-(() => {
+document.addEventListener("turbo:load", () => {
   const $scope = $("#promoting-committee-details");
 
   const $promotingCommitteeCheckbox = $(
@@ -8,8 +8,6 @@
 
   const $signatureType = $("#initiatives_type_signature_type");
 
-  const $collectUserDataCheckbox = $("#initiatives_type_collect_user_extra_fields");
-
   const toggleVisibility = () => {
     if ($promotingCommitteeCheckbox.is(":checked")) {
       $(".minimum-committee-members-details", $scope).show();
@@ -22,17 +20,10 @@
     } else {
       $("#initiatives_type_undo_online_signatures_enabled").parent().parent().show();
     }
-
-    if ($collectUserDataCheckbox.is(":checked")) {
-      $("#initiatives_type-extra_fields_legal_information-tabs").parent().parent().show()
-    } else {
-      $("#initiatives_type-extra_fields_legal_information-tabs").parent().parent().hide()
-    }
   };
 
   $($promotingCommitteeCheckbox).click(() => toggleVisibility());
   $($signatureType).change(() => toggleVisibility());
-  $($collectUserDataCheckbox).click(() => toggleVisibility());
 
   toggleVisibility();
-})();
+});

data/app/packs/src/decidim/initiatives/admin/invite_users.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-empty */
 
-$(() => {
+document.addEventListener("turbo:load", () => {
   let inviteUsersButton = document.querySelector(".invite-users-link");
 
   if (inviteUsersButton !== null) {

data/app/packs/src/decidim/initiatives/application.js

@@ -1,2 +1,2 @@
+import "src/decidim/initiatives/check_code"
 import "src/decidim/initiatives/scoped_type"
-import "src/decidim/initiatives/identity_selector_dialog"