decidim-core 0.20.0 → 0.23.1.rc1

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

@@ -15,6 +15,7 @@ module Decidim
       helper Decidim::FiltersHelper
       helper Decidim::OrdersHelper
       helper Decidim::ResourceReferenceHelper
+      helper Decidim::ResourceVersionsHelper
       helper Decidim::TranslationsHelper
       helper Decidim::IconHelper
       helper Decidim::ResourceHelper
@@ -23,13 +24,14 @@ module Decidim
       helper Decidim::AttachmentsHelper
       helper Decidim::SanitizeHelper
       helper Decidim::PadHelper
+      helper Decidim::FilterParamsHelper
 
       helper_method :current_component,
                     :current_participatory_space,
                     :current_manifest
 
       before_action do
-        enforce_permission_to :read, :component, component: current_component
+        enforce_permission_to :read, :component, component: current_component, share_token: share_token
       end
 
       before_action :redirect_unless_feature_private
@@ -46,6 +48,10 @@ module Decidim
         @current_manifest ||= current_component.manifest
       end
 
+      def share_token
+        params[:share_token]
+      end
+
       def permission_scope
         :public
       end

data/app/controllers/decidim/cookie_policy_controller.rb

@@ -6,9 +6,12 @@ module Decidim
     skip_before_action :store_current_location
 
     def accept
-      response.set_cookie "decidim-cc", value: "true",
-                                        path: "/",
-                                        expires: 1.year.from_now.utc
+      response.set_cookie(
+        Decidim.config.consent_cookie_name,
+        value: "true",
+        path: "/",
+        expires: 1.year.from_now.utc
+      )
 
       respond_to do |format|
         format.js

data/app/controllers/decidim/data_portability_controller.rb

@@ -16,40 +16,33 @@ module Decidim
     def export
       enforce_permission_to :export, :user, current_user: current_user
 
-      DataPortabilityExportJob.perform_later(current_user, export_format)
+      DataPortabilityExportJob.perform_later(current_user)
 
       flash[:notice] = t("decidim.account.data_portability_export.notice")
-
       redirect_back(fallback_location: data_portability_path)
     end
 
     def download_file
       enforce_permission_to :download, :user, current_user: current_user
 
-      if params[:token].present?
-        file_reader = Decidim::DataPortabilityFileReader.new(current_user, params[:token])
-        if file_reader.valid_token?
-          file = File.open(file_reader.file_path)
-          if File.exist?(file)
-            send_file file, type: "application/zip", disposition: "attachment"
-          else
-            flash[:error] = t("decidim.account.data_portability_export.file_no_exists")
-            redirect_to data_portability_path
-          end
-        else
-          flash[:error] = t("decidim.account.data_portability_export.invalid_token")
-          redirect_to data_portability_path
-        end
+      if data_portability_file_exists?
+        redirect_to uploader.url
       else
-        flash[:error] = t("decidim.account.data_portability_export.no_token")
+        flash[:error] = t("decidim.account.data_portability_export.file_no_exists")
         redirect_to data_portability_path
       end
     end
 
     private
 
-    def export_format
-      "CSV"
+    def data_portability_file_exists?
+      uploader.file.exists?
+    rescue StandardError
+      false
+    end
+
+    def uploader
+      current_user.data_portability_file(params[:filename])
     end
   end
 end

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

@@ -66,7 +66,7 @@ module Decidim
       end
 
       def action_missing(action_name)
-        return send(:create) if devise_mapping.omniauthable? && User.omniauth_providers.include?(action_name.to_sym)
+        return send(:create) if devise_mapping.omniauthable? && current_organization.enabled_omniauth_providers.keys.include?(action_name.to_sym)
 
         raise AbstractController::ActionNotFound, "The action '#{action_name}' could not be found for Decidim::Devise::OmniauthCallbacksController"
       end

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

@@ -16,14 +16,12 @@ module Decidim
 
       def new
         @form = form(RegistrationForm).from_params(
-          user: {
-            sign_up_as: "user"
-          }
+          user: { sign_up_as: "user" }
         )
       end
 
       def create
-        @form = form(RegistrationForm).from_params(params[:user])
+        @form = form(RegistrationForm).from_params(params[:user].merge(current_locale: current_locale))
 
         CreateRegistration.call(@form) do
           on(:ok) do |user|
@@ -39,6 +37,7 @@ module Decidim
           end
 
           on(:invalid) do
+            flash.now[:alert] = @form.errors[:base].join(", ") if @form.errors[:base].any?
             render :new
           end
         end

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

@@ -12,6 +12,11 @@ module Decidim
         super
       end
 
+      def destroy
+        current_user.invalidate_all_sessions!
+        super
+      end
+
       def after_sign_in_path_for(user)
         if first_login_and_not_authorized?(user) && !user.admin? && !pending_redirect?(user)
           decidim_verifications.first_login_authorizations_path

data/app/controllers/decidim/endorsements_controller.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Exposes the `Endorsements` so that users can endorse resources.
+  class EndorsementsController < Decidim::Components::BaseController
+    # we need to +include+ to be able to call :endorsement_button from the view
+    include Decidim::EndorsableHelper
+    helper_method :endorsement_button
+    # we need to declare with +helper+ to be able to call :render_endorsement_identity from the views
+    helper Decidim::EndorsableHelper
+    helper_method :resource
+
+    before_action :authenticate_user!
+
+    def create
+      enforce_permission_to :create, :endorsement, resource: resource
+      user_group_id = params[:user_group_id]
+
+      EndorseResource.call(resource, current_user, user_group_id) do
+        on(:ok) do
+          resource.reload
+          render :update_buttons_and_counters
+        end
+
+        on(:invalid) do
+          render json: { error: I18n.t("resource_endorsements.create.error", scope: "decidim") }, status: :unprocessable_entity
+        end
+      end
+    end
+
+    def destroy
+      enforce_permission_to :withdraw, :endorsement, resource: resource
+      user_group_id = params[:user_group_id]
+      user_group = user_groups.find(user_group_id) if user_group_id
+
+      UnendorseResource.call(resource, current_user, user_group) do
+        on(:ok) do
+          resource.reload
+          render :update_buttons_and_counters
+        end
+      end
+    end
+
+    def identities
+      enforce_permission_to :create, :endorsement, resource: resource
+
+      @user_verified_groups = Decidim::UserGroups::ManageableUserGroups.for(current_user).verified
+      render :identities, layout: false
+    end
+
+    # should be pubic in order to be visibe in NeedsPermission#permissions_context
+    def current_component
+      resource.component
+    end
+
+    private
+
+    def user_groups
+      Decidim::UserGroups::ManageableUserGroups.for(current_user).verified
+    end
+
+    def resource
+      gid_param = params[:id] || params[:resource_id]
+      @resource ||= GlobalID::Locator.locate(GlobalID.parse(gid_param))
+    end
+
+    def current_participatory_space
+      current_component.participatory_space
+    end
+  end
+end

data/app/controllers/decidim/messaging/conversations_controller.rb

@@ -11,22 +11,32 @@ module Decidim
 
       before_action :authenticate_user!
 
-      helper_method :username_list, :conversation
+      helper_method :conversation, :user_grouped_messages, :sender_is_user?, :user_groups
 
+      # Shows the form to initiate a conversation with an user (the recipient)
+      # recipient is passed via GET parameter:
+      #   - if the recipient does not exists, goes back to the users profile page
+      #   - if the user already has a conversation with the user, redirects to the initiated conversation
       def new
-        enforce_permission_to :create, :conversation
-        @form = form(ConversationForm).from_params(params)
+        @form = form(ConversationForm).from_params(params, sender: current_user)
 
-        redirect_back(fallback_location: profile_path(current_user.nickname)) && return unless @form.recipient
+        if @form.recipient.is_a? Enumerable
+          participants = @form.recipient.to_a.prepend(current_user)
+          conversation = conversation_between_multiple(participants)
+        else
+          conversation = conversation_between(current_user, @form.recipient)
+        end
+
+        return redirect_back(fallback_location: profile_path(current_user.nickname)) if @form.recipient.empty?
+
+        return redirect_to conversation_path(conversation) if conversation
 
-        conversation = conversation_between(current_user, @form.recipient)
-        redirect_to conversation_path(conversation) if conversation
+        enforce_permission_to :create, :conversation, conversation: new_conversation(@form.recipient)
       end
 
       def create
-        enforce_permission_to :create, :conversation
-
-        @form = form(ConversationForm).from_params(params)
+        @form = form(ConversationForm).from_params(params, sender: current_user)
+        enforce_permission_to :create, :conversation, conversation: new_conversation(@form.recipient)
 
         StartConversation.call(@form) do
           on(:ok) do |conversation|
@@ -46,6 +56,7 @@ module Decidim
         enforce_permission_to :list, :conversation
 
         @conversations = UserConversations.for(current_user)
+        @form = MessageForm.new
       end
 
       def show
@@ -59,27 +70,59 @@ module Decidim
       def update
         enforce_permission_to :update, :conversation, conversation: conversation
 
-        @form = form(MessageForm).from_params(params)
+        @form = form(MessageForm).from_params(params, sender: current_user)
 
         ReplyToConversation.call(conversation, @form) do
           on(:ok) do |message|
             render action: :update, locals: { message: message }
           end
 
-          on(:invalid) do
-            render json: { error: I18n.t("messaging.conversations.update.error", scope: "decidim") }, status: :unprocessable_entity
+          on(:invalid) do |messages|
+            render action: :error, locals: {
+              error: I18n.t("messaging.conversations.update.error", scope: "decidim"),
+              messages: messages
+            }, status: :unprocessable_entity
           end
         end
       end
 
+      def check_multiple
+        @form = form(ConversationForm).from_params(params, sender: current_user)
+        redirect_link = current_or_new_conversation_path_with_multiple(@form.recipient)
+        redirect_to redirect_link
+      end
+
       private
 
+      def user_groups
+        return [] unless current_organization.user_groups_enabled?
+
+        current_user.manageable_user_groups
+      end
+
       def conversation
         @conversation ||= Conversation.find(params[:id])
       end
 
-      def username_list(users)
-        users.pluck(:name).join(", ")
+      def new_conversation(recipient)
+        return nil unless recipient
+
+        if recipient.is_a? Enumerable
+          Conversation.new(participants: [current_user] + recipient)
+        else
+          Conversation.new(participants: [current_user, recipient])
+        end
+      end
+
+      # allows to group all consecutive messages from the same sender
+      # so certain parameters can be displayed only once (such as the
+      # name of the sender)
+      def user_grouped_messages
+        conversation.messages.includes(:sender).chunk(&:sender)
+      end
+
+      def sender_is_user?(sender)
+        current_user.id == sender.id
       end
     end
   end

data/app/controllers/decidim/newsletters_controller.rb

@@ -3,7 +3,8 @@
 module Decidim
   # The controller to show the newsletter on the website.
   class NewslettersController < Decidim::ApplicationController
-    layout "decidim/mailer", only: [:show]
+    layout "decidim/newsletter_base", only: [:show]
+
     helper Decidim::SanitizeHelper
     include Decidim::NewslettersHelper
 
@@ -16,7 +17,6 @@ module Decidim
       raise ActionController::RoutingError, "Not Found" unless newsletter.sent?
 
       @encrypted_token = Decidim::NewsletterEncryptor.sent_at_encrypted(@user.id, newsletter.sent_at) if @user.present?
-      @body = parse_interpolations(newsletter.body[I18n.locale.to_s], @user, newsletter.id)
     end
 
     def unsubscribe

data/app/controllers/decidim/profiles_controller.rb

@@ -22,16 +22,19 @@ module Decidim
 
     def following
       @content_cell = "decidim/following"
+      @title_key = "following"
       render :show
     end
 
     def followers
       @content_cell = "decidim/followers"
+      @title_key = "followers"
       render :show
     end
 
     def badges
       @content_cell = "decidim/badges"
+      @title_key = "badges"
       render :show
     end
 
@@ -39,6 +42,7 @@ module Decidim
       enforce_user_groups_enabled
 
       @content_cell = "decidim/groups"
+      @title_key = "groups"
       render :show
     end
 
@@ -46,11 +50,13 @@ module Decidim
       enforce_user_groups_enabled
 
       @content_cell = "decidim/members"
+      @title_key = "members"
       render :show
     end
 
     def activity
       @content_cell = "decidim/user_activity"
+      @title_key = "activity"
       render :show
     end
 

data/app/controllers/decidim/scopes_controller.rb

@@ -8,21 +8,34 @@ module Decidim
     def picker
       enforce_permission_to :pick, :scope
 
-      context = root ? { root: root.id, title: title } : { title: title }
+      context = root ? { root: root.id, title: title, max_depth: max_depth } : { title: title, max_depth: max_depth }
       required = params[:required] && params[:required] != "false"
-      current = (root&.descendants || current_organization.scopes).find_by(id: params[:current]) if params[:current].present?
 
       if current
-        scopes = current.children
+        scopes = current.children unless scope_depth_limit?
         parent_scopes = current.part_of_scopes(root)
       else
-        current = root
-        scopes = root&.children || current_organization.scopes.top_level
+        scopes = root&.children || current_organization.scopes.top_level unless scope_depth_limit?
+
         parent_scopes = [root].compact
       end
 
-      render :picker, layout: nil, locals: { required: required, title: title, root: root, current: current, scopes: scopes.order(name: :asc),
-                                             parent_scopes: parent_scopes, global_value: params[:global_value], context: context }
+      render(
+        :picker,
+        layout: nil,
+        locals: {
+          required: required,
+          title: title,
+          root: root,
+          current: (current || root),
+          scopes: scopes&.order(name: :asc),
+          parent_scopes: parent_scopes,
+          picker_target_id: (params[:target_element_id] || "content"),
+          global_value: params[:global_value],
+          max_depth: max_depth,
+          context: context
+        }
+      )
     end
 
     private
@@ -36,5 +49,27 @@ module Decidim
 
       @root ||= current_organization.scopes.find(params[:root])
     end
+
+    def current
+      return if params[:current].blank?
+
+      @current ||= (root&.descendants || current_organization.scopes).find_by(id: params[:current])
+    end
+
+    def filter_scope_depth?
+      @filter_scope_depth ||= params[:max_depth].present?
+    end
+
+    def scope_depth_limit?
+      return unless filter_scope_depth?
+
+      @scope_depth_limit ||= current&.scope_type == max_depth
+    end
+
+    def max_depth
+      return unless filter_scope_depth?
+
+      @max_depth ||= current_organization.scope_types.find(params[:max_depth])
+    end
   end
 end