decidim-core 0.20.1 → 0.21.0

data/app/helpers/decidim/omniauth_helper.rb

@@ -3,18 +3,6 @@
 module Decidim
   # Helper that provides methods to enable or disable omniauth buttons
   module OmniauthHelper
-    # Public: returns true if the social provider is enabled
-    def social_provider_enabled?(provider)
-      Rails.application.secrets.dig(:omniauth, provider.to_sym, :enabled)
-    end
-
-    # Public: returns true if any provider is enabled
-    def any_social_provider_enabled?
-      User.omniauth_providers.any? do |provider|
-        social_provider_enabled? provider
-      end
-    end
-
     # Public: normalize providers names to they can be used for buttons
     # and icons.
     def normalize_provider_name(provider)
@@ -23,7 +11,7 @@ module Decidim
 
     # Public: icon for omniauth buttons
     def oauth_icon(provider)
-      info = Rails.application.secrets.dig(:omniauth, provider.to_sym)
+      info = current_organization.enabled_omniauth_providers[provider.to_sym]
 
       if info
         icon_path = info[:icon_path]
@@ -35,5 +23,10 @@ module Decidim
       name ||= normalize_provider_name(provider)
       icon(name)
     end
+
+    # Public: pretty print provider name
+    def provider_name(provider)
+      provider.to_s.gsub(/_|-/, " ").camelize
+    end
   end
 end

data/app/helpers/decidim/resource_versions_helper.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Helper to print resource versions.
+  module ResourceVersionsHelper
+    # Displays the localized version for the given resource.
+    #
+    # resource - the Resource that has the version to display.
+    # options - An optional hash of options
+    #         * class: A string of extra css classes
+    #
+    # Returns a String.
+    def resource_version(resource, options = {})
+      return unless resource.respond_to?(:amendable?) && resource.amendable?
+
+      html = %(<strong class="text-uppercase">#{localized_version("version", resource.versions_count)}</strong> #{localized_version("of_versions", resource.versions_count)})
+
+      html += %( #{link_to(localized_version("see_other_versions"), options[:versions_path])}) if options[:versions_path]
+
+      "<div class='tech-info #{options[:class]}'>#{html}</div>".html_safe
+    end
+
+    private
+
+    def localized_version(string, count = nil)
+      I18n.t(string, scope: "decidim.proposals.collaborative_drafts.show", number: count)
+    end
+  end
+end

data/app/helpers/decidim/rich_text_editor_helper.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Helper related to organization' setting :rich_text_editor_in_public_views.
+  module RichTextEditorHelper
+    def self.included(base)
+      base.include Decidim::SanitizeHelper
+    end
+
+    delegate :rich_text_editor_in_public_views?, to: :current_organization
+
+    def text_editor_for(form, attribute, options = {})
+      if rich_text_editor_in_public_views?
+        options[:lines] ||= 25
+        form.editor attribute, options
+      else
+        options[:rows] ||= 10
+        form.text_area attribute, options
+      end
+    end
+  end
+end

data/app/helpers/decidim/sanitize_helper.rb

@@ -3,7 +3,9 @@
 module Decidim
   # Helper that provides methods to render order selector and links
   module SanitizeHelper
-    include ActionView::Helpers::SanitizeHelper
+    def self.included(base)
+      base.include ActionView::Helpers::SanitizeHelper
+    end
 
     # Public: It sanitizes a user-inputted string with the
     # `Decidim::UserInputScrubber` scrubber, so that video embeds work

data/app/helpers/decidim/scopes_helper.rb

@@ -78,10 +78,11 @@ module Decidim
       form.scopes_picker name, options do |scope|
         {
           url: decidim.scopes_picker_path(
-            root: try(:current_participatory_space)&.scope,
+            root: try(:current_participatory_space).try(:scope),
             current: scope&.id,
             title: I18n.t("decidim.scopes.prompt"),
-            global_value: "global"
+            global_value: "global",
+            max_depth: try(:current_participatory_space).try(:scope_type_max_depth)
           ),
           text: scope_name_for_picker(scope, I18n.t("decidim.scopes.prompt"))
         }

data/app/jobs/decidim/data_portability_export_job.rb

@@ -4,18 +4,26 @@ module Decidim
   class DataPortabilityExportJob < ApplicationJob
     queue_as :default
 
-    def perform(user, format)
-      objects = Decidim::DataPortabilitySerializers.data_entities
-      export_data = []
-      export_images = []
+    def perform(user, export_format = ::Decidim::DataPortabilityExporter::DEFAULT_EXPORT_FORMAT)
+      filename = "#{SecureRandom.urlsafe_base64}.zip"
+      path = Rails.root.join("tmp/#{filename}")
+      password = SecureRandom.urlsafe_base64
 
-      objects.each do |object|
-        klass = Object.const_get(object)
-        export_data << [klass.model_name.name.parameterize.pluralize, Decidim::Exporters.find_exporter(format).new(klass.user_collection(user), klass.export_serializer).export]
-        export_images << [klass.model_name.name.parameterize.pluralize, klass.data_portability_images(user).flatten] unless klass.data_portability_images(user).nil?
-      end
+      generate_zip_file(user, path, password, export_format)
+      save_or_upload_file(path)
 
-      ExportMailer.data_portability_export(user, export_data, export_images).deliver_now
+      ExportMailer.data_portability_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
+    end
+
+    # Saves to file system or uploads to storage service depending on the configuration.
+    def save_or_upload_file(path)
+      DataPortabilityUploader.new.store!(File.open(path, "rb"))
     end
   end
 end

data/app/jobs/decidim/export_job.rb

@@ -9,7 +9,7 @@ module Decidim
         manifest.name == name.to_sym
       end
 
-      collection = export_manifest.collection.call(component)
+      collection = export_manifest.collection.call(component, user)
       serializer = export_manifest.serializer
 
       export_data = Decidim::Exporters.find_exporter(format).new(collection, serializer).export

data/app/mailers/decidim/export_mailer.rb

@@ -26,15 +26,19 @@ module Decidim
       end
     end
 
-    def data_portability_export(user, export_data, export_images)
+    # Public: Sends a notification email with a link to retrieve
+    # the result of a data_portability export in a zipped file.
+    #
+    # user - The user to be notified.
+    #
+    # Returns nothing.
+    def data_portability_export(user, filename, password)
       @user = user
       @organization = user.organization
-
-      file_zipper = Decidim::DataPortabilityFileZipper.new(@user, export_data, export_images)
-      file_zipper.make_zip
+      @filename = filename
+      @password = password
 
       with_user(user) do
-        @token = file_zipper.token
         mail(to: "#{user.name} <#{user.email}>", subject: I18n.t("decidim.export_mailer.subject", name: user.name))
       end
     end

data/app/models/decidim/omniauth_provider.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  class OmniauthProvider
+    def self.available
+      Rails.application.secrets[:omniauth] || {}
+    end
+
+    def self.enabled
+      available.select do |_provider, settings|
+        settings[:enabled] == true
+      end
+    end
+
+    def self.extract_provider_key(enabled_setting_key)
+      enabled_setting_key.gsub("omniauth_settings_", "")
+                         .gsub("_enabled", "").to_sym
+    end
+
+    def self.extract_setting_key(setting_key, provider)
+      setting_key.gsub("omniauth_settings_#{provider}_", "").to_sym
+    end
+
+    def self.value_defined?(value)
+      value.is_a?(String) && value.present?
+    end
+  end
+end

data/app/models/decidim/organization.rb

@@ -31,6 +31,7 @@ module Decidim
 
     validates :name, :host, uniqueness: true
     validates :reference_prefix, presence: true
+    validates :time_zone, presence: true, time_zone: true
     validates :default_locale, inclusion: { in: :available_locales }
 
     mount_uploader :official_img_header, Decidim::OfficialImageHeaderUploader
@@ -78,6 +79,11 @@ module Decidim
         multi_translation("decidim.welcome_notification.default_body", available_locales)
     end
 
+    def admin_terms_of_use_body
+      self[:admin_terms_of_use_body] ||
+        multi_translation("decidim.admin_terms_of_use.default_body", available_locales)
+    end
+
     def sign_up_enabled?
       users_registration_mode_enabled?
     end
@@ -96,5 +102,40 @@ module Decidim
     def open_data_file_path
       "#{host}-open-data.zip"
     end
+
+    def enabled_omniauth_providers
+      return Decidim::OmniauthProvider.enabled if omniauth_settings.nil?
+
+      Decidim::OmniauthProvider.enabled.merge(tenant_enabled_providers)
+    end
+
+    private
+
+    def tenant_enabled_providers
+      tenant_enabled_providers_keys = omniauth_settings.map do |k, v|
+        next unless k.match?(/omniauth_settings_.*_enabled/) && v == true
+
+        Decidim::OmniauthProvider.extract_provider_key(k)
+      end.compact.uniq
+
+      Hash[tenant_enabled_providers_keys.map do |k|
+        [k, omniauth_provider_settings(k)]
+      end]
+    end
+
+    def omniauth_provider_settings(provider)
+      provider_settings = {}
+
+      omniauth_settings.each do |key, value|
+        next unless key.to_s.include?(provider.to_s)
+
+        value = Decidim::AttributeEncryptor.decrypt(value) if Decidim::OmniauthProvider.value_defined?(value)
+        setting_key = Decidim::OmniauthProvider.extract_setting_key(key, provider)
+
+        provider_settings[setting_key] = value
+      end
+
+      provider_settings
+    end
   end
 end

data/app/models/decidim/participatory_space_role_config/admin.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatorySpaceRoleConfig
+    class Admin < Base
+    end
+  end
+end

data/app/models/decidim/participatory_space_role_config/base.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatorySpaceRoleConfig
+    class Base
+      def initialize(user_role)
+        @user_role = user_role
+      end
+
+      # Checks whether the given manifest name is accepted for this role.
+      #
+      # Returns a boolean.
+      def component_is_accessible?(manifest_name)
+        return true if accepted_components == [:all]
+
+        accepted_components.include?(manifest_name.to_sym)
+      end
+
+      # Public: Lists the names of the accepted components for this role.
+      #
+      # Returns an Array of Symbols.
+      def accepted_components
+        [:all]
+      end
+
+      private
+
+      attr_reader :user_role
+    end
+  end
+end

data/app/models/decidim/participatory_space_role_config/collaborator.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatorySpaceRoleConfig
+    class Collaborator < Base
+    end
+  end
+end

data/app/models/decidim/participatory_space_role_config/moderator.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatorySpaceRoleConfig
+    class Moderator < Base
+      def accepted_components
+        []
+      end
+    end
+  end
+end

data/app/models/decidim/participatory_space_role_config/null_object.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatorySpaceRoleConfig
+    class NullObject < Base
+      def accepted_components
+        []
+      end
+    end
+  end
+end

data/app/models/decidim/participatory_space_role_config/participatory_space_admin.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatorySpaceRoleConfig
+    class ParticipatorySpaceAdmin < Base
+    end
+  end
+end

data/app/models/decidim/participatory_space_role_config/valuator.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatorySpaceRoleConfig
+    class Valuator < Base
+      def accepted_components
+        [:proposals]
+      end
+    end
+  end
+end

data/app/models/decidim/scope.rb

@@ -42,8 +42,10 @@ module Decidim
     # Scope to return only the top level scopes.
     #
     # Returns an ActiveRecord::Relation.
-    def self.top_level
-      where parent_id: nil
+    def self.top_level(organization_id = nil)
+      query = where parent_id: nil
+      query = query.where(decidim_organization_id: organization_id) if organization_id
+      query
     end
 
     def self.log_presenter_class_for(_log)

data/app/models/decidim/user.rb

@@ -11,8 +11,6 @@ module Decidim
     include Decidim::Searchable
     include Decidim::ActsAsAuthor
 
-    OMNIAUTH_PROVIDERS = [:facebook, :twitter, :google_oauth2, (:developer if Rails.env.development?)].compact
-
     class Roles
       def self.all
         Decidim.config.user_roles
@@ -22,7 +20,7 @@ module Decidim
     devise :invitable, :database_authenticatable, :registerable, :confirmable, :timeoutable,
            :recoverable, :rememberable, :trackable, :lockable,
            :decidim_validatable, :decidim_newsletterable,
-           :omniauthable, omniauth_providers: OMNIAUTH_PROVIDERS,
+           :omniauthable, omniauth_providers: Decidim::OmniauthProvider.available.keys,
                           request_keys: [:env], reset_password_keys: [:decidim_organization_id, :email],
                           confirmation_keys: [:decidim_organization_id, :email]
 
@@ -82,6 +80,12 @@ module Decidim
     # Returns a String.
     attr_accessor :invitation_instructions
 
+    # Returns the user corresponding to the given +email+ if it exists and has pending invitations,
+    #   otherwise returns nil.
+    def self.has_pending_invitations?(organization_id, email)
+      invitation_not_accepted.find_by(decidim_organization_id: organization_id, email: email)
+    end
+
     # Returns the presenter for this author, to be used in the views.
     # Required by ActsAsAuthor.
     def presenter
@@ -166,6 +170,10 @@ module Decidim
       accepted_tos_version.to_i >= organization.tos_version.to_i
     end
 
+    def admin_terms_accepted?
+      return true if admin_terms_accepted_at
+    end
+
     # Whether this user can be verified against some authorization or not.
     def verifiable?
       confirmed? || managed? || being_impersonated?
@@ -183,6 +191,14 @@ module Decidim
       @interested_scopes ||= organization.scopes.where(id: interested_scopes_ids)
     end
 
+    # Caches a Decidim::DataPortabilityUploader with the retrieved file.
+    def data_portability_file(filename)
+      @data_portability_file ||= DataPortabilityUploader.new.tap do |uploader|
+        uploader.retrieve_from_store!(filename)
+        uploader.cache!(filename)
+      end
+    end
+
     protected
 
     # Overrides devise email required validation.