decidim-system 0.20.1 → 0.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43595bcde22bdafbc1e64f92b684a6bc5777a3c90e2fa9d868a89ea743dc2e51
-  data.tar.gz: 8a33f34a2f9efb23e450398ce7a049e8ae355a0c4f1930995f60497318450ee4
+  metadata.gz: d6d6cdf2e956ea0aecb6c7a11ef2a367b2207263eb9dbeee16c79b753138bb31
+  data.tar.gz: b042b0430a8f7b1d5a705205eb6ea4b68b00ff436382da2ad5c4d5d8a19addd1
 SHA512:
-  metadata.gz: '0945d6d7726cf53b465eef86b0fbcb2a239f3b5e250b4cfd06eea277d6253264358fcb1c06a44c820361e6e5cd78b382a786d01edda38136fe088057d64258c1'
-  data.tar.gz: f725833825144944890fd763f8d245ada747bba55702486826f7335086fafce950d9a7444c880500c620d4a49b84daa047bd2aa0b43d5ab800887b4c41404853
+  metadata.gz: 827904c8c90e2baa6c3ee237076ee9ed3556499aa444c25fced2552f03aaa6d2dee06b70b5a2893474d78e87859a9fb725a6b9a7e37538743789da6cfe072f0f
+  data.tar.gz: a635a2250a37f597044064775bed7fbb8816c994b19e53cad22f6ed30c265f11c7c9e63c680ef938769df89066987461ad5c3ab9e947ba292d0f178596a23716

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

@@ -2,7 +2,9 @@
 // = require foundation
 // = require rails-ujs
 // = require decidim/editor
+// = require decidim/input_tags
 // = require_self
+// = require decidim/configuration
 
 $(() => {
   $(document).foundation();

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/_foundation_and_overrides.scss

@@ -2,6 +2,7 @@
 
 @import "settings";
 @import "foundation";
+@import "foundation-overrides/components/button-group";
 
 // If you'd like to include motion-ui the foundation-rails gem comes prepackaged with it, uncomment the 3 @imports, if you are not using the gem you need to install the motion-ui sass package.
 //

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

@@ -1,5 +1,4 @@
 @mixin menu-title{
-  text-transform: uppercase;
   letter-spacing: 5px;
 }
 
@@ -48,7 +47,6 @@
     }
 
     li{
-      text-transform: uppercase;
       font-weight: bold;
       font-size: .9em;
       border-left: 2px solid transparent;

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_default_content_blocks.rb

@@ -24,7 +24,7 @@ module Decidim
           Decidim::ContentBlock.create(
             decidim_organization_id: organization.id,
             weight: weight,
-            scope: :homepage,
+            scope_name: :homepage,
             manifest_name: manifest.name,
             published_at: Time.current
           )

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

@@ -57,8 +57,10 @@ module Decidim
           badges_enabled: true,
           user_groups_enabled: true,
           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)
@@ -47,7 +50,9 @@ module Decidim
         organization.force_users_to_authenticate_before_access_organization = form.force_users_to_authenticate_before_access_organization
         organization.available_authorizations = form.clean_available_authorizations
         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

@@ -5,10 +5,12 @@ module Decidim
     # Controller to manage Organizations (tenants).
     #
     class OrganizationsController < Decidim::System::ApplicationController
-      helper_method :current_organization
+      helper_method :current_organization, :provider_enabled?
+      helper Decidim::OmniauthHelper
 
       def new
         @form = form(RegisterOrganizationForm).instance
+        @form.file_upload_settings = form(FileUploadSettingsForm).from_model({})
       end
 
       def create
@@ -56,12 +58,18 @@ module Decidim
         end
       end
 
+      private
+
       # The current organization for the request.
       #
       # Returns an Organization.
       def current_organization
         @organization
       end
+
+      def provider_enabled?(provider)
+        Rails.application.secrets.dig(:omniauth, provider, :enabled)
+      end
     end
   end
 end

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