decidim-core 0.29.5 → 0.30.0.rc1

data/app/controllers/decidim/application_controller.rb

@@ -26,6 +26,8 @@ module Decidim
     include NeedsPasswordChange
     include LinkedResourceReference
     include ActiveStorage::SetCurrent
+    include OnboardingActionMethods
+    include EphemeralSessionChecker
 
     helper Decidim::MetaTagsHelper
     helper Decidim::DecidimFormHelper
@@ -42,6 +44,7 @@ module Decidim
     helper Decidim::TwitterSearchHelper
     helper Decidim::SocialShareButtonHelper
     helper Decidim::FiltersHelper
+    helper Decidim::OnboardingActionHelper
 
     register_permissions(::Decidim::ApplicationController,
                          ::Decidim::Admin::Permissions,
@@ -57,6 +60,12 @@ module Decidim
 
     skip_before_action :disable_http_caching, unless: :user_signed_in?
 
+    def store_share_token
+      session[:share_token] = params[:share_token] if params.has_key?(:share_token)
+
+      session[:share_token].presence
+    end
+
     private
 
     # This overrides Devise's method for extracting the path from the URL. We

data/app/controllers/decidim/authorization_modals_controller.rb

@@ -5,10 +5,12 @@ module Decidim
     helper_method :authorizations, :authorize_action_path
     layout false
 
-    def show; end
+    def show
+      store_onboarding_cookie_data!(current_user)
+    end
 
     def authorize_action_path(handler_name)
-      authorizations.status_for(handler_name).current_path(redirect_url: URI(request.referer).path)
+      authorizations.status_for(handler_name).current_path(redirect_url:)
     end
 
     private
@@ -31,5 +33,9 @@ module Decidim
     def authorizations
       @authorizations ||= action_authorized_to(authorization_action, resource:)
     end
+
+    def redirect_url
+      pending_onboarding_action?(current_user) ? decidim_verifications.onboarding_pending_authorizations_path : URI(request.referer).path
+    end
   end
 end

data/app/controllers/decidim/components/base_controller.rb

@@ -19,7 +19,7 @@ module Decidim
       helper Decidim::TranslationsHelper
       helper Decidim::IconHelper
       helper Decidim::ResourceHelper
-      helper Decidim::ScopesHelper
+      helper Decidim::TaxonomiesHelper
       helper Decidim::ActionAuthorizationHelper
       helper Decidim::AttachmentsHelper
       helper Decidim::SanitizeHelper
@@ -30,7 +30,7 @@ module Decidim
                     :current_manifest
 
       before_action do
-        enforce_permission_to :read, :component, component: current_component, share_token:
+        enforce_permission_to :read, :component, component: current_component
       end
 
       before_action :redirect_unless_feature_private
@@ -49,10 +49,6 @@ module Decidim
         @current_manifest ||= current_component.manifest
       end
 
-      def share_token
-        params[:share_token]
-      end
-
       def permission_scope
         :public
       end
@@ -73,7 +69,7 @@ module Decidim
       def set_component_breadcrumb_item
         context_breadcrumb_items << {
           label: current_component.name,
-          url: root_path,
+          url: Decidim::EngineRouter.main_proxy(current_component).root_path,
           active: false,
           resource: current_component
         }

data/app/controllers/decidim/devise/confirmations_controller.rb

@@ -5,6 +5,7 @@ module Decidim
     # Custom Devise ConfirmationsController to avoid namespace problems.
     class ConfirmationsController < ::Devise::ConfirmationsController
       include Decidim::DeviseControllers
+      include Decidim::OnboardingActionMethods
 
       helper_method :new_user_group_session_path
 
@@ -33,6 +34,9 @@ module Decidim
 
         sign_in(resource)
 
+        store_onboarding_cookie_data!(resource)
+        return decidim_verifications.onboarding_pending_authorizations_path if pending_onboarding_action?(resource)
+
         super
       end
     end

data/app/controllers/decidim/devise/omniauth_registrations_controller.rb

@@ -7,6 +7,7 @@ module Decidim
       include FormFactory
       include Decidim::DeviseControllers
       include Decidim::DeviseAuthenticationMethods
+      include NeedsTosAccepted
 
       def new
         @form = form(OmniauthRegistrationForm).from_params(params[:user])
@@ -36,6 +37,12 @@ module Decidim
             render :new
           end
 
+          on(:add_tos_errors) do
+            set_flash_message :alert, :add_tos_errors if @form.valid_tos?
+            session[:verified_email] = verified_email
+            render :new_tos_fields
+          end
+
           on(:error) do |user|
             if user.errors[:email]
               set_flash_message :alert, :failure, kind: @form.provider.capitalize, reason: t("decidim.devise.omniauth_registrations.create.email_already_exists")
@@ -75,7 +82,7 @@ module Decidim
       end
 
       def verified_email
-        @verified_email ||= oauth_data.dig(:info, :email)
+        @verified_email ||= oauth_data.dig(:info, :email).presence || session[:verified_email]
       end
 
       def oauth_hash

data/app/controllers/decidim/devise/registrations_controller.rb

@@ -57,7 +57,7 @@ module Decidim
 
       # Called before resource.save
       def build_resource(hash = nil)
-        super(hash)
+        super
         resource.organization = current_organization
       end
 

data/app/controllers/decidim/devise/sessions_controller.rb

@@ -24,6 +24,8 @@ module Decidim
             validator = PasswordValidator.new({ attributes: :password })
             user.update!(password_updated_at: nil) unless validator.validate_each(user, :password, sign_in_params[:password])
           end
+
+          store_onboarding_cookie_data!(user)
         end
       end
 

data/app/controllers/decidim/download_your_data_controller.rb

@@ -6,11 +6,29 @@ module Decidim
   # The controller to handle the user's download_my_data page.
   class DownloadYourDataController < Decidim::ApplicationController
     include Decidim::UserProfile
+    include Decidim::Paginable
 
+    helper_method :help_definitions
+
+    # i18n-tasks-use t('decidim.download_your_data.show.answers')
+    # i18n-tasks-use t('decidim.download_your_data.show.assemblies')
+    # i18n-tasks-use t('decidim.download_your_data.show.debate_comments')
+    # i18n-tasks-use t('decidim.download_your_data.show.debates')
+    # i18n-tasks-use t('decidim.download_your_data.show.initiatives')
+    # i18n-tasks-use t('decidim.download_your_data.show.meeting_comments')
+    # i18n-tasks-use t('decidim.download_your_data.show.meetings')
+    # i18n-tasks-use t('decidim.download_your_data.show.participatory_processes')
+    # i18n-tasks-use t('decidim.download_your_data.show.projects')
+    # i18n-tasks-use t('decidim.download_your_data.show.proposal_comments')
+    # i18n-tasks-use t('decidim.download_your_data.show.proposals')
+    # i18n-tasks-use t('decidim.download_your_data.show.result_comments')
+    # i18n-tasks-use t('decidim.download_your_data.show.results')
+    # i18n-tasks-use t('decidim.download_your_data.show.survey_user_answers')
     def show
       enforce_permission_to(:show, :user, current_user:)
 
       @account = form(AccountForm).from_model(current_user)
+      @exports = paginate(current_user.private_exports)
     end
 
     def export
@@ -25,12 +43,25 @@ module Decidim
     def download_file
       enforce_permission_to(:download, :user, current_user:)
 
-      if current_user.download_your_data_file.attached?
-        redirect_to Rails.application.routes.url_helpers.rails_blob_url(current_user.download_your_data_file.blob, only_path: true)
+      if private_export.expired?
+        flash[:error] = t("decidim.account.download_your_data_export.export_expired")
+        redirect_to download_your_data_path
+      elsif private_export.file.attached?
+        redirect_to Rails.application.routes.url_helpers.rails_blob_url(private_export.file.blob, only_path: true)
       else
         flash[:error] = t("decidim.account.download_your_data_export.file_no_exists")
         redirect_to download_your_data_path
       end
     end
+
+    private
+
+    def private_export
+      @private_export ||= current_user.private_exports.find(params[:uuid])
+    end
+
+    def help_definitions
+      @help_definitions ||= Decidim::DownloadYourDataSerializers.help_definitions_for(current_user)
+    end
   end
 end

data/app/controllers/decidim/editor_images_controller.rb

@@ -3,9 +3,7 @@
 module Decidim
   class EditorImagesController < Decidim::ApplicationController
     include FormFactory
-
-    # overwrite original rescue_from to ensure we print messages from ajax methods (update)
-    rescue_from Decidim::ActionForbidden, with: :ajax_user_has_no_permission
+    include AjaxPermissionHandler
 
     def create
       enforce_permission_to :create, :editor_image
@@ -25,14 +23,6 @@ module Decidim
 
     private
 
-    # Rescue ajax calls and print the update.js view which prints the info on the message ajax form
-    # Only if the request is AJAX, otherwise behave as Decidim standards
-    def ajax_user_has_no_permission
-      return user_has_no_permission unless request.xhr?
-
-      render json: { message: I18n.t("actions.unauthorized", scope: "decidim.core") }, status: :unprocessable_entity
-    end
-
     def form_values
       {
         file: params[:image],

data/app/controllers/decidim/follows_controller.rb

@@ -47,7 +47,7 @@ module Decidim
     end
 
     def button_cell_mobile
-      @button_cell_mobile ||= cell("decidim/follow_button", resource, **button_options.merge(mobile: true))
+      @button_cell_mobile ||= cell("decidim/follow_button", resource, **button_options, mobile: true)
     end
 
     def button_cell

data/app/controllers/decidim/geolocation_controller.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  class GeolocationController < Decidim::ApplicationController
+    include Decidim::AjaxPermissionHandler
+
+    def locate
+      enforce_permission_to :locate, :geolocation
+
+      unless Decidim::Map.configured?
+        return render(json: { message: I18n.t("not_configured", scope: "decidim.application.geocoding"), found: false }, status: :unprocessable_entity)
+      end
+
+      geocoder = Decidim::Map.utility(:geocoding, organization: current_organization)
+      address = geocoder.address([params[:latitude], params[:longitude]])
+      render json: { address:, found: address.present? }
+    end
+  end
+end

data/app/controllers/decidim/homepage_controller.rb

@@ -3,7 +3,6 @@
 module Decidim
   class HomepageController < Decidim::ApplicationController
     skip_before_action :store_current_location
-
     def show; end
   end
 end

data/app/controllers/decidim/open_data_controller.rb

@@ -2,24 +2,49 @@
 
 module Decidim
   class OpenDataController < Decidim::ApplicationController
+    helper_method :open_data_component_manifests, :open_data_participatory_space_manifests, :open_data_core_manifests
+
+    def index; end
+
     def download
-      if uploader.attached?
-        redirect_to uploader.path
+      resource = params[:resource] || nil
+
+      if open_data_file_for_resource(resource)
+        file = open_data_file_for_resource(resource)
+        send_data file.download, filename: file.blob.filename.to_s, type: file.blob.content_type
       else
-        schedule_open_data_generation
+        schedule_open_data_generation(resource)
         flash[:alert] = t("decidim.open_data.not_available_yet")
-        redirect_back fallback_location: root_path
+        redirect_back fallback_location: open_data_path
       end
     end
 
     private
 
-    def uploader
-      @uploader ||= Decidim::ApplicationUploader.new(current_organization, :open_data_file)
+    def open_data_core_manifests
+      @open_data_core_manifests ||= Decidim.open_data_manifests.select(&:include_in_open_data)
+    end
+
+    def open_data_component_manifests
+      @open_data_component_manifests ||= Decidim.component_manifests
+                                                .flat_map(&:export_manifests)
+                                                .select(&:include_in_open_data?)
+    end
+
+    def open_data_participatory_space_manifests
+      @open_data_participatory_space_manifests ||= Decidim.participatory_space_manifests
+                                                          .flat_map(&:export_manifests)
+                                                          .select(&:include_in_open_data?)
+    end
+
+    def open_data_file_for_resource(resource)
+      current_organization.open_data_files.all.find do |file|
+        file.blob.filename == current_organization.open_data_file_path(resource)
+      end
     end
 
-    def schedule_open_data_generation
-      OpenDataJob.perform_later(current_organization)
+    def schedule_open_data_generation(resource = nil)
+      OpenDataJob.perform_later(current_organization, resource)
     end
   end
 end

data/app/controllers/decidim/profiles_controller.rb

@@ -24,7 +24,7 @@ module Decidim
     def show
       return redirect_to profile_members_path if profile_holder.is_a?(Decidim::UserGroup)
 
-      redirect_to profile_activity_path(nickname: params[:nickname].downcase)
+      redirect_to profile_activity_path(nickname: params[:nickname])
     end
 
     def tooltip
@@ -116,7 +116,7 @@ module Decidim
     def profile_holder
       return if params[:nickname].blank?
 
-      @profile_holder ||= Decidim::UserBaseEntity.find_by("nickname = ? AND decidim_organization_id = ?", params[:nickname].downcase, current_organization.id)
+      @profile_holder ||= Decidim::UserBaseEntity.find_by("LOWER(nickname) = ? AND decidim_organization_id = ?", params[:nickname].downcase, current_organization.id)
     end
   end
 end

data/app/controllers/decidim/reports_controller.rb

@@ -2,7 +2,6 @@
 
 module Decidim
   # Exposes the report resource so users can report a reportable.
-  # Unless the reportable is marked as hideable, the resource notice will change accordingly.
   class ReportsController < Decidim::ApplicationController
     include FormFactory
     include NeedsPermission
@@ -16,12 +15,8 @@ module Decidim
 
       CreateReport.call(@form, reportable) do
         on(:ok) do
-          flash[:notice] = if hideable?
-                             I18n.t("decidim.reports.hide.success")
-                           else
-                             I18n.t("decidim.reports.create.success")
-                           end
-          redirect_to reportable.reload.reported_content_url
+          flash[:notice] = I18n.t("decidim.reports.create.success")
+          redirect_back fallback_location: root_path
         end
 
         on(:invalid) do

data/app/controllers/decidim/user_activities_controller.rb

@@ -22,7 +22,7 @@ module Decidim
     def user
       return unless params[:nickname]
 
-      @user ||= current_organization.users.find_by("nickname = ?", params[:nickname].downcase)
+      @user ||= current_organization.users.find_by("LOWER(nickname) = ?", params[:nickname].downcase)
     end
 
     def activities

data/app/controllers/decidim/user_conversations_controller.rb

@@ -11,6 +11,7 @@ module Decidim
     include FormFactory
     include Messaging::ConversationHelper
     include HasProfileBreadcrumb
+    include AjaxPermissionHandler
 
     before_action :authenticate_user!
     before_action :ensure_profile_manager
@@ -18,9 +19,6 @@ module Decidim
     helper Decidim::ResourceHelper
     helper_method :user, :conversations, :conversation
 
-    # overwrite original rescue_from to ensure we print messages from ajax methods (update)
-    rescue_from Decidim::ActionForbidden, with: :ajax_user_has_no_permission
-
     def index
       enforce_permission_to :list, :conversation, interlocutor: user
     end
@@ -94,14 +92,6 @@ module Decidim
 
     private
 
-    # Rescue ajax calls and print the update.js view which prints the info on the message ajax form
-    # Only if the request is AJAX, otherwise behave as Decidim standards
-    def ajax_user_has_no_permission
-      return user_has_no_permission unless request.xhr?
-
-      render_unprocessable_entity I18n.t("actions.unauthorized", scope: "decidim.core")
-    end
-
     def render_unprocessable_entity(message)
       render action: :update, locals: { error: message }, status: :unprocessable_entity
     end

data/app/events/decidim/soft_delete_resource_event.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  class SoftDeleteResourceEvent < Decidim::Events::SimpleEvent
+    i18n_attributes :resource_type, :resource_title
+
+    def resource_type
+      resource.model_name.human
+    end
+
+    def resource_title
+      translated_attribute resource.title
+    end
+  end
+end

data/app/forms/decidim/account_form.rb

@@ -21,10 +21,7 @@ module Decidim
 
     validates :name, presence: true, format: { with: Decidim::User::REGEXP_NAME }
     validates :email, presence: true, "valid_email_2/email": { disposable: true }
-    validates :nickname,
-              presence: true,
-              format: { with: Decidim::User::REGEXP_NICKNAME, message: :format },
-              length: { maximum: Decidim::User.nickname_max_length }
+    validates :nickname, presence: true, format: { with: Decidim::User::REGEXP_NICKNAME }
 
     validates :nickname, length: { maximum: Decidim::User.nickname_max_length, allow_blank: true }
     validates :password, password: { name: :name, email: :email, username: :nickname }, if: -> { password.present? }
@@ -69,7 +66,7 @@ module Decidim
 
     def unique_nickname
       return true if Decidim::UserBaseEntity.where(
-        "decidim_organization_id = ? AND nickname = ? ",
+        "decidim_organization_id = ? AND LOWER(nickname) = ? ",
         context.current_organization.id,
         nickname.downcase
       ).where.not(id: context.current_user.id).empty?

data/app/forms/decidim/amendable/form.rb

@@ -94,7 +94,8 @@ module Decidim
                            .from_model(@i18n_amendable)
                            .with_context(
                              current_component: @i18n_amendable.component,
-                             current_participatory_space: @i18n_amendable.participatory_space
+                             current_participatory_space: @i18n_amendable.participatory_space,
+                             current_organization: @i18n_amendable.organization
                            )
       end
 
@@ -114,7 +115,8 @@ module Decidim
       def form_context
         context.to_h.merge(
           current_component: amendable.component,
-          current_participatory_space: amendable.participatory_space
+          current_participatory_space: amendable.participatory_space,
+          current_organization: amendable.organization
         )
       end
     end

data/app/forms/decidim/ephemeral_user_form.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  # The form object of ephemeral users.
+  class EphemeralUserForm < Form
+    mimic :user
+
+    attribute :locale
+    attribute :name
+    attribute :nickname
+    attribute :organization
+    attribute :verified, Boolean, default: false
+
+    def name
+      super || I18n.t("decidim.ephemeral_user", locale:)
+    end
+
+    def nickname
+      super || User.nicknamize(name)
+    end
+  end
+end

data/app/forms/decidim/notifications_settings_form.rb

@@ -7,6 +7,7 @@ module Decidim
     mimic :user
 
     attribute :email_on_moderations, Boolean
+    attribute :email_on_assigned_proposals, Boolean
     attribute :newsletter_notifications, Boolean
     attribute :notifications_from_followed, Boolean
     attribute :notifications_from_own_activity, Boolean

data/app/forms/decidim/omniauth_registration_form.rb

@@ -11,6 +11,7 @@ module Decidim
     attribute :provider, String
     attribute :uid, String
     attribute :tos_agreement, Boolean
+    attribute :newsletter, Boolean
     attribute :oauth_signature, String
     attribute :avatar_url, String
     attribute :raw_data, Hash
@@ -21,11 +22,23 @@ module Decidim
     validates :uid, presence: true
 
     def self.create_signature(provider, uid)
-      Digest::MD5.hexdigest("#{provider}-#{uid}-#{Rails.application.secrets.secret_key_base}")
+      Digest::MD5.hexdigest("#{provider}-#{uid}-#{Rails.application.secret_key_base}")
     end
 
     def normalized_nickname
-      UserBaseEntity.nicknamize(nickname || name, current_organization.id)
+      UserBaseEntity.nicknamize(nickname || name, organization: current_organization)
+    end
+
+    def newsletter_at
+      return nil unless newsletter?
+
+      Time.current
+    end
+
+    def valid_tos?
+      return if tos_agreement.nil?
+
+      errors.add :tos_agreement, :accepted
     end
   end
 end

data/app/forms/decidim/registration_form.rb

@@ -37,7 +37,7 @@ module Decidim
     end
 
     def generate_nickname(name, organization)
-      Decidim::UserBaseEntity.nicknamize(name, organization.id)
+      Decidim::UserBaseEntity.nicknamize(name, organization:)
     end
 
     def valid_users

data/app/helpers/concerns/decidim/flash_helper_extensions.rb

@@ -7,6 +7,17 @@ module Decidim
     extend ActiveSupport::Concern
 
     included do
+      DEFAULT_KEY_MATCHING = {
+        alert: :alert,
+        notice: :success,
+        info: :info,
+        secondary: :secondary,
+        success: :success,
+        error: :alert,
+        warning: :warning,
+        primary: :primary
+      }.freeze
+
       # Displays the flash messages found in ActionDispatch's +flash+ hash using
       # FoundationRailsHelper's +callout+ component.
       #
@@ -20,7 +31,7 @@ module Decidim
       #
       # @return [String] the HTML with all the flash messages
       def display_flash_messages(closable: true, key_matching: {})
-        key_matching = FoundationRailsHelper::FlashHelper::DEFAULT_KEY_MATCHING.merge(key_matching)
+        key_matching = DEFAULT_KEY_MATCHING.merge(key_matching)
         key_matching.default = :primary
 
         capture do
@@ -106,13 +117,17 @@ module Decidim
       end
 
       def message(value)
-        return content_tag(:div, value, class: "flash__message flex items-center") unless value.is_a?(Hash)
+        return content_tag(:div, value, class: "flash__message") unless value.is_a?(Hash)
 
         content_tag(:div, class: "flash__message") do
           concat value[:title]
           concat content_tag(:span, value[:body], class: "flash__message-body")
         end
       end
+
+      def ignored_key?(key)
+        [:timedout].include?(key)
+      end
     end
   end
 end