RubyGems - decidim-core - Versions diffs - 0.26.10 → 0.27.0.rc1 - Mend

decidim-core 0.26.10 → 0.27.0.rc1

Potentially problematic release.

This version of decidim-core might be problematic. Click here for more details.

Files changed (643) hide show

data/app/helpers/decidim/map_helper.rb CHANGED Viewed

@@ -45,12 +45,14 @@ module Decidim
         link: map_url
       }.merge(options))
-      unless snippets.any?(:map)
-        snippets.add(:map, builder.stylesheet_snippets)
-        snippets.add(:map, builder.javascript_snippets)
+      unless snippets.any?(:map_styles) || snippets.any?(:map_scripts)
+        snippets.add(:map_styles, builder.stylesheet_snippets)
+        snippets.add(:map_scripts, builder.javascript_snippets)
         # This will display the snippets in the <head> part of the page.
-        snippets.add(:head, snippets.for(:map))
+        snippets.add(:head, snippets.for(:map_styles))
+        # This will display the snippets in the bottom part of the page.
+        snippets.add(:foot, snippets.for(:map_scripts))
       end
       builder.map_element(
@@ -84,12 +86,14 @@ module Decidim
       # Ideally we would use Rails' native content_for here (which is exactly
       # for this purpose) but unfortunately it does not work in the cells which
       # also need to display maps.
-      unless snippets.any?(:map)
-        snippets.add(:map, builder.stylesheet_snippets)
-        snippets.add(:map, builder.javascript_snippets)
+      unless snippets.any?(:map_styles) || snippets.any?(:map_scripts)
+        snippets.add(:map_styles, builder.stylesheet_snippets)
+        snippets.add(:map_scripts, builder.javascript_snippets)
         # This will display the snippets in the <head> part of the page.
-        snippets.add(:head, snippets.for(:map))
+        snippets.add(:head, snippets.for(:map_styles))
+        # This will display the snippets in the bottom part of the page.
+        snippets.add(:foot, snippets.for(:map_scripts))
       end
       map_html_options = { id: "map", class: "google-map" }.merge(html_options)

data/app/helpers/decidim/meta_tags_helper.rb CHANGED Viewed

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
-# rubocop:disable Naming/MemoizedInstanceVariableName
 module Decidim
   # Helper that provides convenient methods to deal with the page meta tags.
   module MetaTagsHelper
@@ -128,4 +127,3 @@ module Decidim
     end
   end
 end
-# rubocop:enable Naming/MemoizedInstanceVariableName

data/app/helpers/decidim/newsletters_helper.rb CHANGED Viewed

@@ -31,7 +31,6 @@ module Decidim
     # this method is used to generate the root link on mail with the utm_codes
     # If the newsletter_id is nil, it returns the root_url
     def custom_url_for_mail_root(organization, newsletter_id = nil)
-      decidim = EngineRouter.new("decidim", {})
       if newsletter_id.present?
         decidim.root_url(host: organization.host) + utm_codes(organization.host, newsletter_id.to_s)
       else

data/app/helpers/decidim/notifications_settings_helper.rb ADDED Viewed

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+module Decidim
+  # Helper that provides methods to render the notifications settings form
+  module NotificationsSettingsHelper
+    def frequencies_collection
+      {
+        none: t("decidim.notifications_settings.show.notifications_sending_frequencies.none"),
+        real_time: t("decidim.notifications_settings.show.notifications_sending_frequencies.real_time"),
+        daily: t("decidim.notifications_settings.show.notifications_sending_frequencies.daily"),
+        weekly: t("decidim.notifications_settings.show.notifications_sending_frequencies.weekly")
+      }
+    end
+  end
+end

data/app/helpers/decidim/passwords_helper.rb ADDED Viewed

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+module Decidim
+  module PasswordsHelper
+    def password_field_options_for(user)
+      user =
+        case user
+        when :user
+          Decidim::User.new
+        when :admin
+          Decidim::User.new(admin: true)
+        when String
+          Decidim::User.with_reset_password_token(user)
+        else
+          user
+        end
+      min_length = ::PasswordValidator.minimum_length_for(user)
+      help_text =
+        if needs_admin_password?(user)
+          t("devise.passwords.edit.password_help_admin", minimun_characters: min_length)
+        else
+          t("devise.passwords.edit.password_help", minimun_characters: min_length)
+        end
+      {
+        autocomplete: "new-password",
+        required: true,
+        help_text: help_text,
+        minlength: min_length,
+        maxlength: ::PasswordValidator::MAX_LENGTH
+      }
+    end
+    def needs_admin_password?(user)
+      return false unless user&.admin?
+      return false unless Decidim.config.admin_password_strong
+      true
+    end
+  end
+end

data/app/helpers/decidim/resource_helper.rb CHANGED Viewed

@@ -67,8 +67,6 @@ module Decidim
     # Returns an instance of ResourceLocatorPresenter with the given resource
     def resource_locator(resource)
-      return resource.resource_locator if resource.respond_to?(:resource_locator)
       ::Decidim::ResourceLocatorPresenter.new(resource)
     end

data/app/helpers/decidim/sanitize_helper.rb CHANGED Viewed

@@ -16,18 +16,13 @@ module Decidim
     #
     # Returns an HTML-safe String.
     def decidim_sanitize(html, options = {})
-      scrubber = options[:scrubber] || Decidim::UserInputScrubber.new
       if options[:strip_tags]
-        strip_tags sanitize(html, scrubber: scrubber)
+        strip_tags sanitize(html, scrubber: Decidim::UserInputScrubber.new)
       else
-        sanitize(html, scrubber: scrubber)
+        sanitize(html, scrubber: Decidim::UserInputScrubber.new)
       end
     end
-    def decidim_sanitize_admin(html, options = {})
-      decidim_sanitize(html, { scrubber: Decidim::AdminInputScrubber.new }.merge(options))
-    end
     def decidim_sanitize_newsletter(html, options = {})
       if options[:strip_tags]
         strip_tags sanitize(html, scrubber: Decidim::NewsletterScrubber.new)
@@ -37,11 +32,8 @@ module Decidim
     end
     def decidim_sanitize_editor(html, options = {})
-      content_tag(:div, decidim_sanitize(html, options), class: %w(ql-editor-display))
-    end
-    def decidim_sanitize_editor_admin(html, options = {})
-      decidim_sanitize_editor(html, { scrubber: Decidim::AdminInputScrubber.new }.merge(options))
+      html = Decidim::IframeDisabler.new(html, options).perform
+      content_tag(:div, decidim_sanitize(html, options), class: %w(ql-editor ql-reset-decidim))
     end
     def decidim_html_escape(text)
@@ -111,10 +103,9 @@ module Decidim
     #
     # @return ActiveSupport::SafeBuffer
     def render_sanitized_content(resource, method)
-      content = present(resource).send(method, links: true, strip_tags: !try(:safe_content?))
+      content = present(resource).send(method, links: true, strip_tags: !safe_content?)
-      return decidim_sanitize(content, {}) unless try(:safe_content?)
-      return decidim_sanitize_editor_admin(content, {}) if try(:safe_content_admin?)
+      return decidim_sanitize(content, {}) unless safe_content?
       decidim_sanitize_editor(content)
     end

data/app/helpers/decidim/searches_helper.rb CHANGED Viewed

@@ -27,12 +27,12 @@ module Decidim
       new_params = {
         utf8: params[:utf8],
         filter: {
-          decidim_scope_id: params.dig(:filter, :decidim_scope_id),
+          with_scope: params.dig(:filter, :with_scope),
           term: params[:term] || params.dig(:filter, :term)
         }
       }
-      new_params[:filter][:resource_type] = resource_type if resource_type.present?
-      new_params[:filter][:space_state] = space_state if space_state.present?
+      new_params[:filter][:with_resource_type] = resource_type if resource_type.present?
+      new_params[:filter][:with_space_state] = space_state if space_state.present?
       decidim.search_path(new_params)
     end
@@ -44,14 +44,14 @@ module Decidim
     # Generates the path to filter by resource type, considering the other filters.
     def search_path_by_resource_type(resource_type)
-      search_path_by(space_state: params.dig(:filter, :space_state), resource_type: resource_type)
+      search_path_by(space_state: params.dig(:filter, :with_space_state), resource_type: resource_type)
     end
     # Generates the path and link to filter by space state, taking into account
     # the other filters applied.
     def search_path_by_state_link(state)
-      path = search_path_by(resource_type: params.dig(:filter, :resource_type), space_state: state)
-      is_active = params.dig(:filter, :space_state).to_s == state.to_s
+      path = search_path_by(resource_type: params.dig(:filter, :with_resource_type), space_state: state)
+      is_active = params.dig(:filter, :with_space_state).to_s == state.to_s
       link_to path, class: "order-by__tab#{" is-active" if is_active}" do
         content_tag(:strong, t(state || :all, scope: "decidim.searches.filters.state"))

data/app/helpers/decidim/short_link_helper.rb ADDED Viewed

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+module Decidim
+  # This helper includes some methods to help with generating short links within
+  # the Decidim engine views.
+  module ShortLinkHelper
+    # A helper method to get a short URL in the current context where this
+    # method is called from. This helper automatically fetches the "target" for
+    # the short link, such as the component or the participatory process. This
+    # also resolves the current mounted route name to make it possible to refer
+    # to the same context when redirecting the short URL to correct full URL.
+    #
+    # @option kwargs [Boolean] :route_name the route name to which the short
+    #   link should link to
+    # @option kwargs [Float] :params the URL query parameters that should be
+    #   included in the URL where the short link redirects to
+    # @return [String] The short URL
+    def short_url(**kwargs)
+      target = respond_to?(:current_component) && current_component
+      target ||= respond_to?(:current_participatory_space) && current_participatory_space
+      target ||= respond_to?(:current_organization) && current_organization
+      target ||= Rails.application
+      mounted_engine = EngineResolver.new(_routes).mounted_name
+      ShortLink.to(target, mounted_engine, **kwargs).short_url
+    end
+  end
+end

data/app/helpers/decidim/translations_helper.rb CHANGED Viewed

@@ -14,10 +14,10 @@ module Decidim
     # options - Any other option to delegate to the individual I18n.t calls
     #
     # Returns a Hash with the locales as keys and the translations as values.
-    def multi_translation(key, locales = Decidim.available_locales, *options)
+    def multi_translation(key, locales = Decidim.available_locales, **options)
       locales.each_with_object({}) do |locale, result|
         I18n.with_locale(locale) do
-          result[locale.to_sym] = I18n.t(key, *options)
+          result[locale.to_sym] = I18n.t(key, **options)
         end
       end
     end

data/app/jobs/decidim/{data_portability_export_job.rb → download_your_data_export_job.rb} RENAMED Viewed

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 module Decidim
-  class DataPortabilityExportJob < ApplicationJob
+  class DownloadYourDataExportJob < ApplicationJob
     queue_as :default
-    def perform(user, export_format = ::Decidim::DataPortabilityExporter::DEFAULT_EXPORT_FORMAT)
+    def perform(user, export_format = ::Decidim::DownloadYourDataExporter::DEFAULT_EXPORT_FORMAT)
       filename = "#{SecureRandom.urlsafe_base64}.zip"
       path = Rails.root.join("tmp/#{filename}")
       password = SecureRandom.urlsafe_base64
@@ -12,20 +12,17 @@ module Decidim
       generate_zip_file(user, path, password, export_format)
       save_or_upload_file(user, path)
-      ExportMailer.data_portability_export(user, filename, password).deliver_later
-      # Deletes temporary file
-      File.delete(path)
+      ExportMailer.download_your_data_export(user, filename, password).deliver_later
     end
     private
     def generate_zip_file(user, path, password, export_format)
-      DataPortabilityExporter.new(user, path, password, export_format).export
+      DownloadYourDataExporter.new(user, path, password, export_format).export
     end
     def save_or_upload_file(user, path)
-      user.data_portability_file.attach(io: File.open(path, "rb"), filename: File.basename(path))
+      user.download_your_data_file.attach(io: File.open(path, "rb"), filename: File.basename(path))
     end
   end
 end

data/app/jobs/decidim/email_notifications_digest_generator_job.rb ADDED Viewed

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+module Decidim
+  class EmailNotificationsDigestGeneratorJob < ApplicationJob
+    queue_as :mailers
+    def perform(user_id, frequency, time: Time.now.utc, force: false)
+      user = Decidim::User.find_by(id: user_id)
+      return if user.blank?
+      should_notify = force || NotificationsDigestSendingDecider.must_notify?(user, time: time)
+      return unless should_notify
+      notification_ids = user.notifications.try(frequency, time: time).pluck(:id)
+      return if notification_ids.blank?
+      NotificationsDigestMailer.digest_mail(user, notification_ids).deliver_later
+      user.update(digest_sent_at: time)
+    end
+  end
+end

data/app/jobs/decidim/notification_generator_for_recipient_job.rb CHANGED Viewed

@@ -6,9 +6,11 @@ module Decidim
     def perform(event, event_class_name, resource, recipient, user_role, extra) # rubocop:disable Metrics/ParameterLists
       event_class = event_class_name.constantize
-      NotificationGeneratorForRecipient
-        .new(event, event_class, resource, recipient, user_role, extra)
-        .generate
+      notification = NotificationGeneratorForRecipient
+                     .new(event, event_class, resource, recipient, user_role, extra)
+                     .generate
+      SendPushNotification.new.perform(notification) if notification
     end
   end
 end

data/app/jobs/decidim/open_data_job.rb CHANGED Viewed

@@ -11,8 +11,6 @@ module Decidim
       raise "Couldn't generate Open Data export" unless exporter.export.positive?
       organization.open_data_file.attach(io: File.open(path, "rb"), filename: organization.open_data_file_path)
-      # Deletes the temporary file file
-      File.delete(path)
     end
   end
 end

data/app/jobs/decidim/reminder_generator_job.rb ADDED Viewed

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+module Decidim
+  class ReminderGeneratorJob < ApplicationJob
+    queue_as :reminders
+    def perform(generator_class_name)
+      generator = generator_class_name.constantize.new
+      generator.generate
+    end
+  end
+end

data/app/jobs/decidim/resend_confirmation_instructions_job.rb ADDED Viewed

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+module Decidim
+  class ResendConfirmationInstructionsJob < ApplicationJob
+    queue_as :default
+    def perform(user)
+      user.send_reconfirmation_instructions
+    end
+  end
+end

data/app/jobs/decidim/user_report_job.rb CHANGED Viewed

@@ -4,8 +4,8 @@ module Decidim
   class UserReportJob < ApplicationJob
     queue_as :user_report
-    def perform(admin, token, reason, user)
-      UserReportMailer.notify(admin, token, reason, user).deliver_now
+    def perform(admin, report)
+      UserReportMailer.notify(admin, report).deliver_now
     end
   end
 end

data/app/mailers/concerns/decidim/multitenant_asset_host.rb CHANGED Viewed

@@ -18,15 +18,23 @@ module Decidim
       def set_asset_host
         return if Rails.application.config.action_mailer.asset_host.present?
-        self.asset_host = ->(_mail) { "#{protocol}://#{@organization.host}" }
+        self.asset_host = ->(_mail) { "#{protocol}://#{@organization.host}#{port_fragment}" }
       end
       private
       def protocol
-        return "https" if Decidim.force_ssl
+        asset_url_options.protocol
+      end
+      def port_fragment
+        return if asset_url_options.default_port?
+        ":#{asset_url_options.port}"
+      end
-        "http"
+      def asset_url_options
+        @asset_url_options ||= UrlOptionResolver.new
       end
     end
   end

data/app/mailers/decidim/application_mailer.rb CHANGED Viewed

@@ -23,7 +23,7 @@ module Decidim
         port: @organization.smtp_settings["port"],
         user_name: @organization.smtp_settings["user_name"],
         password: Decidim::AttributeEncryptor.decrypt(@organization.smtp_settings["encrypted_password"])
-      ) { |_k, o, v| v.presence || o }.reject! { |_k, v| v.blank? }
+      ) { |_k, o, v| v.presence || o }.compact_blank!
     end
   end
 end

data/app/mailers/decidim/block_user_mailer.rb CHANGED Viewed

@@ -5,17 +5,18 @@ module Decidim
   # when their account was blocked
   class BlockUserMailer < ApplicationMailer
     def notify(user, justification)
-      @user = user
-      @organization = user.organization
-      @justification = justification
-      mail(
-        to: user.email,
-        subject: I18n.t(
+      with_user(user) do
+        @user = user
+        @organization = user.organization
+        @justification = justification
+        subject = I18n.t(
           "decidim.block_user_mailer.notify.subject",
           organization_name: @organization.name,
           justification: @justification
         )
-      )
+        mail(to: user.email, subject: subject)
+      end
     end
   end
 end

data/app/mailers/decidim/export_mailer.rb CHANGED Viewed

@@ -27,12 +27,12 @@ module Decidim
     end
     # Public: Sends a notification email with a link to retrieve
-    # the result of a data_portability export in a zipped file.
+    # the result of a download_your_data export in a zipped file.
     #
     # user - The user to be notified.
     #
     # Returns nothing.
-    def data_portability_export(user, filename, password)
+    def download_your_data_export(user, filename, password)
       @user = user
       @organization = user.organization
       @filename = filename

data/app/mailers/decidim/newsletter_mailer.rb CHANGED Viewed

@@ -3,28 +3,22 @@
 module Decidim
   class NewsletterMailer < ApplicationMailer
     helper Decidim::SanitizeHelper
+    helper Decidim::TranslationsHelper
     include Decidim::NewslettersHelper
     layout "decidim/newsletter_base"
-    add_template_helper Decidim::TranslationsHelper
     helper_method :cell
-    def newsletter(user, newsletter, preview: false)
+    def newsletter(user, newsletter)
       return if user.email.blank?
       @organization = user.organization
       @newsletter = newsletter
       @user = user
-      @preview = preview
-      @custom_url_for_mail_root =
-        if @preview
-          "#"
-        elsif Decidim.config.track_newsletter_links
-          custom_url_for_mail_root(@organization, @newsletter.id)
-        end
+      @custom_url_for_mail_root = custom_url_for_mail_root(@organization, @newsletter.id) if Decidim.config.track_newsletter_links
       @encrypted_token = Decidim::NewsletterEncryptor.sent_at_encrypted(@user.id, @newsletter.sent_at)
       with_user(user) do
@@ -46,7 +40,6 @@ module Decidim
         organization: @organization,
         newsletter: @newsletter,
         recipient_user: @user,
-        custom_url_for_mail_root: @custom_url_for_mail_root,
         context: {
           controller: self
         }

data/app/mailers/decidim/newsletters_opt_in_mailer.rb CHANGED Viewed

@@ -2,14 +2,16 @@
 module Decidim
   # A custom mailer for Decidim so we can notify users to verify
-  # his own newsletter notifications settings. GDPR releated
+  # their own newsletter notifications settings. GDPR releated
   class NewslettersOptInMailer < ApplicationMailer
     def notify(user, token)
-      @user = user
-      @organization = user.organization
-      @token = token
+      with_user(user) do
+        @user = user
+        @organization = user.organization
+        @token = token
-      mail(to: user.email, subject: I18n.t("decidim.newsletters_opt_in_mailer.notify.subject", organization_name: @organization.name))
+        mail(to: user.email, subject: I18n.t("decidim.newsletters_opt_in_mailer.notify.subject", organization_name: @organization.name))
+      end
     end
   end
 end

data/app/mailers/decidim/notification_mailer.rb CHANGED Viewed

@@ -5,7 +5,6 @@ module Decidim
   # a events are received.
   class NotificationMailer < Decidim::ApplicationMailer
     helper Decidim::ResourceHelper
-    helper Decidim::SanitizeHelper
     def event_received(event, event_class_name, resource, user, user_role, extra) # rubocop:disable Metrics/ParameterLists
       with_user(user) do

data/app/mailers/decidim/notifications_digest_mailer.rb ADDED Viewed

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+module Decidim
+  # A custom mailer for sending notifications to users when
+  # a events are received.
+  class NotificationsDigestMailer < Decidim::ApplicationMailer
+    helper Decidim::ResourceHelper
+    SIZE_LIMIT = 10
+    def digest_mail(user, notification_ids)
+      with_user(user) do
+        notifications = Decidim::Notification.where(id: notification_ids)
+        @user = user
+        @organization = user.organization
+        @notifications_digest = Decidim::NotificationsDigestPresenter.new(user)
+        @display_see_more_message = notifications.size > SIZE_LIMIT
+        @notifications = notifications[0...SIZE_LIMIT].map { |notification| Decidim::NotificationToMailerPresenter.new(notification) }
+        mail(to: user.email, subject: @notifications_digest.subject)
+      end
+    end
+  end
+end

data/app/mailers/decidim/user_report_mailer.rb CHANGED Viewed

@@ -4,18 +4,17 @@ module Decidim
   # A custom mailer to notify Decidim users
   # that they have been reported
   class UserReportMailer < ApplicationMailer
-    def notify(admin, token, reason, user)
-      @user = user
-      @organization = user.organization
-      @token = token
-      @reason = reason
+    def notify(admin, report)
+      @report = report
       @admin = admin
-      mail(to: admin.email, subject: I18n.t(
-        "decidim.user_report_mailer.notify.subject",
-        organization_name: @organization.name,
-        reason: @reason,
-        token: @token
-      ))
+      @organization = report.moderation.user.organization
+      with_user(admin) do
+        mail(to: admin.email, subject: I18n.t(
+          "decidim.user_report_mailer.notify.subject",
+          organization_name: report.moderation.user.organization.name,
+          reason: @report.reason
+        ))
+      end
     end
   end
 end