decidim-core 0.31.7 → 0.32.0.rc1

data/app/mailers/decidim/application_mailer.rb

@@ -9,10 +9,11 @@ module Decidim
     include Decidim::SanitizeHelper
     include Decidim::MailerHelper
     include Decidim::OrganizationHelper
-    helper_method :organization_name, :decidim_escape_translated, :decidim_sanitize_translated, :translated_attribute, :decidim_sanitize, :decidim_sanitize_newsletter
 
     helper Decidim::SanitizeHelper
     helper Decidim::MailerHelper
+    helper_method :organization_name, :current_locale, :decidim_escape_translated, :decidim_sanitize_translated, :translated_attribute, :decidim_sanitize,
+                  :decidim_sanitize_newsletter
 
     after_action :set_smtp
     after_action :set_from
@@ -24,10 +25,14 @@ module Decidim
 
     attr_reader :organization
 
+    def current_locale
+      I18n.locale || I18n.default_locale
+    end
+
     def set_smtp
       return if organization.nil? || organization.smtp_settings.blank? || organization.smtp_settings.except("from", "from_label", "from_email").all?(&:blank?)
 
-      mail.reply_to = mail.reply_to || Decidim.config.mailer_reply
+      mail.reply_to = mail.reply_to || Decidim.config.mailer_sender
       mail.delivery_method.settings.merge!(
         address: organization.smtp_settings["address"],
         port: organization.smtp_settings["port"],

data/app/mailers/decidim/decidim_devise_mailer.rb

@@ -6,6 +6,7 @@ module Decidim
   class DecidimDeviseMailer < ::Devise::Mailer
     include LocalisedMailer
     include Decidim::SanitizeHelper
+
     helper_method :decidim_escape_translated, :decidim_sanitize_translated, :translated_attribute
 
     layout "decidim/mailer"

data/app/mailers/decidim/participants_account_mailer.rb

@@ -18,5 +18,21 @@ module Decidim
         mail(to: user.email, subject:)
       end
     end
+
+    # Notify user about account removal due to inactivity
+    def removal_notification(email, name, locale, organization)
+      @email = email
+      @user_name = name
+      @organization = organization
+
+      I18n.with_locale(locale) do
+        subject = I18n.t(
+          "decidim.participants_account_mailer.removal_notification.subject",
+          organization_name: organization_name(@organization)
+        )
+
+        mail(to: email, subject:)
+      end
+    end
   end
 end

data/app/mailers/decidim/reported_mailer.rb

@@ -72,7 +72,10 @@ module Decidim
     end
 
     def author_profile_url
-      @author_profile_url ||= @author.is_a?(Decidim::UserBaseEntity) && !@author.deleted? ? decidim.profile_url(@author.nickname, host: @organization.host) : nil
+      @author_profile_url ||= if @author.is_a?(Decidim::UserBaseEntity) && !@author.deleted?
+                                decidim.profile_url(@author.nickname,
+                                                    host: @organization.host)
+                              end
     end
 
     def original_language(reportable)

data/app/models/decidim/action_log.rb

@@ -262,7 +262,7 @@ module Decidim
         participatory_space_lazy.present? &&
         !resource_lazy.try(:deleted?) &&
         !resource_lazy.try(:hidden?) &&
-        (participatory_space_lazy.try(:is_transparent?) || !resource_lazy.respond_to?(:can_participate?) || resource_lazy.try(:can_participate?, user))
+        (participatory_space_lazy.try(:transparent?) || !resource_lazy.respond_to?(:can_participate?) || resource_lazy.try(:can_participate?, user))
     rescue NameError => e
       Rails.logger.warn "Failed resource for #{self.class.name}(id=#{id}): #{e.message}"
 

data/app/models/decidim/attachment.rb

@@ -88,7 +88,7 @@ module Decidim
     # Returns String.
     def file_type
       if file?
-        file.filename.extension&.downcase
+        url&.split(".")&.last&.split("&")&.first&.downcase
       elsif link?
         "link"
       end
@@ -100,13 +100,7 @@ module Decidim
     def url
       @url ||=
         if file?
-          if private_download_required?
-            Decidim::Core::Engine.routes.url_helpers.private_download_path(
-              Decidim::PrivateDownload.for(self, attachment_name: :file).token
-            )
-          else
-            attached_uploader(:file).url
-          end
+          attached_uploader(:file).url
         elsif link?
           link
         end
@@ -150,17 +144,5 @@ module Decidim
 
       attached_to.can_participate?(user)
     end
-
-    def private_download_authorized?(user, requested_attachment_name)
-      return false unless requested_attachment_name.to_s == "file"
-
-      can_participate?(user)
-    end
-
-    def private_download_required?
-      return attached_to.private_space? if attached_to.respond_to?(:private_space?)
-
-      attached_to.respond_to?(:component) && attached_to.component&.private_non_transparent_space?
-    end
   end
 end

data/app/models/decidim/authorization.rb

@@ -91,13 +91,6 @@ module Decidim
       Decidim::AuthorizationTransfer.perform!(self, handler)
     end
 
-    def private_download_authorized?(user, requested_attachment_name)
-      return false unless requested_attachment_name.to_s == "verification_attachment"
-      return true if user&.admin? && user.organization == organization
-
-      user == self.user
-    end
-
     private
 
     def active_handler?

data/app/models/decidim/authorization_transfer.rb

@@ -214,7 +214,7 @@ module Decidim
     #     }
     #   }
     #
-    # @return [Hash<String => Hash<Symbol => Integer, ActiveModel::Name>>] The
+    # @return [Hash{String => Hash{Symbol => Integer, ActiveModel::Name}}] The
     #   information hash created for the transfer.
     def information
       {}.tap do |types|

data/app/models/decidim/component.rb

@@ -64,6 +64,7 @@ module Decidim
       {
         :host => organization.host,
         :component_id => id,
+        :locale => I18n.locale,
         :"#{participatory_space.underscored_name}_slug" => participatory_space.slug
       }
     end
@@ -102,22 +103,18 @@ module Decidim
     def can_participate_in_space?(user)
       return false unless published?
       return false unless participatory_space.published?
-      return true unless participatory_space.try(:private_space?)
+
+      return true unless participatory_space.respond_to?(:restricted?) && participatory_space.restricted?
       return false unless user
 
       participatory_space.can_participate?(user)
     end
     alias can_participate? can_participate_in_space?
 
-    def private_non_transparent_space?
-      return false unless participatory_space.respond_to?(:private_space?)
-      return false unless participatory_space.private_space?
+    def restricted_space?
+      return false unless participatory_space.respond_to?(:restricted?)
 
-      if participatory_space.respond_to?(:is_transparent?)
-        !participatory_space.is_transparent?
-      else
-        true
-      end
+      participatory_space.restricted?
     end
 
     # Public: Public URL for component with given share token as query parameter

data/app/models/decidim/content_block.rb

@@ -36,7 +36,7 @@ module Decidim
     # Returns an object that responds to the settings defined in the content
     # block manifest.
     def settings
-      manifest.settings.schema.new(self[:settings])
+      manifest.settings.schema.new(self[:settings], organization&.default_locale)
     end
 
     def reload(*)
@@ -123,8 +123,8 @@ module Decidim
     private
 
     def manifest_attachments
-      @manifest_attachments ||= manifest.images.each_with_object({}) do |attachment_config, list|
-        list[attachment_config[:name]] = attachments.find_or_initialize_by(name: attachment_config[:name])
+      @manifest_attachments ||= manifest.images.to_h do |attachment_config|
+        [attachment_config[:name], attachments.find_or_initialize_by(name: attachment_config[:name])]
       end
     end
 

data/app/models/decidim/moderation.rb

@@ -32,7 +32,7 @@ module Decidim
     end
 
     def self.ransackable_attributes(_auth_object = nil)
-      %w(reported_id_string reported_content created_at report_count)
+      %w(reported_id_string reported_content created_at)
     end
 
     def self.ransackable_associations(_auth_object = nil)

data/app/models/decidim/newsletter.rb

@@ -50,8 +50,8 @@ module Decidim
       extended_data["participatory_space_types"]
     end
 
-    def sent_to_private_members?
-      extended_data["send_to_private_members"]
+    def sent_to_members?
+      extended_data["send_to_members"]
     end
 
     def template

data/app/models/decidim/participatory_space/member.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatorySpace
+    # This class gives a given User access to a given private Member
+    class Member < ApplicationRecord
+      include Decidim::DownloadYourData
+      include ParticipatorySpaceUser
+      include Decidim::TranslatableResource
+
+      belongs_to :participatory_space, polymorphic: true
+
+      translatable_fields :role
+
+      delegate :email, :name, to: :user
+
+      validates :user, uniqueness: { scope: [:participatory_space_id, :participatory_space_type] }
+
+      scope :by_participatory_space, ->(participatory_space) { where(participatory_space_id: participatory_space.id, participatory_space_type: participatory_space.class.to_s) }
+      scope :published, -> { where(published: true) }
+
+      def self.user_collection(user)
+        where(decidim_user_id: user.id)
+      end
+
+      def self.member_ids_for_participatory_spaces(spaces)
+        joins(:user).where(participatory_space: spaces).distinct.pluck(:decidim_user_id)
+      end
+
+      def self.export_serializer
+        Decidim::DownloadYourDataSerializers::DownloadYourDataMemberSerializer
+      end
+
+      def self.log_presenter_class_for(_log)
+        Decidim::AdminLog::ParticipatorySpace::MemberPresenter
+      end
+
+      ransacker :invitation_sent_at do
+        Arel.sql(%{("invitation_sent_at")::text})
+      end
+
+      def self.ransackable_attributes(auth_object = nil)
+        return [] unless auth_object&.admin?
+
+        %w(name nickname email invitation_accepted_at last_sign_in_at invitation_sent_at role)
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w(user)
+      end
+
+      def target_space_association = :participatory_space
+    end
+  end
+end

data/app/models/decidim/private_export.rb

@@ -24,11 +24,5 @@ module Decidim
       self.content_type = file.content_type
       self.file_size = file.byte_size
     end
-
-    def private_download_authorized?(user, requested_attachment_name)
-      return false unless requested_attachment_name.to_s == "file"
-
-      attached_to == user
-    end
   end
 end

data/app/models/decidim/resource_link.rb

@@ -7,7 +7,7 @@ module Decidim
   # In order to group the relations between resources you need to specify a name.
   #
   # Some examples could be: proposals that have been created in a meeting or
-  # projects that are a result of merging different proposals.
+  # results that are the merge of different proposals.
   class ResourceLink < ApplicationRecord
     belongs_to :from, polymorphic: true
     belongs_to :to, polymorphic: true

data/app/models/decidim/short_link.rb

@@ -94,7 +94,7 @@ module Decidim
     #
     # @return [String] The target full URL that the short link should link to.
     def target_url
-      url_helpers.send("#{route_name}_url", **params)
+      url_helpers.send("#{route_name}_url", { locale: I18n.locale }.reverse_merge(params))
     end
 
     private

data/app/models/decidim/user.rb

@@ -21,8 +21,8 @@ module Decidim
 
     devise :invitable, :database_authenticatable, :registerable, :confirmable, :timeoutable,
            :recoverable, :trackable, :lockable,
-           :decidim_validatable, :decidim_newsletterable,
-           :omniauthable, omniauth_providers: Decidim::OmniauthProvider.available.keys,
+           :decidim_validatable, :decidim_newsletterable, :jwt_authenticatable,
+           :omniauthable, omniauth_providers: Decidim::OmniauthProvider.available.keys, jwt_revocation_strategy: Decidim::Api::JwtDenylist,
                           request_keys: [:env], reset_password_keys: [:decidim_organization_id, :email],
                           confirmation_keys: [:decidim_organization_id, :email]
     devise :rememberable if Decidim.enable_remember_me

data/app/models/decidim/user_base_entity.rb

@@ -69,27 +69,12 @@ module Decidim
       Decidim::UserBaseEntity.joins(:follows).where(decidim_follows: { user: self }).blocked.exists?
     end
 
-    ransacker :role do
-      Arel.sql(%{CASE WHEN "decidim_users"."admin" = true THEN 'admin' ELSE cast("decidim_users"."roles" as text) END})
-    end
-
-    ransacker :user_moderation_report_count do
-      query = <<~SQL.squish
-        (
-            SELECT COALESCE(MAX(decidim_user_moderations.report_count), 0)
-            FROM decidim_user_moderations
-            WHERE decidim_user_moderations.decidim_user_id = decidim_users.id
-        )
-      SQL
-      Arel.sql(query)
-    end
-
     def self.ransackable_attributes(auth_object = nil)
-      base = %w(name email nickname last_sign_in_at created_at)
+      base = %w(name email nickname last_sign_in_at)
 
       return base unless auth_object&.admin?
 
-      base + %w(invitation_sent_at invitation_accepted_at officialized_at role user_moderation_report_count)
+      base + %w(invitation_sent_at invitation_accepted_at officialized_at)
     end
 
     def self.ransackable_associations(_auth_object = nil)

data/app/models/decidim/user_moderation.rb

@@ -19,7 +19,7 @@ module Decidim
     end
 
     def self.ransackable_attributes(_auth_object = nil)
-      %w(created_at report_count)
+      []
     end
 
     def self.ransackable_associations(_auth_object = nil)