decidim-system 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8103f6222debfb3b86ee92339d04758f15ef9b6ec07f2961d7fb53ebf20af4f6
-  data.tar.gz: 8da892fcaa36e60f8f0fbaf11d60f181b3eb4a32b3b96105d036d5433a1f9cf6
+  metadata.gz: 5faf98a3152e536e389d9fb86ae7e604b2bc56bada412fdb799fa4371544839e
+  data.tar.gz: 3a94d7d2a997d7996ac5869cdc589770b2925eaf409f4c5c8029eeea616a1fb2
 SHA512:
-  metadata.gz: 27534a161e2412f2df26801398bc42ab001c2ad15fc6d96b13f6700ffd77827d6edb8069b69f6d2352cd876ebcaa5e09d0f43ed914227a18b0a252a4df16370e
-  data.tar.gz: f76449afdcf89dd432ba104cb5b74cb8c227a6841f2826d29821da3b18ab4a147c60ab8806cf7fe2c97514c3f4b3eb16ade7cb2db0759d8e3417c83184204cfa
+  metadata.gz: 76c65b21024ee256684a009fe7791662f1099165baaa2c35ca68c8e1bc9ef8a6ad284a5f6b432fd3a07eea2e46f5cec0adf29c84ae05ae09bec27a32d467bd97
+  data.tar.gz: 417789586417f17361ba78e29fe554c7c121d8a178aba6cdb5470ff3bfaa9440fa52757f2d71f9ee9263e8b498477d0b7808c52a543b60b8d8676fd3686ce178

data/app/assets/javascripts/decidim/system/application.js.es6

@@ -2,6 +2,7 @@
 // = require foundation
 // = require rails-ujs
 // = require decidim/editor
+// = require decidim/input_tags
 // = require_self
 // = require decidim/configuration
 

data/app/assets/stylesheets/decidim/system/_forms.scss

@@ -0,0 +1,36 @@
+@import "tagsinput";
+
+$tag-padding: .25rem;
+$tag-margin: .2rem;
+
+.input__tag{
+  background-color: rgba($medium-gray, .5);
+  border-radius: $input-radius;
+  padding: $tag-padding;
+  display: inline-block;
+  cursor: pointer;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+// Override defaults
+.bootstrap-tagsinput{
+  margin-bottom: $form-spacing;
+
+  // Use foundation precalculated methods to get accurate form css properties
+  $height: ($input-font-size * unitless-calc($input-line-height)) + (get-side($input-padding, 'top') + get-side($input-padding, 'bottom'));
+  $tag-line-height: rem-calc(22);
+  $span-height: ($input-font-size * unitless-calc($tag-line-height)) + (get-side($tag-padding, 'top') + get-side($tag-padding, 'bottom')) - rem-calc(1);
+
+  width: 100%;
+  min-height: $height;
+  padding-bottom: $tag-margin / 4;
+
+  .tag{
+    color: inherit;
+    margin-right: 0; // fix whitespace
+    margin-bottom: $tag-margin;
+  }
+}

data/app/assets/stylesheets/decidim/system/application.scss

@@ -4,6 +4,7 @@
 @import "sidebar";
 @import "tables";
 @import "actions";
+@import "forms";
 @import "decidim/editor";
 @import "decidim/utils/fontface";
 

data/app/commands/decidim/system/create_oauth_application.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Decidim
+  module System
+    # Creates an OAuthApplication.
+    class CreateOAuthApplication < Rectify::Command
+      # Initializes the command.
+      #
+      # form - The source fo data for this OAuthApplication.
+      def initialize(form)
+        @form = form
+      end
+
+      def call
+        return broadcast(:invalid) unless @form.valid?
+
+        @application = Decidim.traceability.create!(
+          OAuthApplication,
+          @form.current_user,
+          organization: @form.current_organization,
+          name: @form.name,
+          decidim_organization_id: @form.decidim_organization_id,
+          organization_name: @form.organization_name,
+          organization_url: @form.organization_url,
+          organization_logo: @form.organization_logo,
+          redirect_uri: @form.redirect_uri,
+          scopes: "public"
+        )
+
+        broadcast(:ok, @application)
+      rescue ActiveRecord::RecordInvalid
+        @form.errors.add(:organization_logo, @application.errors[:organization_logo]) if @application.errors.include? :organization_logo
+        broadcast(:invalid)
+      end
+    end
+  end
+end

data/app/commands/decidim/system/destroy_oauth_application.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module System
+    # This command deals with destroying an application from the admin panel.
+    class DestroyOAuthApplication < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # application - The OAuthApplication to be destroyed.
+      # user        - The user that destroys the application.
+      def initialize(application, current_user)
+        @application = application
+        @current_user = current_user
+      end
+
+      # Public: Executes the command.
+      #
+      # Broadcasts :ok if it got destroyed
+      def call
+        destroy_application
+        broadcast(:ok)
+      end
+
+      private
+
+      attr_reader :application, :current_user
+
+      def destroy_application
+        Decidim.traceability.perform_action!(
+          "delete",
+          application,
+          current_user
+        ) do
+          application.destroy!
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/system/register_organization.rb

@@ -59,7 +59,8 @@ module Decidim
           default_locale: form.default_locale,
           omniauth_settings: form.encrypted_omniauth_settings,
           smtp_settings: form.encrypted_smtp_settings,
-          send_welcome_notification: true
+          send_welcome_notification: true,
+          file_upload_settings: form.file_upload_settings.final
         )
       end
 

data/app/commands/decidim/system/update_oauth_application.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module System
+    # Updates the OAuth application given form data.
+    class UpdateOAuthApplication < Rectify::Command
+      # Initializes the command.
+      #
+      # application - The OAuthApplication to update.
+      # form        - The form object containing the data to update.
+      # user        - The user that updates the application.
+      def initialize(application, form, user)
+        @application = application
+        @form = form
+        @user = user
+      end
+
+      def call
+        return broadcast(:invalid) unless @form.valid?
+
+        @application = Decidim.traceability.update!(
+          @application,
+          @user,
+          name: @form.name,
+          decidim_organization_id: @form.decidim_organization_id,
+          organization_name: @form.organization_name,
+          organization_url: @form.organization_url,
+          organization_logo: @form.organization_logo,
+          redirect_uri: @form.redirect_uri
+        )
+
+        broadcast(:ok, @application)
+      rescue ActiveRecord::RecordInvalid
+        @form.errors.add(:organization_logo, @application.errors[:organization_logo]) if @application.errors.include? :organization_logo
+        broadcast(:invalid)
+      end
+    end
+  end
+end

data/app/commands/decidim/system/update_organization.rb

@@ -27,6 +27,9 @@ module Decidim
           save_organization
         end
 
+        # Ensure the runtime settings are updated
+        OrganizationSettings.reload(organization)
+
         broadcast(:ok)
       rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
         broadcast(:invalid)
@@ -49,6 +52,7 @@ module Decidim
         organization.users_registration_mode = form.users_registration_mode
         organization.omniauth_settings = form.encrypted_omniauth_settings
         organization.smtp_settings = form.encrypted_smtp_settings
+        organization.file_upload_settings = form.file_upload_settings.final
 
         organization.save!
       end

data/app/controllers/decidim/system/oauth_applications_controller.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+module Decidim
+  module System
+    # Controller that allows managing OAuth applications at the admin panel.
+    #
+    class OAuthApplicationsController < Decidim::System::ApplicationController
+      helper Decidim::Admin::AttributesDisplayHelper
+
+      def index
+        @oauth_applications = collection.page(params[:page]).per(15)
+      end
+
+      def show
+        @oauth_application = collection.find(params[:id])
+      end
+
+      def new
+        @form = form(OAuthApplicationForm).instance
+      end
+
+      def create
+        @form = form(OAuthApplicationForm).from_params(params)
+
+        CreateOAuthApplication.call(@form) do
+          on(:ok) do
+            flash[:notice] = I18n.t("oauth_applications.create.success", scope: "decidim.system")
+            redirect_to action: :index
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("oauth_applications.create.error", scope: "decidim.system")
+            render :new
+          end
+        end
+      end
+
+      def edit
+        @oauth_application = collection.find(params[:id])
+        @form = form(OAuthApplicationForm).from_model(@oauth_application)
+      end
+
+      def update
+        @oauth_application = collection.find(params[:id])
+        @form = form(OAuthApplicationForm).from_params({ organization_logo: @oauth_application.organization_logo }.merge(params.to_unsafe_h))
+
+        UpdateOAuthApplication.call(@oauth_application, @form, current_user) do
+          on(:ok) do |_application|
+            flash[:notice] = I18n.t("oauth_applications.update.success", scope: "decidim.system")
+            redirect_to action: :index
+          end
+
+          on(:invalid) do |application|
+            @oauth_application = application
+            flash.now[:error] = I18n.t("oauth_applications.update.error", scope: "decidim.system")
+            render action: :edit
+          end
+        end
+      end
+
+      def destroy
+        @oauth_application = collection.find(params[:id])
+
+        DestroyOAuthApplication.call(@oauth_application, current_user) do
+          on(:ok) do
+            flash[:notice] = I18n.t("oauth_applications.destroy.success", scope: "decidim.system")
+            redirect_to action: :index
+          end
+
+          on(:invalid) do
+            flash.now[:error] = I18n.t("oauth_applications.destroy.error", scope: "decidim.system")
+            redirect_to :back
+          end
+        end
+      end
+
+      private
+
+      def collection
+        @collection ||= Decidim::OAuthApplication.all.includes([:organization])
+      end
+    end
+  end
+end

data/app/controllers/decidim/system/organizations_controller.rb

@@ -10,6 +10,7 @@ module Decidim
 
       def new
         @form = form(RegisterOrganizationForm).instance
+        @form.file_upload_settings = form(FileUploadSettingsForm).from_model({})
       end
 
       def create

data/app/forms/decidim/system/file_upload_settings_form.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module Decidim
+  module System
+    # A form object used to update organization file upload settings from the
+    # system dashboard.
+    #
+    class FileUploadSettingsForm < Form
+      include JsonbAttributes
+
+      mimic :organization_file_uploads
+
+      attribute :allowed_file_extensions, Hash[Symbol => String]
+      attribute :allowed_content_types, Hash[Symbol => String]
+      attribute :maximum_file_size, Hash[Symbol => Float]
+
+      def map_model(settings_hash)
+        settings_hash = begin
+          if settings_hash.is_a?(Hash)
+            default_settings.deep_merge(settings_hash.deep_stringify_keys)
+          else
+            default_settings
+          end
+        end
+
+        attribute_set.each do |attr|
+          key = attr.name.to_s
+          next unless settings_hash.has_key?(key)
+
+          # For the view, the array values need to be in comma separated format
+          # in order for them to work correctly with the tags inputs.
+          value = Rectify::FormAttribute.new(attr).value_from(
+            settings_hash[key]
+          )
+          value.each do |k, v|
+            value[k] = v.join(",") if v.is_a?(Array)
+          end
+
+          self[key] = value
+        end
+      end
+
+      # This turns the attributes passed from the view into the final
+      # configuration array. Due to the UI component used for the array values,
+      # those values need to be handled as a single comma separated string in
+      # the view layer. Before we save those attributes, they need to be
+      # converted into arrays which is what this method does.
+      def final
+        csv_attributes = [:allowed_file_extensions, :allowed_content_types]
+        attributes.tap do |attr|
+          csv_attributes.each do |key|
+            attr[key] = csv_array_setting(attr[key])
+          end
+        end
+      end
+
+      private
+
+      def default_settings
+        Decidim::OrganizationSettings.default(:upload)
+      end
+
+      def csv_array_setting(original)
+        original.map do |key, value|
+          [key, value.split(",")]
+        end.to_h
+      end
+    end
+  end
+end

data/app/forms/decidim/system/oauth_application_form.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module System
+    # The form that validates the data to construct a valid OAuthApplication.
+    class OAuthApplicationForm < Decidim::Form
+      include Decidim::HasUploadValidations
+
+      mimic :oauth_application
+
+      attribute :name, String
+      attribute :decidim_organization_id, Integer
+      attribute :organization_name, String
+      attribute :organization_url, String
+      attribute :organization_logo
+      attribute :redirect_uri, String
+
+      validates :name, :redirect_uri, :decidim_organization_id, :organization_name, :organization_url, :organization_logo, presence: true
+      validates :organization_logo, passthru: { to: Decidim::OAuthApplication }
+      validate :redirect_uri_is_ssl
+
+      alias organization current_organization
+
+      private
+
+      def redirect_uri_is_ssl
+        return if redirect_uri.blank?
+
+        uri = URI.parse(redirect_uri)
+
+        errors.add(:redirect_uri, :must_be_ssl) if uri.host != "localhost" && uri.scheme != "https"
+      end
+    end
+  end
+end

data/app/forms/decidim/system/update_organization_form.rb

@@ -29,8 +29,9 @@ module Decidim
         [:authentication, String],
         [:enable_starttls_auto, Boolean]
       ]
+      attribute :file_upload_settings, FileUploadSettingsForm
 
-      OMNIATH_PROVIDERS_ATTRIBUTES = Decidim::User.omniauth_providers.map do |provider|
+      OMNIATH_PROVIDERS_ATTRIBUTES = Decidim::OmniauthProvider.available.keys.map do |provider|
         Rails.application.secrets.dig(:omniauth, provider).keys.map do |setting|
           if setting == :enabled
             ["omniauth_settings_#{provider}_enabled".to_sym, Boolean]
@@ -53,6 +54,7 @@ module Decidim
         self.omniauth_settings = Hash[(model.omniauth_settings || []).map do |k, v|
           [k, Decidim::OmniauthProvider.value_defined?(v) ? Decidim::AttributeEncryptor.decrypt(v) : v]
         end]
+        self.file_upload_settings = FileUploadSettingsForm.from_model(model.file_upload_settings)
       end
 
       def clean_secondary_hosts

data/app/views/decidim/system/oauth_applications/_form.html.erb

@@ -0,0 +1,26 @@
+<div class="row column">
+  <%= form.text_field :name %>
+</div>
+
+<div class="row column">
+  <%= form.text_field :redirect_uri %>
+</div>
+
+<div class="row column">
+  <%= form.select :decidim_organization_id,
+                Decidim::Organization.pluck(:name, :id),
+                { include_blank: t(".select_organization") },
+                { multiple: false } %>
+</div>
+
+<div class="row column">
+  <%= form.text_field :organization_name %>
+</div>
+
+<div class="row column">
+  <%= form.text_field :organization_url %>
+</div>
+
+<div class="row column">
+  <%= form.upload :organization_logo %>
+</div>