decidim-core 0.26.2 → 0.27.0.rc2

data/lib/decidim/authorable.rb

@@ -12,21 +12,36 @@ module Decidim
       belongs_to :author, polymorphic: true, foreign_key: "decidim_author_id", foreign_type: "decidim_author_type"
       belongs_to :user_group, foreign_key: "decidim_user_group_id", class_name: "Decidim::UserGroup", optional: true
 
-      scope :official_origin, lambda {
+      scope :with_official_origin, lambda {
         where(decidim_author_type: "Decidim::Organization")
       }
 
-      scope :user_group_origin, lambda {
+      scope :with_user_group_origin, lambda {
         where(decidim_author_type: "Decidim::UserBaseEntity")
           .where.not(decidim_user_group_id: nil)
       }
 
-      scope :citizens_origin, lambda {
+      scope :with_participants_origin, lambda {
         where(decidim_author_type: "Decidim::UserBaseEntity")
           .where(decidim_user_group_id: nil)
       }
 
-      validates :author, presence: true
+      scope :with_any_origin, lambda { |*origin_keys|
+        search_values = origin_keys.compact.compact_blank
+
+        conditions = [:official, :participants, :user_group].map do |key|
+          search_values.member?(key.to_s) ? try("with_#{key}_origin") : nil
+        end.compact
+        return self unless conditions.any?
+
+        scoped_query = where(id: conditions.shift)
+        conditions.each do |condition|
+          scoped_query = scoped_query.or(where(id: condition))
+        end
+
+        scoped_query
+      }
+
       validate :verified_user_group, :user_group_membership
       validate :author_belongs_to_organization
 
@@ -35,7 +50,7 @@ module Decidim
       #
       # user - the user to check for authorship
       def authored_by?(other_author)
-        other_author == author || other_author.respond_to?(:user_groups) && other_author.user_groups.include?(user_group)
+        other_author == author || (other_author.respond_to?(:user_groups) && other_author.user_groups.include?(user_group))
       end
 
       # Returns the normalized author, whether it's a user group or a user. Ideally this should be
@@ -70,7 +85,7 @@ module Decidim
       def author_belongs_to_organization
         return if !author || !organization
 
-        errors.add(:author, :invalid) unless author == organization || author.respond_to?(:organization) && author.organization == organization
+        errors.add(:author, :invalid) unless author == organization || (author.respond_to?(:organization) && author.organization == organization)
       end
     end
   end

data/lib/decidim/authorization_form_builder.rb

@@ -39,8 +39,8 @@ module Decidim
       return hidden_field(name) if name.to_s == "handler_name"
       return scopes_selector if name.to_s == "scope_id"
 
-      case type.name
-      when "Date", "Time"
+      case type
+      when :date, :datetime, :time, :"decidim/attributes/localized_date"
         date_field name
       else
         text_field name
@@ -54,24 +54,22 @@ module Decidim
     end
 
     def find_input_type(name)
-      found_attribute = object.class.attribute_set.detect do |attribute|
-        attribute.name.to_s == name
-      end
+      value_type = object.class.attribute_types[name]
 
-      raise "Could not find attribute #{name} in #{object.class.name}" unless found_attribute
+      raise "Could not find attribute #{name} in #{object.class.name}" unless value_type
 
-      found_attribute.type.primitive
+      value_type.type
     end
 
     def public_attributes
-      form_attributes.inject({}) do |all, attribute|
-        all.update(attribute.name => attribute.type.primitive)
+      form_attributes.inject({}) do |all, (name, value_type)|
+        all.update(name => value_type.type)
       end
     end
 
     def form_attributes
-      object.class.attribute_set.select do |attribute|
-        object.form_attributes.include?(attribute.name)
+      object.class.attribute_types.select do |key, _|
+        object.form_attributes.include?(key) || object.form_attributes.include?(key.to_sym)
       end
     end
   end

data/lib/decidim/carrier_wave_migrator_service.rb

@@ -85,16 +85,16 @@ module Decidim
             as_checksum = destination.blob.checksum
 
             logger.info "#{cw_checksum == as_checksum ? "[OK] Checksum identical:" : "[KO] Checksum different:"}" \
-              " Migrated Decidim::ContentBlock##{block.id} attachment #{image_config[:name]}" \
-              " from CW attribute #{image_config[:name]} to AS" \
-              " in Decidim::ContentBlockAttachment##{destination.record.id} file attribute"
+                        " Migrated Decidim::ContentBlock##{block.id} attachment #{image_config[:name]}" \
+                        " from CW attribute #{image_config[:name]} to AS" \
+                        " in Decidim::ContentBlockAttachment##{destination.record.id} file attribute"
           else
             logger.info "[SKIP] Pending migration of Decidim::ContentBlock##{block.id} attachment #{image_config[:name]}" \
-              " from CW attribute #{image_config[:name]} to AS" \
+                        " from CW attribute #{image_config[:name]} to AS" \
           end
         rescue StandardError
           logger.info "[ERROR] Exception checking Decidim::ContentBlock##{block.id} attachment #{image_config[:name]}" \
-            " from CW attribute #{image_config[:name]} to AS file attribute in a Decidim::ContentBlockAttachment instance #{$ERROR_INFO}"
+                      " from CW attribute #{image_config[:name]} to AS file attribute in a Decidim::ContentBlockAttachment instance #{$ERROR_INFO}"
         end
       end
     end
@@ -108,8 +108,8 @@ module Decidim
 
           if destination.attached?
             logger.info "[SKIP] Migrated Decidim::ContentBlock##{block.id} attachment #{image_config[:name]}" \
-              " from CW attribute #{image_config[:name]} to AS" \
-              " in Decidim::ContentBlockAttachment##{destination.record.id} file attribute"
+                        " from CW attribute #{image_config[:name]} to AS" \
+                        " in Decidim::ContentBlockAttachment##{destination.record.id} file attribute"
             next
           end
 
@@ -132,9 +132,9 @@ module Decidim
           as_checksum = destination.blob.checksum
 
           logger.info "[OK] Migrated - #{cw_checksum == as_checksum ? "[OK] Checksum identical:" : "[KO] Checksum different:"}" \
-            " Decidim::ContentBlock##{block.id} attachment #{image_config[:name]}" \
-            " from CW attribute #{image_config[:name]} to AS" \
-            " in Decidim::ContentBlockAttachment##{destination.record.id} file attribute" \
+                      " Decidim::ContentBlock##{block.id} attachment #{image_config[:name]}" \
+                      " from CW attribute #{image_config[:name]} to AS" \
+                      " in Decidim::ContentBlockAttachment##{destination.record.id} file attribute" \
 
           routes_mappings << { instance: "Decidim::ContentBlock##{block.id}",
                                attachment_origin_attribute: image_config[:name],
@@ -142,7 +142,7 @@ module Decidim
                                destination_path: Rails.application.routes.url_helpers.rails_blob_url(destination.blob, only_path: true) }
         rescue StandardError
           logger.info "[ERROR] Exception migrating Decidim::ContentBlock##{block.id} attachment #{image_config[:name]}" \
-            " from CW attribute #{image_config[:name]} to AS file attribute in a Decidim::ContentBlockAttachment instance #{$ERROR_INFO}"
+                      " from CW attribute #{image_config[:name]} to AS file attribute in a Decidim::ContentBlockAttachment instance #{$ERROR_INFO}"
         end
       end
     end
@@ -177,7 +177,7 @@ module Decidim
         as_checksum = copy.send(as_attribute).blob.checksum
 
         logger.info "[OK] Migrated - #{cw_checksum == as_checksum ? "[OK] Checksum identical:" : "[KO] Checksum different:"}" \
-          " #{klass}##{item.id} from CW attribute #{cw_attribute} to AS #{as_attribute} attribute"
+                    " #{klass}##{item.id} from CW attribute #{cw_attribute} to AS #{as_attribute} attribute"
 
         routes_mappings << {
           instance: "#{klass}##{item.id}",
@@ -208,8 +208,8 @@ module Decidim
           as_checksum = copy.send(as_attribute).blob.checksum
 
           logger.info "#{cw_checksum == as_checksum ? "[OK] Checksum identical:" : "[KO] Checksum different:"}" \
-            " Migrated #{klass}##{item.id} from CW attribute #{cw_attribute}" \
-            " to AS #{as_attribute} attribute"
+                      " Migrated #{klass}##{item.id} from CW attribute #{cw_attribute}" \
+                      " to AS #{as_attribute} attribute"
         else
           logger.info "[SKIP] Pending migration of #{klass}##{item.id} from CW attribute #{cw_attribute} to AS #{as_attribute} attribute"
         end
@@ -286,7 +286,7 @@ module Decidim
 
     def self.cw_file(attachment)
       if attachment.file.is_a?(CarrierWave::Storage::Fog::File)
-        URI.open(URI.parse(attachment.url))
+        URI.parse(attachment.url).open
       else
         File.open(attachment.file.file)
       end

data/lib/decidim/coauthorable.rb

@@ -23,29 +23,47 @@ module Decidim
       scope :from_author, ->(author) { from_all_author_identities(author).where("decidim_coauthorships.decidim_user_group_id": nil) }
       # retrieves models from the given UserGroup.
       scope :from_user_group, ->(user_group) { joins(:coauthorships).where("decidim_coauthorships.decidim_user_group_id": user_group.id) }
-      scope :official_origin, lambda {
+      scope :with_official_origin, lambda {
         where.not(coauthorships_count: 0)
              .joins(:coauthorships)
              .where(decidim_coauthorships: { decidim_author_type: "Decidim::Organization" })
       }
-      scope :citizens_origin, lambda {
+      scope :with_participants_origin, lambda {
         where.not(coauthorships_count: 0)
              .joins(:coauthorships)
              .where.not(decidim_coauthorships: { decidim_author_type: "Decidim::Organization" })
              .where(decidim_coauthorships: { decidim_user_group_id: nil })
       }
-      scope :user_group_origin, lambda {
+      scope :with_user_group_origin, lambda {
         where.not(coauthorships_count: 0)
              .joins(:coauthorships)
              .where(decidim_coauthorships: { decidim_author_type: "Decidim::UserBaseEntity" })
              .where.not(decidim_coauthorships: { decidim_user_group_id: nil })
       }
-      scope :meeting_origin, lambda {
+      scope :with_meeting_origin, lambda {
         where.not(coauthorships_count: 0)
              .joins(:coauthorships)
              .where(decidim_coauthorships: { decidim_author_type: "Decidim::Meetings::Meeting" })
       }
 
+      scope :with_any_origin, lambda { |*origin_keys|
+        search_values = origin_keys.compact.compact_blank
+
+        conditions = [:official, :participants, :user_group, :meeting].map do |key|
+          search_values.member?(key.to_s) ? try("with_#{key}_origin") : nil
+        end.compact
+        return self unless conditions.any?
+
+        scoped_query = where(id: conditions.shift)
+        conditions.each do |condition|
+          scoped_query = scoped_query.or(where(id: condition))
+        end
+
+        scoped_query
+      }
+
+      scope :coauthored_by, ->(author) { where.not(coauthorships_count: 0).from_all_author_identities(author) }
+
       validates :coauthorships, presence: true
 
       # Overwrite default reload method to unset the instance variables so reloading works as expected.

data/lib/decidim/command.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2016 Andy Pike - The MIT license
+#
+# This file has been copied from https://github.com/andypike/rectify/blob/master/lib/rectify/command.rb
+# We have done this so we can decouple Decidim from any Virtus dependency, which is a dead project
+# Please follow Decidim discussion to understand more https://github.com/decidim/decidim/discussions/7234
+module Decidim
+  class Command
+    include ::Wisper::Publisher
+
+    def self.call(*args, **kwargs, &block)
+      event_recorder = Decidim::EventRecorder.new
+
+      command = new(*args, **kwargs)
+      command.subscribe(event_recorder)
+      command.evaluate(&block) if block_given?
+      command.call
+
+      event_recorder.events
+    end
+
+    def evaluate(&block)
+      @caller = eval("self", block.binding, __FILE__, __LINE__)
+      instance_eval(&block)
+    end
+
+    def transaction(&block)
+      ActiveRecord::Base.transaction(&block) if block_given?
+    end
+
+    def method_missing(method_name, ...)
+      if @caller.respond_to?(method_name, true)
+        @caller.send(method_name, ...)
+      else
+        super
+      end
+    end
+
+    def respond_to_missing?(method_name, include_private = false)
+      @caller.respond_to?(method_name, include_private)
+    end
+  end
+end

data/lib/decidim/common_passwords.rb

@@ -30,7 +30,7 @@ module Decidim
       @common_password_list ||= begin
         list = []
         URLS.each do |url|
-          URI.open(url) do |data|
+          URI.parse(url).open do |data|
             data.read.split.each do |line|
               list << line if line.length >= min_length
             end

data/lib/decidim/component_manifest.rb

@@ -12,18 +12,18 @@ module Decidim
   # `Decidim.register_component`.
   class ComponentManifest
     include ActiveModel::Model
-    include Virtus.model
+    include Decidim::AttributeObject::Model
 
-    attribute :admin_engine, Rails::Engine
-    attribute :engine, Rails::Engine
+    attribute :admin_engine, Rails::Engine, **{}
+    attribute :engine, Rails::Engine, **{}
 
     attribute :name, Symbol
-    attribute :hooks, Hash[Symbol => Array[Proc]], default: {}
+    attribute(:hooks, { Symbol => Array[Proc] }, default: {})
 
     attribute :query_type, String, default: "Decidim::Core::ComponentType"
 
     # An array with the name of the classes that will be exported with
-    # the data portability feature for this component. For example, `Decidim::<MyModule>::<MyClass>``
+    # the download your data feature for this component. For example, `Decidim::<MyModule>::<MyClass>``
     attribute :data_portable_entities, Array, default: []
 
     # An array with the name of the classes to know the participants

data/lib/decidim/component_validator.rb

@@ -13,10 +13,10 @@ class ComponentValidator < ActiveModel::EachValidator
   # over all the validators.
   def validate_each(record, attribute, component)
     unless component
-      record.errors[attribute] << :blank
+      record.errors.add(attribute, :blank)
       return
     end
 
-    record.errors[attribute] << :invalid if component.manifest_name.to_s != options[:manifest].to_s
+    record.errors.add(attribute, :invalid) if component.manifest_name.to_s != options[:manifest].to_s
   end
 end

data/lib/decidim/content_block_manifest.rb

@@ -20,7 +20,7 @@ module Decidim
   # be unique per scope.
   class ContentBlockManifest
     include ActiveModel::Model
-    include Virtus.model
+    include Decidim::AttributeObject::Model
 
     attribute :name, Symbol
     attribute :public_name_key, String

data/lib/decidim/content_parsers/hashtag_parser.rb

@@ -18,14 +18,14 @@ module Decidim
 
       # Matches a hashtag if it starts with a letter or number
       # and only contains letters, numbers or underscores.
-      HASHTAG_REGEX = /\s\K\B#([[:alnum:]](?:[[:alnum:]]|_)*)\b/i.freeze
+      HASHTAG_REGEX = /(?:\A|\s\K)\B#([[:alnum:]](?:[[:alnum:]]|_)*)\b/i
 
       # Replaces hashtags name with new or existing hashtags models global ids.
       #
       # @return [String] the content with the hashtags replaced by global ids
       def rewrite
         content.gsub(HASHTAG_REGEX) do |match|
-          "#{hashtag(match[1..-1]).to_global_id}/#{(extra_hashtags? ? "_" : "")}#{match[1..-1]}"
+          "#{hashtag(match[1..-1]).to_global_id}/#{extra_hashtags? ? "_" : ""}#{match[1..-1]}"
         end
       end
 

data/lib/decidim/content_parsers/resource_parser.rb

@@ -11,7 +11,7 @@ module Decidim
       URL_REGEX_CONTENT = '[\w.-]+[\w\-\._~:\/?#\[\]@!\$&\'\(\)\*\+,;=.]+'
       URL_REGEX_END_CHAR = '[\d]'
       # Matches a mentioned resource ID (~(d)+ expression)
-      ID_REGEX = /~(\d+)/.freeze
+      ID_REGEX = /~(\d+)/
 
       # Replaces found mentions matching an existing
       # Resource with a global id for that Resource. Other mentions found that doesn't

data/lib/decidim/content_parsers/user_group_parser.rb

@@ -16,7 +16,7 @@ module Decidim
       Metadata = Struct.new(:groups)
 
       # Matches a nickname if contains letters, numbers or underscores.
-      MENTION_REGEX = /\B@(\w*)\b/.freeze
+      MENTION_REGEX = /\B@(\w*)\b/
 
       # Replaces found mentions matching a nickname of an existing
       # group in the current organization with a global id. Other

data/lib/decidim/content_parsers/user_parser.rb

@@ -16,7 +16,7 @@ module Decidim
       Metadata = Struct.new(:users)
 
       # Matches a nickname if contains letters, numbers or underscores.
-      MENTION_REGEX = /\B@(\w*)\b/.freeze
+      MENTION_REGEX = /\B@(\w*)\b/
 
       # Replaces found mentions matching a nickname of an existing
       # user in the current organization with a global id. Other
@@ -26,7 +26,7 @@ module Decidim
       # @return [String] the content with the valid mentions replaced by a global id
       def rewrite
         content.gsub(MENTION_REGEX) do |match|
-          users[match[1..-1]]&.to_global_id&.to_s || match
+          users[match[1..-1].downcase]&.to_global_id&.to_s || match
         end
       end
 
@@ -43,11 +43,11 @@ module Decidim
       end
 
       def existing_users
-        @existing_users ||= Decidim::User.where(organization: current_organization, nickname: content_nicknames)
+        @existing_users ||= Decidim::User.where("decidim_organization_id = ? AND LOWER(nickname) IN (?)", current_organization.id, content_nicknames)
       end
 
       def content_nicknames
-        @content_nicknames ||= content.scan(MENTION_REGEX).flatten.uniq
+        @content_nicknames ||= content.scan(MENTION_REGEX).flatten.uniq.map!(&:downcase)
       end
 
       def current_organization

data/lib/decidim/content_renderers/hashtag_renderer.rb

@@ -10,7 +10,7 @@ module Decidim
     # @see BaseRenderer Examples of how to use a content renderer
     class HashtagRenderer < BaseRenderer
       # Matches a global id representing a Decidim::Hashtag
-      GLOBAL_ID_REGEX = %r{gid://[\w-]*/Decidim::Hashtag/(\d+)/?(_?)([[:alnum:]](?:[[:alnum:]]|_)*)?\b}.freeze
+      GLOBAL_ID_REGEX = %r{gid://[\w-]*/Decidim::Hashtag/(\d+)/?(_?)([[:alnum:]](?:[[:alnum:]]|_)*)?\b}
 
       # Replaces found Global IDs matching an existing hashtag with
       # a link to their detail page. The Global IDs representing an

data/lib/decidim/content_renderers/link_renderer.rb

@@ -45,12 +45,12 @@ module Decidim
 
       private
 
-      AUTO_LINK_RE = %r{(?: ((?:ftp|http|https):)// | www\. )[^\s<\u00A0"]+}ix.freeze
+      AUTO_LINK_RE = %r{(?: ((?:ftp|http|https):)// | www\. )[^\s<\u00A0"]+}ix
 
       # # regexps for determining context, used high-volume
       AUTO_LINK_CRE = [/<[^>]+$/, /^[^>]*>/, /<a\b.*?>/i, %r{</a>}i].freeze
 
-      PUNCTUATION_RE = %r{[^\p{Word}/=&]$}.freeze
+      PUNCTUATION_RE = %r{[^\p{Word}/=&]$}
 
       BRACKETS = { "]" => "[", ")" => "(", "}" => "{" }.freeze
 

data/lib/decidim/content_renderers/user_group_renderer.rb

@@ -10,7 +10,7 @@ module Decidim
     # @see BaseRenderer Examples of how to use a content renderer
     class UserGroupRenderer < BaseRenderer
       # Matches a global id representing a Decidim::UserGroup
-      GLOBAL_ID_REGEX = %r{gid://[\w-]+/Decidim::UserGroup/\d+}.freeze
+      GLOBAL_ID_REGEX = %r{gid://[\w-]+/Decidim::UserGroup/\d+}
 
       # Replaces found Global IDs matching an existing user with
       # a link to their profile. The Global IDs representing an

data/lib/decidim/content_renderers/user_renderer.rb

@@ -10,7 +10,7 @@ module Decidim
     # @see BaseRenderer Examples of how to use a content renderer
     class UserRenderer < BaseRenderer
       # Matches a global id representing a Decidim::User
-      GLOBAL_ID_REGEX = %r{gid://[\w-]+/Decidim::User/\d+}.freeze
+      GLOBAL_ID_REGEX = %r{gid://[\w-]+/Decidim::User/\d+}
 
       # Replaces found Global IDs matching an existing user with
       # a link to their profile. The Global IDs representing an

data/lib/decidim/controller_helpers.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2016 Andy Pike - The MIT license
+#
+# This file has been copied from https://github.com/andypike/rectify/blob/master/lib/rectify/controller_helpers.rb
+# We have done this so we can decouple Decidim from any Virtus dependency, which is a dead project
+# Please follow Decidim discussion to understand more https://github.com/decidim/decidim/discussions/7234
+module Decidim
+  module ControllerHelpers
+    def self.included(base_class)
+      base_class.helper_method(:presenter)
+    end
+
+    def present(presenter, options = {})
+      presenter_type = options.fetch(:for, :template)
+
+      presenter.attach_controller(self)
+      rectify_presenters[presenter_type] = presenter
+    end
+
+    def presenter(presenter_type = :template)
+      rectify_presenters[presenter_type]
+    end
+
+    def expose(presentation_data)
+      presentation_data.each do |attribute, value|
+        if presenter.respond_to?("#{attribute}=")
+          presenter.public_send("#{attribute}=", value)
+        else
+          instance_variable_set("@#{attribute}", value)
+        end
+      end
+    end
+
+    private
+
+    def rectify_presenters
+      @rectify_presenters ||= {}
+    end
+  end
+end

data/lib/decidim/core/engine.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "rails"
+require "decidim/rails"
 require "active_support/all"
 require "action_view/railtie"
 
@@ -13,7 +13,6 @@ require "devise-i18n"
 require "devise_invitable"
 require "foundation_rails_helper"
 require "active_link_to"
-require "rectify"
 require "carrierwave"
 require "rails-i18n"
 require "date_validator"
@@ -39,7 +38,7 @@ require "mime-types"
 require "diffy"
 require "social-share-button"
 require "ransack"
-require "searchlight"
+require "wisper"
 require "webpacker"
 
 # Needed for the assets:precompile task, for configuring webpacker instance
@@ -49,9 +48,6 @@ require "decidim/api"
 require "decidim/middleware/strip_x_forwarded_host"
 require "decidim/middleware/current_organization"
 
-# Backport cookie handling extensions for Rails 6.0
-require "decidim/middleware/rails_cookies"
-
 module Decidim
   module Core
     # Decidim's core Rails Engine.
@@ -67,6 +63,10 @@ module Decidim
         end
       end
 
+      initializer "decidim.action_mailer" do |app|
+        app.config.action_mailer.deliver_later_queue_name = :mailers
+      end
+
       initializer "decidim.middleware" do |app|
         app.config.middleware.insert_before Warden::Manager, Decidim::Middleware::CurrentOrganization
         app.config.middleware.insert_before Warden::Manager, Decidim::Middleware::StripXForwardedHost
@@ -92,6 +92,17 @@ module Decidim
         Decidim::Api.add_orphan_type Decidim::Core::UserGroupType
       end
 
+      initializer "decidim.ransack" do
+        Ransack.configure do |config|
+          # Avoid turning parameter values such as user_id[]=1&user_id[]=2 into
+          # { user_id: [true, "2"] }. This option allows us to handle the type
+          # convertions manually instead for each case.
+          # See: https://github.com/activerecord-hackery/ransack/issues/593
+          # See: https://github.com/activerecord-hackery/ransack/pull/742
+          config.sanitize_custom_scope_booleans = false
+        end
+      end
+
       initializer "decidim.i18n_exceptions" do
         ActionView::Base.raise_on_missing_translations = true unless Rails.env.production?
       end
@@ -122,16 +133,15 @@ module Decidim
         next if Decidim.maps.present?
         next if Decidim.geocoder.blank?
 
-        legacy_api_key ||= begin
-          if Decidim.geocoder[:here_api_key].present?
-            Decidim.geocoder.fetch(:here_api_key)
-          elsif Decidim.geocoder[:here_app_id].present?
-            [
-              Decidim.geocoder.fetch(:here_app_id),
-              Decidim.geocoder.fetch(:here_app_code)
-            ]
-          end
-        end
+        legacy_api_key ||= if Decidim.geocoder[:here_api_key].present?
+                             Decidim.geocoder.fetch(:here_api_key)
+                           elsif Decidim.geocoder[:here_app_id].present?
+                             [
+                               Decidim.geocoder.fetch(:here_app_id),
+                               Decidim.geocoder.fetch(:here_app_code)
+                             ]
+                           end
+
         next unless legacy_api_key
 
         ActiveSupport::Deprecation.warn(
@@ -167,6 +177,7 @@ module Decidim
 
         Decidim.stats.register :processes_count, priority: StatsRegistry::HIGH_PRIORITY do |organization, start_at, end_at|
           processes = ParticipatoryProcesses::OrganizationPrioritizedParticipatoryProcesses.new(organization)
+
           processes = processes.where("created_at >= ?", start_at) if start_at.present?
           processes = processes.where("created_at <= ?", end_at) if end_at.present?
           processes.count
@@ -221,9 +232,9 @@ module Decidim
                         decidim.user_interests_path,
                         position: 1.4
 
-          menu.add_item :data_portability,
+          menu.add_item :download_your_data,
                         t("my_data", scope: "layouts.decidim.user_profile"),
-                        decidim.data_portability_path,
+                        decidim.download_your_data_path,
                         position: 1.5
 
           menu.add_item :delete_account,
@@ -254,7 +265,7 @@ module Decidim
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Core::Engine.root}/app/views") # for partials
       end
 
-      initializer "doorkeeper" do
+      initializer "doorkeeper", before: "doorkeeper.params.filter" do
         Doorkeeper.configure do
           orm :active_record