decidim-core 0.26.5 → 0.27.0.rc1

data/config/routes.rb

@@ -3,6 +3,8 @@
 Decidim::Core::Engine.routes.draw do
   mount Decidim::Api::Engine => "/api"
 
+  get "/offline", to: "offline#show"
+
   devise_for :users,
              class_name: "Decidim::User",
              module: :devise,
@@ -11,29 +13,11 @@ Decidim::Core::Engine.routes.draw do
                invitations: "decidim/devise/invitations",
                sessions: "decidim/devise/sessions",
                confirmations: "decidim/devise/confirmations",
+               registrations: "decidim/devise/registrations",
                passwords: "decidim/devise/passwords",
                unlocks: "decidim/devise/unlocks",
                omniauth_callbacks: "decidim/devise/omniauth_registrations"
-             },
-             skip: [:registrations]
-
-  # Manually define the registration routes because otherwise the default "edit"
-  # route would be exposed through Devise while we already have the edit and
-  # destroy routes available through the account pages.
-  resource(
-    :registration,
-    only: [:new, :create],
-    as: :user_registration,
-    path: "/users",
-    path_names: { new: "sign_up" },
-    controller: "devise/registrations"
-  ) do
-    # The "cancel" route forces the session data which is usually expired after
-    # sign in to be expired now. This is useful if the user wants to cancel
-    # OAuth signing in/up in the middle of the process, removing all OAuth
-    # session data. @see [Devise::RegistrationsController#cancel]
-    get :cancel
-  end
+             }
 
   devise_for :user_groups,
              class_name: "Decidim::UserGroup",
@@ -47,6 +31,8 @@ Decidim::Core::Engine.routes.draw do
     post "omniauth_registrations" => "devise/omniauth_registrations#create"
   end
 
+  resource :manifest, only: [:show]
+
   resource :locale, only: [:create]
 
   Decidim.participatory_space_manifests.each do |manifest|
@@ -61,9 +47,16 @@ Decidim::Core::Engine.routes.draw do
   end
 
   authenticate(:user) do
+    devise_scope :user do
+      get "change_password" => "devise/passwords"
+      put "apply_password" => "devise/passwords"
+    end
+
     resource :account, only: [:show, :update, :destroy], controller: "account" do
       member do
         get :delete
+        post :resend_confirmation_instructions
+        post :cancel_email_change
       end
     end
     resources :conversations, only: [:new, :create, :index, :show, :update], controller: "messaging/conversations"
@@ -78,13 +71,14 @@ Decidim::Core::Engine.routes.draw do
 
     get "/newsletters_opt_in/:token", to: "newsletters_opt_in#update", as: :newsletters_opt_in
 
-    resource :data_portability, only: [:show], controller: "data_portability" do
+    resource :download_your_data, only: [:show], controller: "download_your_data" do
       member do
         post :export
         get :download_file
       end
     end
 
+    resources :notifications_subscriptions, param: :auth, only: [:create, :destroy]
     resource :user_interests, only: [:show, :update]
 
     get "/authorization_modals/:authorization_action/f/:component_id(/:resource_name/:resource_id)", to: "authorization_modals#show", as: :authorization_modal
@@ -141,7 +135,6 @@ Decidim::Core::Engine.routes.draw do
   get "/scopes/picker", to: "scopes#picker", as: :scopes_picker
 
   get "/static_map", to: "static_map#show", as: :static_map
-  get "/cookies/accept", to: "cookie_policy#accept", as: :accept_cookies
   put "/pages/terms-and-conditions/accept", to: "tos#accept_tos", as: :accept_tos
 
   match "/404", to: "errors#not_found", via: :all
@@ -184,8 +177,12 @@ Decidim::Core::Engine.routes.draw do
     get :unsubscribe, on: :collection
   end
 
+  resources :upload_validations, only: [:create]
+
   resources :last_activities, only: [:index]
 
+  resources :short_links, only: [:index, :show], path: "s"
+
   use_doorkeeper do
     skip_controllers :applications, :authorized_applications
   end

data/db/migrate/20180508111710_add_accepted_tos_version_field_to_users.rb

@@ -5,6 +5,7 @@ class AddAcceptedTosVersionFieldToUsers < ActiveRecord::Migration[5.1]
     self.table_name = :decidim_organizations
     has_many :users, foreign_key: "decidim_organization_id", class_name: "Decidim::User", dependent: :destroy
   end
+
   class User < ApplicationRecord
     self.table_name = :decidim_users
     belongs_to :organization, foreign_key: "decidim_organization_id", class_name: "Decidim::Organization"

data/db/migrate/20181030090144_destroy_deleted_users_follows.rb

@@ -4,6 +4,7 @@ class DestroyDeletedUsersFollows < ActiveRecord::Migration[5.2]
   class Follow < ApplicationRecord
     self.table_name = "decidim_follows"
   end
+
   class User < ApplicationRecord
     self.table_name = "decidim_users"
   end

data/db/migrate/20190412131728_fix_user_names.rb

@@ -9,10 +9,10 @@ class FixUserNames < ActiveRecord::Migration[5.2]
 
     weird_characters.each do |character|
       Decidim::UserBaseEntity.where(deleted_at: nil).where("name like '%#{character}%' escape '\' OR nickname like '%#{character}%' escape '\'").find_each do |entity|
-        Rails.logger.debug "detected character: #{character}"
-        Rails.logger.debug "UserBaseEntity ID: #{entity.id}"
-        Rails.logger.debug "#{entity.name} => #{entity.name.delete(characters_to_remove).strip}"
-        Rails.logger.debug "#{entity.nickname} => #{entity.nickname.delete(characters_to_remove).strip}"
+        Rails.logger.debug { "detected character: #{character}" }
+        Rails.logger.debug { "UserBaseEntity ID: #{entity.id}" }
+        Rails.logger.debug { "#{entity.name} => #{entity.name.delete(characters_to_remove).strip}" }
+        Rails.logger.debug { "#{entity.nickname} => #{entity.nickname.delete(characters_to_remove).strip}" }
 
         entity.name = entity.name.delete(characters_to_remove).strip
         sanitized_nickname = entity.nickname.delete(characters_to_remove).strip

data/db/migrate/20210831181634_add_service_name_to_active_storage_blobs.active_storage.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+# This migration comes from active_storage (originally 20190112182829)
+class AddServiceNameToActiveStorageBlobs < ActiveRecord::Migration[6.0]
+  def up
+    return if column_exists?(:active_storage_blobs, :service_name)
+
+    add_column :active_storage_blobs, :service_name, :string
+    # rubocop:disable Lint/AssignmentInCondition
+    # rubocop:disable Rails/SkipsModelValidations
+    if configured_service = ActiveStorage::Blob.service.name
+      ActiveStorage::Blob.unscoped.update_all(service_name: configured_service)
+    end
+    # rubocop:enable Lint/AssignmentInCondition
+    # rubocop:enable Rails/SkipsModelValidations
+    change_column :active_storage_blobs, :service_name, :string, null: false
+  end
+
+  def down
+    remove_column :active_storage_blobs, :service_name
+  end
+end

data/db/migrate/20210831181635_create_active_storage_variant_records.active_storage.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# This migration comes from active_storage (originally 20191206030411)
+class CreateActiveStorageVariantRecords < ActiveRecord::Migration[6.0]
+  def change
+    create_table :active_storage_variant_records do |t|
+      t.belongs_to :blob, null: false, index: false
+      t.string :variation_digest, null: false
+
+      t.index [:blob_id, :variation_digest], name: "index_active_storage_variant_records_uniqueness", unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+  end
+end

data/db/migrate/20211208155453_create_decidim_reminders.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class CreateDecidimReminders < ActiveRecord::Migration[6.0]
+  def change
+    create_table :decidim_reminders do |t|
+      t.belongs_to :decidim_user, index: true, foreign_key: true, null: false
+      t.belongs_to :decidim_component, index: true, foreign_key: true
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20211209121025_create_decidim_reminder_records.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class CreateDecidimReminderRecords < ActiveRecord::Migration[6.0]
+  def change
+    create_table :decidim_reminder_records do |t|
+      t.string :state, :string, index: true, default: "active"
+      t.belongs_to :decidim_reminder, index: true, foreign_key: true
+      t.belongs_to :remindable, polymorphic: true, null: false, index: { name: "index_decidim_reminder_records_remindable" }
+    end
+  end
+end

data/db/migrate/20211209121040_create_decidim_reminder_deliveries.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class CreateDecidimReminderDeliveries < ActiveRecord::Migration[6.0]
+  def change
+    create_table :decidim_reminder_deliveries do |t|
+      t.belongs_to :decidim_reminder, index: true, foreign_key: true
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20220118121921_change_required_description_categories.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class ChangeRequiredDescriptionCategories < ActiveRecord::Migration[6.0]
+  def change
+    change_column_null :decidim_categories, :description, true
+  end
+end

data/db/migrate/20220127113419_add_notification_settings_to_users.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddNotificationSettingsToUsers < ActiveRecord::Migration[6.0]
+  def change
+    add_column :decidim_users, :notification_settings, :jsonb, default: {}
+  end
+end

data/db/migrate/20220203121137_add_notifications_sending_frequency_to_users.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddNotificationsSendingFrequencyToUsers < ActiveRecord::Migration[6.0]
+  def change
+    add_column :decidim_users, :notifications_sending_frequency, :string, default: "daily", index: true
+  end
+end

data/db/migrate/20220215172439_add_digest_sent_at_to_users.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddDigestSentAtToUsers < ActiveRecord::Migration[6.0]
+  def change
+    add_column :decidim_users, :digest_sent_at, :datetime
+  end
+end

data/db/migrate/20220323195258_add_index_to_decidim_users_notifications_sending_frequency.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddIndexToDecidimUsersNotificationsSendingFrequency < ActiveRecord::Migration[6.0]
+  def change
+    add_index :decidim_users, :notifications_sending_frequency
+  end
+end

data/db/migrate/20220427142214_drop_emails_on_notifications_flag_from_user.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class DropEmailsOnNotificationsFlagFromUser < ActiveRecord::Migration[5.1]
+  class DecidimUser < ApplicationRecord
+    self.table_name = :decidim_users
+  end
+
+  def change
+    # rubocop:disable Rails/SkipsModelValidations
+    DecidimUser.where(email_on_notification: true).update_all(notifications_sending_frequency: "real_time")
+    # rubocop:enable Rails/SkipsModelValidations
+
+    remove_column :decidim_users, :email_on_notification
+  end
+end

data/db/migrate/20220518094535_add_previous_passwords_to_users.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class AddPreviousPasswordsToUsers < ActiveRecord::Migration[6.1]
+  class User < ApplicationRecord
+    self.table_name = :decidim_users
+  end
+
+  def change
+    add_column :decidim_users, :password_updated_at, :datetime
+    add_column :decidim_users, :previous_passwords, :string, array: true, default: []
+
+    reversible do |direction|
+      direction.up do
+        # rubocop:disable Rails/SkipsModelValidations
+        User.update_all("password_updated_at = updated_at")
+        # rubocop:enable Rails/SkipsModelValidations
+      end
+    end
+  end
+end

data/db/migrate/20220524195530_create_decidim_short_links.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class CreateDecidimShortLinks < ActiveRecord::Migration[6.1]
+  def change
+    create_table :decidim_short_links do |t|
+      t.references :decidim_organization, null: false, index: true
+      t.references :target, polymorphic: true, null: false, index: true
+      t.string :identifier, limit: 10, null: false
+      t.string :mounted_engine_name, index: true
+      t.string :route_name, index: true
+      t.jsonb :params
+
+      t.timestamps
+    end
+
+    add_index(
+      :decidim_short_links,
+      [:decidim_organization_id, :identifier],
+      unique: true,
+      name: "idx_decidim_short_links_organization_id_identifier"
+    )
+  end
+end

data/db/seeds.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-if !Rails.env.production? || ENV["SEED"]
+if !Rails.env.production? || ENV.fetch("SEED", nil)
   print "Creating seeds for decidim-core...\n" unless Rails.env.test?
 
   require "decidim/faker/localized"
@@ -17,8 +17,8 @@ if !Rails.env.production? || ENV["SEED"]
     table.tr("_", "/").classify.safe_constantize
   end.compact.each(&:reset_column_information)
 
-  smtp_label = ENV["SMTP_FROM_LABEL"] || Faker::Twitter.unique.screen_name
-  smtp_email = ENV["SMTP_FROM_EMAIL"] || Faker::Internet.email
+  smtp_label = ENV.fetch("SMTP_FROM_LABEL", Faker::Twitter.unique.screen_name)
+  smtp_email = ENV.fetch("SMTP_FROM_EMAIL", Faker::Internet.email)
 
   organization = Decidim::Organization.first || Decidim::Organization.create!(
     name: Faker::Company.name,
@@ -31,12 +31,12 @@ if !Rails.env.production? || ENV["SEED"]
       from: "#{smtp_label} <#{smtp_email}>",
       from_email: smtp_email,
       from_label: smtp_label,
-      user_name: ENV["SMTP_USERNAME"] || Faker::Twitter.unique.screen_name,
-      encrypted_password: Decidim::AttributeEncryptor.encrypt(ENV["SMTP_PASSWORD"] || Faker::Internet.password(min_length: 8)),
-      address: ENV["SMTP_ADDRESS"] || ENV["DECIDIM_HOST"] || "localhost",
-      port: ENV["SMTP_PORT"] || ENV["DECIDIM_SMTP_PORT"] || "25"
+      user_name: ENV.fetch("SMTP_USERNAME", Faker::Twitter.unique.screen_name),
+      encrypted_password: Decidim::AttributeEncryptor.encrypt(ENV.fetch("SMTP_PASSWORD", Faker::Internet.password(min_length: 8))),
+      address: ENV.fetch("SMTP_ADDRESS", nil) || ENV.fetch("DECIDIM_HOST", "localhost"),
+      port: ENV.fetch("SMTP_PORT", nil) || ENV.fetch("DECIDIM_SMTP_PORT", "25")
     },
-    host: ENV["DECIDIM_HOST"] || "localhost",
+    host: ENV.fetch("DECIDIM_HOST", "localhost"),
     external_domain_whitelist: ["decidim.org", "github.com"],
     description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
       Decidim::Faker::Localized.sentence(word_count: 15)
@@ -115,12 +115,9 @@ if !Rails.env.production? || ENV["SEED"]
   end
 
   admin = Decidim::User.find_or_initialize_by(email: "admin@example.org")
-
-  admin.update!(
+  admin_hash = {
     name: Faker::Name.name,
     nickname: Faker::Twitter.unique.screen_name,
-    password: "decidim123456",
-    password_confirmation: "decidim123456",
     organization: organization,
     confirmed_at: Time.current,
     locale: I18n.default_locale,
@@ -130,14 +127,16 @@ if !Rails.env.production? || ENV["SEED"]
     about: Faker::Lorem.paragraph(sentence_count: 2),
     accepted_tos_version: organization.tos_version,
     admin_terms_accepted_at: Time.current
-  )
+  }
+  admin_hash.merge!(password: "decidim123456789", password_confirmation: "decidim123456789") if admin.encrypted_password.blank?
+  admin.update!(admin_hash)
 
   ["user@example.org", "user2@example.org"].each do |email|
     Decidim::User.find_or_initialize_by(email: email).update!(
       name: Faker::Name.name,
       nickname: Faker::Twitter.unique.screen_name,
-      password: "decidim123456",
-      password_confirmation: "decidim123456",
+      password: "decidim123456789",
+      password_confirmation: "decidim123456789",
       confirmed_at: Time.current,
       locale: I18n.default_locale,
       organization: organization,
@@ -155,8 +154,8 @@ if !Rails.env.production? || ENV["SEED"]
   locked_user.update!(
     name: Faker::Name.name,
     nickname: Faker::Twitter.unique.screen_name,
-    password: "decidim123456",
-    password_confirmation: "decidim123456",
+    password: "decidim123456789",
+    password_confirmation: "decidim123456789",
     confirmed_at: Time.current,
     locale: I18n.default_locale,
     organization: organization,
@@ -211,7 +210,7 @@ if !Rails.env.production? || ENV["SEED"]
   Decidim::System::CreateDefaultContentBlocks.call(organization)
 
   hero_content_block = Decidim::ContentBlock.find_by(organization: organization, manifest_name: :hero, scope_name: :homepage)
-  hero_content_block.images_container.background_image = ActiveStorage::Blob.create_after_upload!(
+  hero_content_block.images_container.background_image = ActiveStorage::Blob.create_and_upload!(
     io: File.open(File.join(seeds_root, "homepage_image.jpg")),
     filename: "homepage_image.jpg",
     content_type: "image/jpeg",

data/lib/decidim/acts_as_tree.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ActsAsTree
+    extend ActiveSupport::Concern
+
+    included do
+      @parent_item_foreign_key = :parent_id
+    end
+
+    class_methods do
+      def parent_item_foreign_key(name = nil)
+        return @parent_item_foreign_key unless name
+
+        @parent_item_foreign_key = name
+      end
+
+      def tree_for(item)
+        where(Arel.sql("#{table_name}.id IN (#{tree_sql_for(item)})")).order("#{table_name}.id")
+      end
+
+      def tree_sql_for(item)
+        <<-SQL.squish
+        WITH RECURSIVE search_tree(id, path) AS (
+          SELECT id, ARRAY[id]
+          FROM #{table_name}
+          WHERE id = #{item.id}
+            UNION ALL
+          SELECT #{table_name}.id, path || #{table_name}.id
+            FROM search_tree
+          JOIN #{table_name} ON #{table_name}.#{parent_item_foreign_key} = search_tree.id
+            WHERE NOT #{table_name}.id = ANY(path)
+        )
+        SELECT id FROM search_tree ORDER BY path
+        SQL
+      end
+    end
+
+    def descendants
+      @descendants ||= self_and_descendants.where.not(id: id)
+    end
+
+    def self_and_descendants
+      @self_and_descendants ||= self.class.tree_for(self)
+    end
+  end
+end

data/lib/decidim/api/input_sorts/component_input_sort.rb

@@ -23,7 +23,8 @@ module Decidim
                prepare: lambda { |direction, ctx|
                           lambda { |locale|
                             locale = ctx[:current_organization].default_locale if locale.blank?
-                            [Arel.sql("name->? #{direction.upcase}").to_s, locale]
+                            field = Arel::Nodes::InfixOperation.new("->", Arel.sql("name"), Arel::Nodes.build_quoted(locale))
+                            Arel::Nodes::InfixOperation.new("", field, Arel.sql(direction.upcase))
                           }
                         }
     end

data/lib/decidim/api/interfaces/authorable_interface.rb

@@ -12,11 +12,12 @@ module Decidim
       end
 
       def author
-        if object.respond_to?(:normalized_author)
-          object&.normalized_author
-        elsif object.respond_to?(:creator_identity)
-          object&.creator_identity
-        end
+        author = if object.respond_to?(:normalized_author)
+                   object&.normalized_author
+                 elsif object.respond_to?(:creator_identity)
+                   object&.creator_identity
+                 end
+        author if author.is_a?(Decidim::UserBaseEntity)
       end
     end
   end

data/lib/decidim/api/types/localized_string_type.rb

@@ -8,15 +8,6 @@ module Decidim
 
       field :locale, GraphQL::Types::String, "The standard locale of this translation.", null: false
       field :text, GraphQL::Types::String, "The content of this translation.", null: true
-      field :machine_translated, GraphQL::Types::Boolean, "Whether this string is machine translated or not.", null: false
-
-      def machine_translated
-        if object.respond_to?(:machine_translated)
-          object.machine_translated.present?
-        else
-          false
-        end
-      end
     end
   end
 end

data/lib/decidim/api/types/translated_field_type.rb

@@ -17,34 +17,19 @@ module Decidim
       end
 
       def locales
-        (defined_translations.keys + machine_translations.keys).uniq
+        object.keys
       end
 
       def translation(locale: "")
-        display_translations[locale]
+        translations = object.stringify_keys
+        translations[locale]
       end
 
       def translations(locales: [])
-        translations = display_translations
+        translations = object.stringify_keys
         translations = translations.slice(*locales) unless locales.empty?
 
-        translations.map { |locale, text| OpenStruct.new(locale: locale, text: text, machine_translated: defined_translations[locale].blank?) }
-      end
-
-      private
-
-      def display_translations
-        @display_translations ||= locales.index_with do |locale|
-          defined_translations[locale].presence || machine_translations[locale]
-        end
-      end
-
-      def defined_translations
-        object.stringify_keys.except("machine_translations")
-      end
-
-      def machine_translations
-        object.stringify_keys["machine_translations"]&.stringify_keys || {}
+        translations.map { |locale, text| OpenStruct.new(locale: locale, text: text) }
       end
     end
   end

data/lib/decidim/asset_router.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Asset router provides global access to the asset routes for assets saved
+  # through ActiveStorage. This handles the different cases for routing to the
+  # remote routes when using an assets CDN or to local routes when using the
+  # local disk storage driver.
+  class AssetRouter
+    # Initializes the router.
+    #
+    # @param [ActiveStorage::Attached, ActiveStorage::Blob] The asset to route
+    #   to
+    def initialize(asset)
+      @asset = asset
+    end
+
+    # Generates the correct URL to the asset with the provided options.
+    #
+    # @param options The options for the URL that are the normal route options
+    #   Rails route helpers accept
+    def url(**options)
+      if asset.is_a? ActiveStorage::Attached
+        routes.rails_blob_url(asset.blob, **default_options.merge(options))
+      else
+        routes.rails_representation_url(asset, **default_options.merge(options))
+      end
+    end
+
+    private
+
+    attr_reader :asset
+
+    # Provides the route helpers depending on whether the URL is generated to
+    # the local host or an external CDN (remote).
+    #
+    # @return [Module, Decidim::EngineRouter] The correct route helpers based
+    #   on the configuration
+    def routes
+      @routes ||=
+        if remote?
+          Rails.application.routes.url_helpers
+        else
+          EngineRouter.new("main_app", {})
+        end
+    end
+
+    # Determines whether the assets call should be to a remote CDN or to the
+    # local server based on the storage options.
+    #
+    # @return [Boolean] A boolean indicating whether the assets are served
+    #   through a remote CDN
+    def remote?
+      remote_storage_options.present?
+    end
+
+    # Determines the default options to be passed to the route helper. For the
+    # remote storage, returns the remote storage options and for the local disk
+    # storage returns an empty hash.
+    #
+    # @return [Hash] The default options hash to pass to the route helper
+    def default_options
+      @default_options ||=
+        if remote?
+          remote_storage_options
+        else
+          {}
+        end
+    end
+
+    # The remote storage options when using a remote CDN. An empty hash in case
+    # using the local disk storage.
+    #
+    # @return [Hash] The remote storage options hash
+    def remote_storage_options
+      @remote_storage_options ||= {
+        host: Rails.application.secrets.dig(:storage, :cdn_host)
+      }.compact
+    end
+  end
+end