decidim-core 0.24.1 → 0.25.0.rc2

data/app/mailers/decidim/reported_mailer.rb

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

data/app/models/decidim/attachment.rb

@@ -6,15 +6,17 @@ module Decidim
   class Attachment < ApplicationRecord
     include Decidim::HasUploadValidations
     include Decidim::TranslatableResource
+    before_save :set_content_type_and_size, if: :attached?
 
     translatable_fields :title, :description
     belongs_to :attachment_collection, class_name: "Decidim::AttachmentCollection", optional: true
     belongs_to :attached_to, polymorphic: true
 
-    mount_uploader :file, Decidim::AttachmentUploader
+    has_one_attached :file
+    validates_upload :file, uploader: Decidim::AttachmentUploader
+    validates :content_type, presence: true
 
-    validates_upload :file
-    validates :file, :content_type, presence: true
+    delegate :attached?, to: :file
 
     default_scope { order(arel_table[:weight].asc, arel_table[:id].asc) }
 
@@ -46,8 +48,9 @@ module Decidim
     #
     # Returns Boolean.
     def photo?
-      @photo ||= content_type.start_with? "image"
+      @photo ||= file.attached? && file.image?
     end
+    alias image? photo?
 
     # Whether this attachment is a document or not.
     #
@@ -60,13 +63,12 @@ module Decidim
     #
     # Returns String.
     def file_type
-      file.url&.split(".")&.last&.downcase
+      url&.split(".")&.last&.downcase
     end
 
-    # The URL to download the file.
-    #
-    # Returns String.
-    delegate :url, to: :file
+    def url
+      attached_uploader(:file).path
+    end
 
     # The URL to download the thumbnail of the file. Only works with images.
     #
@@ -74,7 +76,7 @@ module Decidim
     def thumbnail_url
       return unless photo?
 
-      file.thumbnail.url
+      attached_uploader(:file).path(variant: :thumbnail)
     end
 
     # The URL to download the a big version of the file. Only works with images.
@@ -83,7 +85,12 @@ module Decidim
     def big_url
       return unless photo?
 
-      file.big.url
+      attached_uploader(:file).path(variant: :big)
+    end
+
+    def set_content_type_and_size
+      self.content_type = file.content_type
+      self.file_size = file.byte_size
     end
   end
 end

data/app/models/decidim/authorization.rb

@@ -18,8 +18,8 @@ module Decidim
     encrypt_attribute :metadata, type: :hash
     encrypt_attribute :verification_metadata, type: :hash
 
-    validates_upload :verification_attachment
-    mount_uploader :verification_attachment, Decidim::Verifications::AttachmentUploader
+    has_one_attached :verification_attachment
+    validates_upload :verification_attachment, uploader: Decidim::Verifications::AttachmentUploader
 
     belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
     has_one :organization, through: :user, class_name: "Decidim::Organization"
@@ -45,9 +45,7 @@ module Decidim
     end
 
     def grant!
-      remove_verification_attachment!
-
-      update!(granted_at: Time.current, verification_metadata: {})
+      update!(granted_at: Time.current, verification_metadata: {}, verification_attachment: nil)
     end
 
     def granted?

data/app/models/decidim/content_block.rb

@@ -9,13 +9,14 @@ module Decidim
     attr_accessor :in_preview
 
     belongs_to :organization, foreign_key: :decidim_organization_id, class_name: "Decidim::Organization"
+    has_many :attachments, foreign_key: "decidim_content_block_id", class_name: "Decidim::ContentBlockAttachment", inverse_of: :content_block, dependent: :destroy
 
     delegate :public_name_key, :has_settings?, :settings_form_cell, :cell, to: :manifest
 
     before_save :save_images
     after_save :reload_images
 
-    validate :images_container_valid
+    validates_associated :images_container
 
     # Public: finds the published content blocks for the given scope and
     # organization. Returns them ordered by ascending weight (lowest first).
@@ -39,6 +40,7 @@ module Decidim
     end
 
     def reload(*)
+      @manifest_attachments = nil
       @images_container = nil
       super
     end
@@ -57,10 +59,9 @@ module Decidim
     #     content_block.save!
     #
     #     # This is how you can access the image data, just like with any other
-    #     # uploader field. You can use the uploader versions too.
-    #     content_block.images_container.my_image.url
-    #     content_block.images_container.my_image.big.url
-    #     content_block.save!
+    #     # uploader field. You can use the uploader variants too.
+    #     content_block.images_container.attached_uploader(:my_image).path
+    #     content_block.images_container.attached_uploader(:my_image).path(variant: :big)
     #
     #     # This will delete the attached image
     #     content_block.images_container.my_image = nil
@@ -71,75 +72,60 @@ module Decidim
     def images_container
       return @images_container if @images_container
 
-      manifest = self.manifest
+      attachments = manifest_attachments
 
       @images_container = Class.new do
-        extend ::CarrierWave::Mount
         include ActiveModel::Validations
+        include Decidim::HasUploadValidations
 
-        cattr_accessor :manifest, :manifest_scope
+        cattr_accessor :manifest_attachments
         attr_reader :content_block
 
-        # Needed to calculate uploads URLs
-        delegate :id, :organization, to: :content_block
-
-        # Needed to customize the upload URL
         def self.name
           to_s.camelize
         end
 
-        # Needed to customize the upload URL
-        def self.to_s
-          "decidim/#{manifest.name.to_s.underscore}_#{manifest_scope.to_s.underscore}_content_block"
-        end
+        delegate :id, :organization, to: :content_block
 
         def initialize(content_block)
           @content_block = content_block
         end
 
-        def manifest
-          self.class.manifest
-        end
+        attachments.each do |name, attachment|
+          validates_upload name, uploader: attachment.uploader
 
-        manifest.images.each do |image_config|
-          mount_uploader image_config[:name], image_config[:uploader].constantize
-        end
+          define_method(name) do
+            attachment.file
+          end
 
-        # This is used to access the upload file name from the container, given
-        # an image name.
-        def read_uploader(column)
-          content_block.images[column.to_s]
+          define_method("#{name}=") do |file|
+            attachment.file = file
+          end
         end
 
-        # This is used to set the upload file name from the container, given
-        # an image name.
-        def write_uploader(column, value)
-          content_block.images[column.to_s] = value
+        def attached_uploader(name)
+          return if manifest_attachments[name].blank?
+
+          manifest_attachments[name].attached_uploader(:file)
         end
 
-        # When we save the content block, we force the container to save itself
-        # too, so images can be processed, uploaded and stored in the DB.
         def save
-          manifest.images.each do |image_config|
-            send(:"write_#{image_config[:name]}_identifier")
-            send(:"store_#{image_config[:name]}!")
-          end
+          return unless content_block.persisted?
+
+          manifest_attachments.values.map(&:save).all?
         end
       end
 
-      @images_container.manifest = manifest
-      @images_container.manifest_scope = scope_name
+      @images_container.manifest_attachments = manifest_attachments
       @images_container = @images_container.new(self)
     end
 
     private
 
-    def images_container_valid
-      # Note that we cannot call .valid? because it's not an ActiveRecord
-      # object. It's ActiveModel and in that case, CarrierWave will not work
-      # "normally" with the validators. It adds the errors directly after the
-      # uploader was tried to set.
-      errors.add(:images_container, :invalid) if images_container.errors.any?
+    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])
+      end
     end
 
     # Internal: Since we're using the `images_container` hack to hold the

data/app/models/decidim/content_block_attachment.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Attachment can be any type of document or images related to a partcipatory
+  # process.
+  class ContentBlockAttachment < ApplicationRecord
+    include Decidim::HasUploadValidations
+
+    belongs_to :content_block, foreign_key: "decidim_content_block_id", class_name: "Decidim::ContentBlock", inverse_of: :attachments
+
+    has_one_attached :file
+    validates_upload :file
+
+    delegate :attached?, to: :file
+    delegate :organization, :manifest, to: :content_block
+
+    def uploader
+      return if content_block.blank?
+
+      config = manifest.images.find do |image_config|
+        image_config[:name].to_s == name.to_s
+      end
+
+      return if config.blank?
+
+      config[:uploader].constantize
+    end
+
+    def attached_uploader(name)
+      return unless name == :file
+
+      uploader.new(self, :file)
+    end
+  end
+end

data/app/models/decidim/impersonation_log.rb

@@ -25,6 +25,14 @@ module Decidim
       Decidim::AdminLog::ImpersonationLogPresenter
     end
 
+    def ensure_not_expired!
+      expire! if started_at + SESSION_TIME_IN_MINUTES.minutes < Time.current
+    end
+
+    def expire!
+      update!(expired_at: Time.current)
+    end
+
     private
 
     def same_organization

data/app/models/decidim/messaging/conversation.rb

@@ -8,6 +8,8 @@ module Decidim
     # a group or a one-to-one conversation.
     #
     class Conversation < ApplicationRecord
+      self.table_name = "decidim_messaging_conversations"
+
       include Decidim::DataPortability
 
       has_many :participations, foreign_key: :decidim_conversation_id,

data/app/models/decidim/messaging/message.rb

@@ -8,6 +8,8 @@ module Decidim
     # message, namely, the interlocutors of the sender in the conversation.
     #
     class Message < ApplicationRecord
+      self.table_name = "decidim_messaging_messages"
+
       include Decidim::FriendlyDates
 
       belongs_to :sender,

data/app/models/decidim/messaging/participation.rb

@@ -6,6 +6,8 @@ module Decidim
     # Holds a many-to-many relationship between conversations and their participants
     #
     class Participation < ApplicationRecord
+      self.table_name = "decidim_messaging_participations"
+
       belongs_to :conversation,
                  foreign_key: :decidim_conversation_id,
                  class_name: "Decidim::Messaging::Conversation",

data/app/models/decidim/messaging/receipt.rb

@@ -8,6 +8,8 @@ module Decidim
     # example, the read/unread status, the deleted/undeleted status, and so on.
     #
     class Receipt < ApplicationRecord
+      self.table_name = "decidim_messaging_receipts"
+
       belongs_to :recipient, foreign_key: "decidim_recipient_id", class_name: "Decidim::User"
       belongs_to :message, foreign_key: "decidim_message_id", class_name: "Decidim::Messaging::Message"
 

data/app/models/decidim/oauth_application.rb

@@ -8,8 +8,8 @@ module Decidim
 
     belongs_to :organization, foreign_key: "decidim_organization_id", class_name: "Decidim::Organization", inverse_of: :oauth_applications
 
-    validates_upload :organization_logo
-    mount_uploader :organization_logo, OAuthApplicationLogoUploader
+    has_one_attached :organization_logo
+    validates_upload :organization_logo, uploader: OAuthApplicationLogoUploader
 
     def owner
       organization

data/app/models/decidim/organization.rb

@@ -29,6 +29,7 @@ module Decidim
     has_many :admins, -> { where(admin: true) }, foreign_key: "decidim_organization_id", class_name: "Decidim::User"
     has_many :users_with_any_role, -> { where.not(roles: []) }, foreign_key: "decidim_organization_id", class_name: "Decidim::User"
     has_many :users, foreign_key: "decidim_organization_id", class_name: "Decidim::User", dependent: :destroy
+    has_many :user_entities, foreign_key: "decidim_organization_id", class_name: "Decidim::UserBaseEntity", dependent: :destroy
     has_many :oauth_applications, foreign_key: "decidim_organization_id", class_name: "Decidim::OAuthApplication", inverse_of: :organization, dependent: :destroy
     has_many :hashtags, foreign_key: "decidim_organization_id", class_name: "Decidim::Hashtag", dependent: :destroy
 
@@ -45,20 +46,22 @@ module Decidim
     validates :time_zone, presence: true, time_zone: true
     validates :default_locale, inclusion: { in: :available_locales }
 
-    validates_upload :official_img_header
-    mount_uploader :official_img_header, Decidim::OfficialImageHeaderUploader
+    has_one_attached :official_img_header
+    validates_upload :official_img_header, uploader: Decidim::OfficialImageHeaderUploader
 
-    validates_upload :official_img_footer
-    mount_uploader :official_img_footer, Decidim::OfficialImageFooterUploader
+    has_one_attached :official_img_footer
+    validates_upload :official_img_footer, uploader: Decidim::OfficialImageFooterUploader
 
-    validates_upload :logo
-    mount_uploader :logo, Decidim::OrganizationLogoUploader
+    has_one_attached :logo
+    validates_upload :logo, uploader: Decidim::OrganizationLogoUploader
 
-    validates_upload :favicon
-    mount_uploader :favicon, Decidim::OrganizationFaviconUploader
+    has_one_attached :favicon
+    validates_upload :favicon, uploader: Decidim::OrganizationFaviconUploader
 
-    validates_upload :highlighted_content_banner_image
-    mount_uploader :highlighted_content_banner_image, ImageUploader
+    has_one_attached :highlighted_content_banner_image
+    validates_upload :highlighted_content_banner_image, uploader: Decidim::ImageUploader
+
+    has_one_attached :open_data_file
 
     def self.log_presenter_class_for(_log)
       Decidim::AdminLog::OrganizationPresenter
@@ -121,13 +124,6 @@ module Decidim
       !users_registration_mode_disabled?
     end
 
-    def open_data_file
-      @open_data_file ||= OpenDataUploader.new(self).tap do |uploader|
-        uploader.retrieve_from_store! open_data_file_path
-        uploader.cache! open_data_file_path
-      end
-    end
-
     def open_data_file_path
       "#{host}-open-data.zip"
     end
@@ -174,9 +170,9 @@ module Decidim
         Decidim::OmniauthProvider.extract_provider_key(key)
       end.compact.uniq
 
-      Hash[tenant_enabled_providers_keys.map do |key|
-        [key, omniauth_provider_settings(key)]
-      end]
+      tenant_enabled_providers_keys.index_with do |key|
+        omniauth_provider_settings(key)
+      end
     end
 
     def omniauth_provider_settings(provider)

data/app/models/decidim/user.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_dependency "devise/models/decidim_validatable"
-require_dependency "devise/models/decidim_newsletterable"
+require "devise/models/decidim_validatable"
+require "devise/models/decidim_newsletterable"
 require "valid_email2"
 
 module Decidim
@@ -13,6 +13,8 @@ module Decidim
     include Decidim::UserReportable
     include Decidim::Traceable
 
+    REGEXP_NICKNAME = /\A[\w\-]+\z/.freeze
+
     class Roles
       def self.all
         Decidim.config.user_roles
@@ -20,11 +22,12 @@ module Decidim
     end
 
     devise :invitable, :database_authenticatable, :registerable, :confirmable, :timeoutable,
-           :recoverable, :rememberable, :trackable, :lockable,
+           :recoverable, :trackable, :lockable,
            :decidim_validatable, :decidim_newsletterable,
            :omniauthable, omniauth_providers: Decidim::OmniauthProvider.available.keys,
                           request_keys: [:env], reset_password_keys: [:decidim_organization_id, :email],
                           confirmation_keys: [:decidim_organization_id, :email]
+    devise :rememberable if Decidim.enable_remember_me
 
     has_many :identities, foreign_key: "decidim_user_id", class_name: "Decidim::Identity", dependent: :destroy
     has_many :memberships, class_name: "Decidim::UserGroupMembership", foreign_key: :decidim_user_id, dependent: :destroy
@@ -35,7 +38,11 @@ module Decidim
     has_one :blocking, class_name: "Decidim::UserBlock", foreign_key: :id, primary_key: :block_id, dependent: :destroy
 
     validates :name, presence: true, unless: -> { deleted? }
-    validates :nickname, presence: true, unless: -> { deleted? || managed? }, length: { maximum: Decidim::User.nickname_max_length }
+    validates :nickname,
+              presence: true,
+              format: { with: REGEXP_NICKNAME },
+              length: { maximum: Decidim::User.nickname_max_length },
+              unless: -> { deleted? || managed? }
     validates :locale, inclusion: { in: :available_locales }, allow_blank: true
     validates :tos_agreement, acceptance: true, allow_nil: false, on: :create
     validates :tos_agreement, acceptance: true, if: :user_invited?
@@ -43,7 +50,10 @@ module Decidim
 
     validate :all_roles_are_valid
 
-    mount_uploader :avatar, Decidim::AvatarUploader
+    has_one_attached :avatar
+    validates_upload :avatar, uploader: Decidim::AvatarUploader
+
+    has_one_attached :data_portability_file
 
     scope :not_deleted, -> { where(deleted_at: nil) }
 
@@ -223,14 +233,6 @@ module Decidim
       extended_data["user_name"] || name
     end
 
-    # Caches a Decidim::DataPortabilityUploader with the retrieved file.
-    def data_portability_file(filename)
-      @data_portability_file ||= DataPortabilityUploader.new(self).tap do |uploader|
-        uploader.retrieve_from_store!(filename)
-        uploader.cache!(filename)
-      end
-    end
-
     # return the groups where this user has been accepted
     def accepted_user_groups
       UserGroups::AcceptedUserGroups.for(self)
@@ -250,6 +252,14 @@ module Decidim
       save!
     end
 
+    ransacker :invitation_accepted_at do
+      Arel.sql(%{("decidim_users"."invitation_accepted_at")::text})
+    end
+
+    ransacker :last_sign_in_at do
+      Arel.sql(%{("decidim_users"."last_sign_in_at")::text})
+    end
+
     protected
 
     # Overrides devise email required validation.