decidim-core 0.0.3 → 0.0.5

data/app/commands/decidim/create_registration.rb

@@ -37,7 +37,10 @@ module Decidim
                            password: form.password,
                            password_confirmation: form.password_confirmation,
                            organization: form.current_organization,
-                           tos_agreement: form.tos_agreement)
+                           tos_agreement: form.tos_agreement,
+                           newsletter_notifications: form.newsletter_notifications,
+                           comments_notifications: true,
+                           replies_notifications: true)
     end
 
     def create_user_group

data/app/commands/decidim/invite_user.rb

@@ -40,7 +40,9 @@ module Decidim
           name: form.name,
           email: form.email.downcase,
           organization: form.organization,
-          roles: form.roles
+          roles: form.roles,
+          comments_notifications: true,
+          replies_notifications: true
         },
         form.invited_by,
         invitation_instructions: form.invitation_instructions

data/app/commands/decidim/update_notifications_settings.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+module Decidim
+  # This command updates the user's notifictions settings.
+  class UpdateNotificationsSettings < Rectify::Command
+    # Updates a user's notifications settings.
+    #
+    # user - The user to be updated.
+    # form - The form with the data.
+    def initialize(user, form)
+      @user = user
+      @form = form
+    end
+
+    def call
+      return broadcast(:invalid) unless @form.valid?
+
+      update_notifications_settings
+      @user.save!
+
+      broadcast(:ok, @user)
+    end
+
+    private
+
+    def update_notifications_settings
+      @user.comments_notifications = @form.comments_notifications
+      @user.replies_notifications = @form.replies_notifications
+      @user.newsletter_notifications = @form.newsletter_notifications
+    end
+  end
+end

data/app/constraints/decidim/current_feature.rb

@@ -17,11 +17,21 @@ module Decidim
     #
     # Returns nothing.
     def matches?(request)
+      env = request.env
+      params = request.params
+
+      organization = env["decidim.current_organization"]
+
+      @participatory_process = request.env["decidim.current_participatory_process"] ||
+                               organization.participatory_processes.find_by_id(params["participatory_process_id"])
+
+      env["decidim.current_participatory_process"] ||= @participatory_process
+
       feature = detect_current_feature(request)
+
       return false unless feature
 
-      request.env["decidim.current_participatory_process"] ||= feature.participatory_process
-      request.env["decidim.current_feature"] ||= feature
+      env["decidim.current_feature"] ||= feature
       true
     end
 
@@ -29,20 +39,11 @@ module Decidim
 
     def detect_current_feature(request)
       params = request.params
-      env = request.env
-
-      return nil unless params[:feature_id]
-
-      organization = env["decidim.current_organization"]
+      return nil unless params["feature_id"]
 
-      Feature.includes(:participatory_process).where(
-        id: params[:feature_id],
-        manifest_name: @manifest.name,
-        decidim_participatory_processes: {
-          id: params[:participatory_process_id],
-          decidim_organization_id: organization.id
-        }
-      ).first
+      @participatory_process.features.to_a.find do |feature|
+        params["feature_id"].to_s == feature.id.to_s && feature.manifest_name == @manifest.name.to_s
+      end
     end
   end
 end

data/app/controllers/concerns/decidim/action_authorization.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+require "active_support/concern"
+
+module Decidim
+  module ActionAuthorization
+    extend ActiveSupport::Concern
+
+    included do
+      helper_method :authorize_action_path, :action_authorization
+    end
+
+    # Public: Authorizes an action of a feature given an action name.
+    #
+    # action_name  - The action name to authorize. Actions are set up on the
+    #                feature's permissions panel.
+    # redirect_url - Url to be redirected to when the authorization is finished.
+    def authorize_action!(action_name, redirect_url: nil)
+      @action_authorizations ||= {}
+      @action_authorizations[action_name] = _action_authorizer(action_name).authorize
+      status = @action_authorizations[action_name]
+
+      return if status.ok?
+      raise Unauthorized if status.code == :invalid
+
+      redirect_to authorize_action_path_from_status(status, redirect_url)
+    end
+
+    # Public: Returns the authorization object for an authorization.
+    #
+    # action_name - The action to authorize against.
+    #
+    # Returns an ActionAuthorizer::AuthorizationStatus
+    def action_authorization(action_name)
+      _action_authorizer(action_name).authorize
+    end
+
+    # Public: Returns the authorization path for a failed authorization with
+    # the populated redirect url.
+    #
+    # action_name - The action name to authorize against.
+    # redirect_url - The url to redirect to when finished.
+    #
+    # Returns a String.
+    def authorize_action_path(action_name, redirect_url: nil)
+      redirect_url ||= request.path
+
+      authorize_action_path_from_status(
+        action_authorization(action_name),
+        redirect_url: redirect_url
+      )
+    end
+
+    # Public: Returns the authorization path for a failed authorization with
+    # the populated redirect url.
+    #
+    # status       - The status after an authorization check.
+    # redirect_url - The url to redirect to when finished.
+    #
+    # Returns a String.
+    def authorize_action_path_from_status(status, redirect_url: nil)
+      decidim.new_authorization_path(
+        handler: status.data[:handler],
+        redirect_url: redirect_url
+      )
+    end
+
+    def _action_authorizer(action_name)
+      ActionAuthorizer.new(current_user, current_feature, action_name)
+    end
+
+    class Unauthorized < StandardError; end
+  end
+end

data/app/controllers/concerns/decidim/feature_settings.rb

@@ -13,14 +13,11 @@ module Decidim
       helper_method :feature_settings, :current_settings
 
       def feature_settings
-        current_feature.settings
+        @feature_settings ||= current_feature.settings
       end
 
       def current_settings
-        active_step = current_participatory_process.active_step
-        return nil unless active_step
-
-        current_feature.step_settings.fetch(active_step.id.to_s)
+        @current_settings ||= current_feature.active_step_settings
       end
     end
   end

data/app/controllers/concerns/decidim/needs_authorization.rb

@@ -11,6 +11,7 @@ module Decidim
       check_authorization
 
       rescue_from CanCan::AccessDenied, with: :user_not_authorized
+      rescue_from ActionAuthorization::Unauthorized, with: :user_not_authorized
 
       private
 
@@ -26,8 +27,11 @@ module Decidim
 
       def ability_context
         {
+          current_settings: try(:current_settings),
+          feature_settings: try(:feature_settings),
           current_organization: try(:current_organization),
-          current_feature: try(:current_feature)
+          current_feature: try(:current_feature),
+          current_participatory_process: try(:current_participatory_process)
         }
       end
 

data/app/controllers/concerns/decidim/user_profile.rb

@@ -18,6 +18,7 @@ module Decidim
       helper_method :available_authorization_handlers,
                     :user_groups
 
+      before_action :current_user
       authorize_resource :current_user
     end
 

data/app/controllers/decidim/application_controller.rb

@@ -5,12 +5,24 @@ module Decidim
     include Decidim::NeedsOrganization
     include Decidim::LocaleSwitcher
     include NeedsAuthorization
+    helper Decidim::MetaTagsHelper
+    helper Decidim::DecidimFormHelper
+    helper Decidim::LanguageChooserHelper
+
     protect_from_forgery with: :exception, prepend: true
+    after_action :add_vary_header
 
     layout "layouts/decidim/application"
 
     def user_not_authorized_path
       decidim.root_path
     end
+
+    # Make sure Chrome doesn't use the cache from a different format. This
+    # prevents a bug where clicking the back button of the browser
+    # displays the JS response instead of the HTML one.
+    def add_vary_header
+      response.headers["Vary"] = "Accept"
+    end
   end
 end

data/app/controllers/decidim/authorizations_controller.rb

@@ -9,6 +9,7 @@ module Decidim
     before_action :valid_handler, only: [:new, :create]
 
     include Decidim::UserProfile
+    helper Decidim::DecidimFormHelper
 
     layout "layouts/decidim/user_profile", only: [:index]
 
@@ -19,14 +20,20 @@ module Decidim
     end
 
     def first_login
-      redirect_to(action: :new, handler: handlers.first.handler_name) if handlers.length == 1
+      if handlers.length == 1
+        redirect_to(
+          action: :new,
+          handler: handlers.first.handler_name,
+          redirect_url: account_path
+        )
+      end
     end
 
     def create
       AuthorizeUser.call(handler) do
         on(:ok) do
           flash[:notice] = t("authorizations.create.success", scope: "decidim")
-          redirect_to account_path
+          redirect_to params[:redirect_url] || authorizations_path
         end
 
         on(:invalid) do
@@ -36,15 +43,6 @@ module Decidim
       end
     end
 
-    def destroy
-      @authorization = current_user.authorizations.find(params[:id])
-      authorize! :destroy, @authorization
-
-      @authorization.destroy
-      flash[:notice] = t("authorizations.destroy.success", scope: "decidim")
-      redirect_to account_path
-    end
-
     def handler
       @handler ||= AuthorizationHandler.handler_for(handler_name, handler_params)
     end
@@ -73,7 +71,7 @@ module Decidim
     end
 
     def only_one_handler?
-      redirect_to(action: :new, handler: handlers.first.handler_name) && return if handlers.length == 1
+      redirect_to(action: :new, handler: available_handlers.first.handler_name) && return if available_handlers.length == 1
     end
 
     def handlers

data/app/controllers/decidim/cookie_policy_controller.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+require_dependency "decidim/application_controller"
+
+module Decidim
+  # This controller allows the user to accept the cookie policy.
+  class CookiePolicyController < ApplicationController
+    skip_authorization_check
+
+    def accept
+      response.set_cookie "decidim-cc", value: "true",
+                                        path: "/",
+                                        expires: 1.year.from_now.utc
+    end
+  end
+end

data/app/controllers/decidim/devise/confirmations_controller.rb

@@ -6,6 +6,10 @@ module Decidim
       include Decidim::NeedsOrganization
       include Decidim::LocaleSwitcher
       helper Decidim::TranslationsHelper
+      helper Decidim::MetaTagsHelper
+      helper Decidim::DecidimFormHelper
+      helper Decidim::LanguageChooserHelper
+      helper Decidim::CookiesHelper
 
       layout "layouts/decidim/application"
     end

data/app/controllers/decidim/devise/invitations_controller.rb

@@ -6,6 +6,10 @@ module Decidim
       include Decidim::NeedsOrganization
       include Decidim::LocaleSwitcher
       helper Decidim::TranslationsHelper
+      helper Decidim::MetaTagsHelper
+      helper Decidim::DecidimFormHelper
+      helper Decidim::LanguageChooserHelper
+      helper Decidim::CookiesHelper
 
       layout "layouts/decidim/application"
 

data/app/controllers/decidim/devise/omniauth_registrations_controller.rb

@@ -8,6 +8,10 @@ module Decidim
       include Decidim::NeedsOrganization
       include Decidim::LocaleSwitcher
       helper Decidim::TranslationsHelper
+      helper Decidim::MetaTagsHelper
+      helper Decidim::DecidimFormHelper
+      helper Decidim::LanguageChooserHelper
+      helper Decidim::CookiesHelper
 
       layout "layouts/decidim/application"
 
@@ -37,9 +41,12 @@ module Decidim
             render :new
           end
 
-          on(:error) do
-            redirect_to decidim.new_user_registration_path
-            set_flash_message :alert, :failure, kind: @form.provider, reason: t("decidim.devise.omniauth_registrations.create.email_already_exists")
+          on(:error) do |user|
+            if user.errors[:email]
+              set_flash_message :alert, :failure, kind: @form.provider.capitalize, reason: t("decidim.devise.omniauth_registrations.create.email_already_exists")
+            end
+
+            render :new
           end
         end
       end

data/app/controllers/decidim/devise/passwords_controller.rb

@@ -6,6 +6,10 @@ module Decidim
       include Decidim::NeedsOrganization
       include Decidim::LocaleSwitcher
       helper Decidim::TranslationsHelper
+      helper Decidim::MetaTagsHelper
+      helper Decidim::DecidimFormHelper
+      helper Decidim::LanguageChooserHelper
+      helper Decidim::CookiesHelper
 
       layout "layouts/decidim/application"
     end

data/app/controllers/decidim/devise/registrations_controller.rb

@@ -9,9 +9,18 @@ module Decidim
       include FormFactory
       helper Decidim::TranslationsHelper
       helper Decidim::OmniauthHelper
+      helper Decidim::MetaTagsHelper
+      helper Decidim::DecidimFormHelper
+      helper Decidim::LanguageChooserHelper
+      helper Decidim::CookiesHelper
+
+      helper_method :terms_and_conditions_page
 
       layout "layouts/decidim/application"
       before_action :configure_permitted_parameters
+      helper_method :terms_and_conditions_page
+
+      invisible_captcha
 
       def new
         @form = form(RegistrationForm).from_params(
@@ -43,6 +52,12 @@ module Decidim
         end
       end
 
+      private
+
+      def terms_and_conditions_page
+        @terms_and_conditions_page ||= Decidim::StaticPage.find_by_slug("terms-and-conditions")
+      end
+
       protected
 
       def configure_permitted_parameters
@@ -54,6 +69,12 @@ module Decidim
         super(hash)
         resource.organization = current_organization
       end
+
+      private
+
+      def terms_and_conditions_page
+        @terms_and_conditions_page ||= Decidim::StaticPage.find_by_slug("terms-and-conditions")
+      end
     end
   end
 end

data/app/controllers/decidim/devise/sessions_controller.rb

@@ -7,6 +7,10 @@ module Decidim
       include Decidim::LocaleSwitcher
       helper Decidim::TranslationsHelper
       helper Decidim::OmniauthHelper
+      helper Decidim::MetaTagsHelper
+      helper Decidim::DecidimFormHelper
+      helper Decidim::LanguageChooserHelper
+      helper Decidim::CookiesHelper
 
       layout "layouts/decidim/application"
 

data/app/controllers/decidim/notifications_settings_controller.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+require_dependency "decidim/application_controller"
+
+module Decidim
+  # The controller to handle the user's notifications settings page.
+  class NotificationsSettingsController < ApplicationController
+    include Decidim::UserProfile
+
+    def show
+      authorize! :show, current_user
+      @notifications_settings = form(NotificationsSettingsForm).from_model(current_user)
+    end
+
+    def update
+      authorize! :update, current_user
+      @notifications_settings = form(NotificationsSettingsForm).from_params(params)
+
+      UpdateNotificationsSettings.call(current_user, @notifications_settings) do
+        on(:ok) do
+          flash.now[:notice] = t("notifications_settings.update.success", scope: "decidim")
+        end
+
+        on(:invalid) do
+          flash.now[:alert] = t("notifications_settings.update.error", scope: "decidim")
+        end
+      end
+
+      render action: :show
+    end
+  end
+end