decidim-core 0.30.2 → 0.31.0.rc1

data/app/controllers/decidim/amendments_controller.rb

@@ -6,7 +6,6 @@ module Decidim
     include FormFactory
     include HasSpecificBreadcrumb
     helper Decidim::ResourceReferenceHelper
-    helper UserGroupHelper
 
     before_action :authenticate_user!
     helper_method :amendment, :amendable, :emendation
@@ -39,7 +38,7 @@ module Decidim
 
         on(:invalid) do
           flash.now[:alert] = t("created.error", scope: "decidim.amendments")
-          render :new
+          render :new, status: :unprocessable_entity
         end
       end
     end
@@ -63,7 +62,7 @@ module Decidim
 
         on(:invalid) do
           flash.now[:alert] = t("error", scope: "decidim.amendments.update_draft")
-          render :edit_draft
+          render :edit_draft, status: :unprocessable_entity
         end
       end
     end
@@ -101,7 +100,7 @@ module Decidim
 
         on(:invalid) do
           flash.now[:alert] = t("error", scope: "decidim.amendments.publish_draft")
-          render :edit_draft
+          render :edit_draft, status: :unprocessable_entity
         end
       end
     end
@@ -161,7 +160,7 @@ module Decidim
 
         on(:invalid) do
           flash.now[:alert] = t("accepted.error", scope: "decidim.amendments")
-          render :review
+          render :review, status: :unprocessable_entity
         end
       end
     end

data/app/controllers/decidim/application_controller.rb

@@ -41,7 +41,6 @@ module Decidim
     helper Decidim::ViewHooksHelper
     helper Decidim::CardHelper
     helper Decidim::SanitizeHelper
-    helper Decidim::TwitterSearchHelper
     helper Decidim::SocialShareButtonHelper
     helper Decidim::FiltersHelper
     helper Decidim::OnboardingActionHelper
@@ -68,6 +67,8 @@ module Decidim
 
     private
 
+    def allow_browser(**); end
+
     # This overrides Devise's method for extracting the path from the URL. We
     # want to ensure the path to be stored in the cookie is not too long in
     # order to avoid ActionDispatch::Cookies::CookieOverflow exception. If the

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

@@ -7,8 +7,6 @@ module Decidim
       include Decidim::DeviseControllers
       include Decidim::OnboardingActionMethods
 
-      helper_method :new_user_group_session_path
-
       def create
         super do |resource|
           resource.errors.delete(:decidim_organization_id) if resource.errors.any?
@@ -28,10 +26,7 @@ module Decidim
         super.merge(decidim_organization_id: current_organization.id)
       end
 
-      # Overwrites the default method to handle user groups confirmations.
       def after_confirmation_path_for(resource_name, resource)
-        return profile_path(resource.nickname) if resource_name == :user_group
-
         sign_in(resource)
 
         store_onboarding_cookie_data!(resource)

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

@@ -34,7 +34,7 @@ module Decidim
 
           on(:invalid) do
             set_flash_message :notice, :success, kind: @form.provider.capitalize
-            render :new
+            render :new, status: :unprocessable_entity
           end
 
           on(:add_tos_errors) do

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

@@ -36,7 +36,7 @@ module Decidim
           on(:invalid) do
             flash.now[:alert] = t("passwords.update.error", scope: "decidim")
             resource.errors.errors.concat(@form.errors.errors)
-            render action: "edit"
+            render action: "edit", status: :unprocessable_entity
           end
         end
       end

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

@@ -40,7 +40,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = t("error", scope: "decidim.devise.registrations.create")
-            render :new
+            render :new, status: :unprocessable_entity
           end
         end
       end

data/app/controllers/decidim/doorkeeper/authorizations_controller.rb

@@ -6,7 +6,18 @@ module Decidim
     class AuthorizationsController < ::Doorkeeper::AuthorizationsController
       include HasSpecificBreadcrumb
 
-      helper_method :oauth_application
+      helper_method :oauth_application, :all_abilities?
+
+      def new
+        @scopes =
+          if pre_auth.authorizable?
+            pre_auth.scopes
+          else
+            []
+          end
+
+        super
+      end
 
       def oauth_application
         @oauth_application ||= Decidim::OAuthApplication.find_by(uid: params[:client_id])
@@ -18,6 +29,13 @@ module Decidim
           active: true
         }
       end
+
+      private
+
+      def all_abilities?
+        %w(api:read api:write).all? { |scope| @scopes.include?(scope) } &&
+          %w(profile user).any? { |scope| @scopes.include?(scope) }
+      end
     end
   end
 end

data/app/controllers/decidim/download_your_data_controller.rb

@@ -10,7 +10,6 @@ module Decidim
 
     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')
@@ -21,9 +20,10 @@ module Decidim
     # 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.responses')
     # 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')
+    # i18n-tasks-use t('decidim.download_your_data.show.survey_user_responses')
     def show
       enforce_permission_to(:show, :user, current_user:)
 

data/app/controllers/decidim/likes_controller.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Exposes the `Likes` so that users can like resources.
+  class LikesController < Decidim::Components::BaseController
+    # we need to +include+ to be able to call :like_button from the view
+    include Decidim::LikeableHelper
+    helper_method :like_button
+    # we need to declare with +helper+ to be able to call :render_like_identity from the views
+    helper Decidim::LikeableHelper
+    helper_method :resource
+
+    before_action :authenticate_user!
+
+    def create
+      enforce_permission_to(:create, :like, resource:)
+
+      LikeResource.call(resource, current_user) do
+        on(:ok) do
+          resource.reload
+          render :update_buttons_and_counters
+        end
+
+        on(:invalid) do
+          render json: { error: I18n.t("resource_likes.create.error", scope: "decidim") }, status: :unprocessable_entity
+        end
+      end
+    end
+
+    def destroy
+      enforce_permission_to(:withdraw, :like, resource:)
+
+      UnlikeResource.call(resource, current_user) do
+        on(:ok) do
+          resource.reload
+          render :update_buttons_and_counters
+        end
+      end
+    end
+
+    # should be pubic in order to be visible in NeedsPermission#permissions_context
+    def current_component
+      resource.component
+    end
+
+    private
+
+    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/links_controller.rb

@@ -10,6 +10,7 @@ module Decidim
     helper_method :external_url
 
     before_action :parse_url
+
     rescue_from Decidim::InvalidUrlError, with: :modal
     rescue_from URI::InvalidURIError, with: :modal
 

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

@@ -14,7 +14,7 @@ module Decidim
 
       before_action :authenticate_user!
 
-      helper_method :conversation, :user_grouped_messages, :sender_is_user?, :user_groups, :validation_messages
+      helper_method :conversation, :user_grouped_messages, :sender_is_user?, :validation_messages
 
       # Shows the form to initiate a conversation with an user (the recipient)
       # recipient is passed via GET parameter:
@@ -102,13 +102,6 @@ module Decidim
 
       private
 
-      # deprecated
-      def user_groups
-        return [] unless current_organization.user_groups_enabled?
-
-        current_user.manageable_user_groups
-      end
-
       def validation_messages
         @validation_messages ||= []
       end

data/app/controllers/decidim/newsletters_controller.rb

@@ -34,7 +34,7 @@ module Decidim
 
           on(:invalid) do
             flash.now[:alert] = t("newsletters.unsubscribe.error", scope: "decidim")
-            render action: :unsubscribe
+            render action: :unsubscribe, status: :unprocessable_entity
           end
         end
       else

data/app/controllers/decidim/notifications_settings_controller.rb

@@ -17,14 +17,14 @@ module Decidim
       UpdateNotificationsSettings.call(@notifications_settings) do
         on(:ok) do
           flash.now[:notice] = t("notifications_settings.update.success", scope: "decidim")
+          render action: :show
         end
 
         on(:invalid) do
           flash.now[:alert] = t("notifications_settings.update.error", scope: "decidim")
+          render action: :show, status: :unprocessable_entity
         end
       end
-
-      render action: :show
     end
   end
 end

data/app/controllers/decidim/pages_controller.rb

@@ -6,7 +6,6 @@ module Decidim
     layout "layouts/decidim/application"
 
     helper_method :page, :pages, :page_content_blocks
-    helper CtaButtonHelper
     helper Decidim::SanitizeHelper
 
     before_action :legacy_redirect, :set_default_request_format

data/app/controllers/decidim/profiles_controller.rb

@@ -4,11 +4,7 @@ module Decidim
   # The controller to handle the user's public profile page.
   #
   # i18n-tasks-use t('decidim.profiles.show.badges')
-  # i18n-tasks-use t('decidim.profiles.show.groups')
-  # i18n-tasks-use t('decidim.profiles.show.group_admins')
-  # i18n-tasks-use t('decidim.profiles.show.group_members')
   class ProfilesController < Decidim::ApplicationController
-    include UserGroups
     include Flaggable
     include HasProfileBreadcrumb
 
@@ -17,20 +13,13 @@ module Decidim
     helper_method :profile_holder, :active_content, :context_menu
 
     before_action :ensure_profile_holder
-    before_action :ensure_profile_holder_is_a_group, only: [:members]
-    before_action :ensure_profile_holder_is_a_user, only: [:groups, :following]
+    before_action :ensure_profile_holder_is_a_user, only: :following
     before_action :ensure_user_not_blocked
 
     def show
-      return redirect_to profile_members_path if profile_holder.is_a?(Decidim::UserGroup)
-
       redirect_to profile_activity_path(nickname: params[:nickname].downcase)
     end
 
-    def tooltip
-      render json: { data: cell("decidim/author", profile_holder.presenter).profile_minicard }
-    end
-
     def following
       @content_cell = "decidim/following"
       @title_key = "following"
@@ -49,46 +38,6 @@ module Decidim
       render :show
     end
 
-    def groups
-      enforce_user_groups_enabled
-
-      @content_cell = "decidim/groups"
-      @title_key = "groups"
-      render :show
-    end
-
-    def members
-      enforce_user_groups_enabled
-
-      @content_cell = "decidim/members"
-      @title_key = "members"
-      render :show
-    end
-
-    def group_admins
-      enforce_permission_to :manage, :user_group, user_group: profile_holder
-
-      @content_cell = "decidim/group_admins"
-      @title_key = "group_admins"
-      render :show
-    end
-
-    def group_members
-      enforce_permission_to :manage, :user_group, user_group: profile_holder
-
-      @content_cell = "decidim/group_members"
-      @title_key = "group_members"
-      render :show
-    end
-
-    def group_invites
-      enforce_permission_to :manage, :user_group, user_group: profile_holder
-
-      @content_cell = "decidim/group_invites"
-      @title_key = "group_invites"
-      render :show
-    end
-
     def activity
       @content_cell = "decidim/user_activity"
       @title_key = "activity"
@@ -101,16 +50,12 @@ module Decidim
       raise ActionController::RoutingError, "Blocked User" if profile_holder&.blocked? && !current_user&.admin?
     end
 
-    def ensure_profile_holder_is_a_group
-      raise ActionController::RoutingError, "No user group with the given nickname" unless profile_holder.is_a?(Decidim::UserGroup)
-    end
-
     def ensure_profile_holder_is_a_user
       raise ActionController::RoutingError, "No user with the given nickname" unless profile_holder.is_a?(Decidim::User)
     end
 
     def ensure_profile_holder
-      raise ActionController::RoutingError, "No user or user group with the given nickname" if !profile_holder || profile_holder.nickname.blank?
+      raise ActionController::RoutingError, "No user with the given nickname" if !profile_holder || profile_holder.nickname.blank?
     end
 
     def profile_holder

data/app/controllers/decidim/qr_controller.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require "rqrcode"
+
+module Decidim
+  class QrController < Decidim::ApplicationController
+    include Decidim::OrganizationHelper
+    include Decidim::QrCodeHelper
+
+    helper_method :resource, :qr_code, :qr_code_image
+    before_action :validate_resource
+    before_action :validate_component
+    before_action :validate_participatory_space
+
+    layout false
+
+    def show
+      respond_to do |format|
+        format.html
+        format.png { send_data(qr_code.as_png(size: 500), filename: "qr-#{organization_name}-#{parametrized_title}.png") }
+      end
+    end
+
+    # needs to be public so that short link works
+    def current_component = resource.try(:component)
+
+    # needs to be public so that short link works
+    def current_participatory_space
+      return resource if resource.is_a?(Decidim::Participable)
+
+      resource.try(:participatory_space)
+    end
+
+    private
+
+    def validate_resource
+      raise ActiveRecord::RecordNotFound if resource.blank?
+      raise ActiveRecord::RecordNotFound if resource.respond_to?(:hidden?) && resource.hidden?
+      raise ActiveRecord::RecordNotFound if resource.is_a?(Decidim::Publicable) && !resource.published?
+    end
+
+    def validate_component
+      return unless resource.respond_to?(:component) && resource.component.present?
+
+      raise ActiveRecord::RecordNotFound unless resource.component.published?
+    end
+
+    def validate_participatory_space
+      raise ActiveRecord::RecordNotFound if resource.respond_to?(:participatory_space) && !resource.participatory_space.published?
+    end
+
+    def processed_params
+      return {} if resource.is_a?(Decidim::Participable)
+
+      {
+        participatory_process_slug: current_participatory_space.slug,
+        component_id: current_component&.id&.to_s,
+        id: resource.id.to_s
+      }.with_indifferent_access
+    end
+
+    def resource
+      @resource ||= GlobalID::Locator.locate_signed(params[:resource])
+    end
+
+    def parametrized_title
+      [
+        resource.presenter.title(html_escape: true).parameterize,
+        resource.id
+      ].join("-")
+    end
+  end
+end

data/app/controllers/decidim/resource_autocomplete_controller.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ResourceAutocompleteController < Decidim::ApplicationController
+    def index
+      respond_to do |format|
+        format.json do
+          if term.blank?
+            render json: [{ title: t("decidim.resource_autocomplete.help"), help: true }]
+          else
+            render json: serialized_results
+          end
+        end
+      end
+    end
+
+    private
+
+    def allowed_resource_types
+      %w(Decidim::Proposals::Proposal)
+    end
+
+    def serialized_results
+      search_results.map do |result|
+        {
+          gid: result.resource_global_id,
+          title: result.content_a
+        }
+      end
+    end
+
+    def search_results
+      Decidim::SearchableResource
+        .where(
+          resource_type: allowed_resource_types,
+          organization: current_organization,
+          decidim_participatory_space: current_participatory_space,
+          locale: I18n.locale
+        )
+        .autocomplete_search(term)
+        .limit(10)
+    end
+
+    def term
+      params[:term]
+    end
+
+    def participatory_space_gid
+      params[:participatory_space_gid]
+    end
+
+    def current_participatory_space
+      @current_participatory_space ||= GlobalID::Locator.locate(participatory_space_gid)
+    end
+  end
+end

data/app/controllers/decidim/user_activities_controller.rb

@@ -4,7 +4,6 @@ module Decidim
   # The controller to show all the last activities in a Decidim Organization.
   class UserActivitiesController < Decidim::ApplicationController
     include Paginable
-    include UserGroups
     include FilterResource
     include Flaggable
     include HasProfileBreadcrumb

data/app/events/decidim/resource_liked_event.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Decidim
+  class ResourceLikedEvent < Decidim::Events::SimpleEvent
+    i18n_attributes :liker_nickname, :liker_name, :liker_path, :nickname, :resource_type
+
+    delegate :nickname, :name, to: :liker, prefix: true
+
+    def nickname
+      liker_nickname
+    end
+
+    def liker_path
+      liker.profile_path
+    end
+
+    def resource_text
+      return resource.body if resource.respond_to? :body
+      return resource.description if resource.respond_to? :description
+    end
+
+    def resource_type
+      resource.class.model_name.human
+    end
+
+    private
+
+    def liker
+      @liker ||= Decidim::UserPresenter.new(liker_user)
+    end
+
+    def liker_user
+      @liker_user ||= Decidim::User.find_by(id: extra[:liker_id])
+    end
+  end
+end

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

@@ -7,7 +7,6 @@ module Decidim
       mimic :amendment
 
       attribute :amendable_gid, String
-      attribute :user_group_id, Integer
       attribute :emendation_params, Hash
 
       validates :amendable_gid, presence: true

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

@@ -7,7 +7,6 @@ module Decidim
       mimic :amendment
 
       attribute :id, Integer
-      attribute :user_group_id, Integer
       attribute :emendation_params, Hash
 
       validates :id, presence: true

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

@@ -46,7 +46,7 @@ module Decidim
 
       # Validates the emendation using the amendable form.
       def amendable_form_must_be_valid
-        parse_hashtaggable_params
+        parse_content_params
         original_form.validate unless defined?(@original_form) # Preserves previously added errors.
 
         amendable_form.validate unless defined?(@amendable_form) # Preserves previously added errors.
@@ -72,13 +72,13 @@ module Decidim
         end
       end
 
-      # Parses :title and :body attribute values with HashtagParser.
-      def parse_hashtaggable_params
+      # Parses :title and :body attribute values with BlobParser.
+      def parse_content_params
         emendation_params.each do |key, value|
           next unless [:title, :body].include?(key)
 
           clean_value = translated_attribute(value)
-          emendation_params[key] = Decidim::ContentParsers::HashtagParser.new(clean_value, form_context).rewrite
+          emendation_params[key] = Decidim::ContentParsers::BlobParser.new(clean_value, form_context).rewrite
         end
       end
 

data/app/forms/decidim/ephemeral_user_form.rb

@@ -10,6 +10,7 @@ module Decidim
     attribute :nickname
     attribute :organization
     attribute :verified, Boolean, default: false
+    attribute :onboarding_data, Hash, default: {}
 
     def name
       super || I18n.t("decidim.ephemeral_user", locale:)

data/app/forms/decidim/notifications_settings_form.rb

@@ -46,7 +46,7 @@ module Decidim
     end
 
     def meet_push_notifications_requirements?
-      Rails.application.secrets.dig(:vapid, :enabled) || false
+      Decidim.vapid_public_key.present?
     end
   end
 end

data/app/forms/decidim/omniauth_registration_form.rb

@@ -22,7 +22,7 @@ module Decidim
     validates :uid, presence: true
 
     def self.create_signature(provider, uid)
-      Digest::MD5.hexdigest("#{provider}-#{uid}-#{Rails.application.secret_key_base}")
+      Digest::SHA256.hexdigest("#{provider}-#{uid}-#{Rails.application.secret_key_base}")
     end
 
     def normalized_nickname

data/app/forms/decidim/upload_validation_form.rb

@@ -79,7 +79,7 @@ module Decidim
     class AttachmentContextProxy
       attr_reader :organization, :attachment_context
 
-      delegate :id, :_read_attribute, to: :organization
+      delegate :id, :_read_attribute, :read_attribute, to: :organization
 
       def initialize(organization, attachment_context)
         @organization = organization
@@ -90,6 +90,14 @@ module Decidim
         :id
       end
 
+      def self.composite_primary_key?
+        false
+      end
+
+      def self.has_query_constraints?
+        false
+      end
+
       def self.polymorphic_name
         "Decidim::Organization"
       end