<%= t ".inactive_users_cleaner_title" %>
-
-
- <%= form.check_box :delete_inactive_users %>
-
+
+ <%= form.check_box :delete_inactive_users %>
+
-
- <%= form.number_field :delete_inactive_users_email_after %>
-
+
+ <%= form.number_field :delete_inactive_users_email_after %>
+
-
- <%= form.number_field :delete_inactive_users_after %>
-
+
+ <%= form.number_field :delete_inactive_users_after %>
+
diff --git a/app/views/decidim/cleaner/admin/organization_cleaner/edit.html.erb b/app/views/decidim/cleaner/admin/organization_cleaner/edit.html.erb
index ee9b947..0817afc 100644
--- a/app/views/decidim/cleaner/admin/organization_cleaner/edit.html.erb
+++ b/app/views/decidim/cleaner/admin/organization_cleaner/edit.html.erb
@@ -1,6 +1,14 @@
-<%= decidim_form_for(@form, html: { class: "form edit_organization_cleaner" }, url:"/admin/organization/cleaner" , method: :put) do |f| %>
- <%= render partial: "form", object: f %>
-
- <%= f.submit t(".update") %>
-
-<% end %>
+
+
+
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fd985c3..0b44f84 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -22,6 +22,7 @@ en:
admin:
organization_cleaner:
edit:
+ title: Edit Data cleaner
update: Update
form:
admin_log_cleaner_title: Admin log
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 100af2d..570cad8 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -23,6 +23,7 @@ fr:
admin:
organization_cleaner:
edit:
+ title: Modifier Nettoyeur de données
update: Mettre à jour
form:
admin_log_cleaner_title: Historique d'administration
diff --git a/decidim-cleaner.gemspec b/decidim-cleaner.gemspec
index e67a5bf..af44704 100644
--- a/decidim-cleaner.gemspec
+++ b/decidim-cleaner.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
"homepage_uri" => "https://decidim.org",
"source_code_uri" => "https://github.com/decidim/decidim"
}
- s.required_ruby_version = ">= 2.7.5"
+ s.required_ruby_version = "~> 3.2"
s.name = "decidim-cleaner"
s.summary = "A decidim cleaner module"
@@ -25,5 +25,5 @@ Gem::Specification.new do |s|
s.files = Dir["{app,config,db,lib}/**/*", "LICENSE-AGPLv3.txt", "Rakefile", "README.md"]
- s.add_dependency "decidim-core", "~> #{Decidim::Cleaner.compatible_decidim_version}"
+ s.add_dependency "decidim-core", Decidim::Cleaner.compatible_decidim_version
end
diff --git a/lib/decidim/cleaner.rb b/lib/decidim/cleaner.rb
index c202785..b41bfb5 100644
--- a/lib/decidim/cleaner.rb
+++ b/lib/decidim/cleaner.rb
@@ -3,7 +3,6 @@
require "decidim/cleaner/admin"
require "decidim/cleaner/engine"
require "decidim/cleaner/admin_engine"
-require "decidim/cleaner/extends/commands/decidim/destroy_account"
module Decidim
# This namespace holds the logic of the `Cleaner` module.
diff --git a/lib/decidim/cleaner/engine.rb b/lib/decidim/cleaner/engine.rb
index ecb02cb..aa8cc87 100644
--- a/lib/decidim/cleaner/engine.rb
+++ b/lib/decidim/cleaner/engine.rb
@@ -8,10 +8,6 @@ module Cleaner
# This is the engine that runs on the public interface of cleaner.
class Engine < ::Rails::Engine
isolate_namespace Decidim::Cleaner
-
- config.to_prepare do
- Decidim::DestroyAccount.include(Decidim::Cleaner::Extends::DestroyAccount)
- end
end
end
end
diff --git a/lib/decidim/cleaner/extends/commands/decidim/destroy_account.rb b/lib/decidim/cleaner/extends/commands/decidim/destroy_account.rb
deleted file mode 100644
index 24df182..0000000
--- a/lib/decidim/cleaner/extends/commands/decidim/destroy_account.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Cleaner
- module Extends
- # This command destroys the user's account.
- module DestroyAccount
- extend ActiveSupport::Concern
-
- included do
- private
-
- # Invalidate all sessions after cleaning Decidim::User record to prevent Active Record error
- def destroy_user_account!
- @user.name = ""
- @user.nickname = ""
- @user.email = ""
- @user.delete_reason = @form.delete_reason
- @user.admin = false if @user.admin?
- @user.deleted_at = Time.current
- @user.skip_reconfirmation!
- @user.avatar.purge
- @user.save!
-
- @user.invalidate_all_sessions!
- end
- end
- end
- end
- end
-end
diff --git a/lib/decidim/cleaner/version.rb b/lib/decidim/cleaner/version.rb
index 0944cca..67062ce 100644
--- a/lib/decidim/cleaner/version.rb
+++ b/lib/decidim/cleaner/version.rb
@@ -5,11 +5,11 @@ module Decidim
# This holds the decidim-meetings version.
module Cleaner
def self.version
- "4.1.2"
+ "5.0.0"
end
def self.compatible_decidim_version
- "0.28.dev"
+ "~> 0.29.0"
end
end
end
diff --git a/spec/commands/decidim/cleaner/custom_destroy_account_spec.rb b/spec/commands/decidim/cleaner/custom_destroy_account_spec.rb
new file mode 100644
index 0000000..1b402bf
--- /dev/null
+++ b/spec/commands/decidim/cleaner/custom_destroy_account_spec.rb
@@ -0,0 +1,113 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim
+ module Cleaner
+ describe CustomDestroyAccount do
+ let(:command) { described_class.new(user, form) }
+ let(:user) { create(:user, :confirmed) }
+ let!(:identity) { create(:identity, user:) }
+ let(:valid) { true }
+ let(:data) do
+ {
+ delete_reason: "I want to delete my account"
+ }
+ end
+
+ let(:form) do
+ form = double(
+ delete_reason: data[:delete_reason],
+ valid?: valid
+ )
+
+ form
+ end
+
+ context "when invalid" do
+ let(:valid) { false }
+
+ it "broadcasts invalid" do
+ expect { command.call }.to broadcast(:invalid)
+ end
+ end
+
+ context "when valid" do
+ let(:valid) { true }
+
+ it "broadcasts ok" do
+ expect { command.call }.to broadcast(:ok)
+ end
+
+ it "changes the auth salt to invalidate all other sessions" do
+ old_salt = user.authenticatable_salt
+ command.call
+ expect(user.reload.authenticatable_salt).not_to eq(old_salt)
+ end
+
+ it "stores the deleted_at and delete_reason to the user" do
+ command.call
+ expect(user.reload.delete_reason).to eq(data[:delete_reason])
+ expect(user.reload.deleted_at).not_to be_nil
+ end
+
+ it "set name, nickname, personal_url, about and email to blank string" do
+ command.call
+ user.reload
+ expect(user.name).to eq("")
+ expect(user.nickname).to eq("")
+ expect(user.email).to eq("")
+ expect(user.personal_url).to eq("")
+ expect(user.about).to eq("")
+ end
+
+ it "destroys the current user avatar" do
+ command.call
+ expect(user.reload.avatar).not_to be_present
+ end
+
+ it "deletes user's identities" do
+ expect do
+ command.call
+ end.to change(Identity, :count).by(-1)
+ end
+
+ it "deletes user group memberships" do
+ user_group = create(:user_group)
+ create(:user_group_membership, user_group:, user:)
+
+ expect do
+ command.call
+ end.to change(UserGroupMembership, :count).by(-1)
+ end
+
+ it "deletes the follows" do
+ other_user = create(:user)
+ create(:follow, followable: user, user: other_user)
+ create(:follow, followable: other_user, user:)
+
+ expect do
+ command.call
+ end.to change(Follow, :count).by(-2)
+ end
+
+ it "deletes participatory space private user" do
+ create(:participatory_space_private_user, user:)
+
+ expect do
+ command.call
+ end.to change(ParticipatorySpacePrivateUser, :count).by(-1)
+ end
+
+ context "when user is admin" do
+ let(:user) { create(:user, :confirmed, :admin) }
+
+ it "removes admin role" do
+ command.call
+ expect(user.reload.admin).to be_falsey
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/spec/commands/decidim/destroy_account_spec.rb b/spec/commands/decidim/destroy_account_spec.rb
deleted file mode 100644
index 79360d4..0000000
--- a/spec/commands/decidim/destroy_account_spec.rb
+++ /dev/null
@@ -1,108 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-module Decidim
- describe DestroyAccount do
- let(:command) { described_class.new(user, form) }
- let(:user) { create(:user, :confirmed) }
- let!(:identity) { create(:identity, user:) }
- let(:valid) { true }
- let(:data) do
- {
- delete_reason: "I want to delete my account"
- }
- end
-
- let(:form) do
- form = double(
- delete_reason: data[:delete_reason],
- valid?: valid
- )
-
- form
- end
-
- context "when invalid" do
- let(:valid) { false }
-
- it "broadcasts invalid" do
- expect { command.call }.to broadcast(:invalid)
- end
- end
-
- context "when valid" do
- let(:valid) { true }
-
- it "broadcasts ok" do
- expect { command.call }.to broadcast(:ok)
- end
-
- it "changes the auth salt to invalidate all other sessions" do
- old_salt = user.authenticatable_salt
- command.call
- expect(user.reload.authenticatable_salt).not_to eq(old_salt)
- end
-
- it "stores the deleted_at and delete_reason to the user" do
- command.call
- expect(user.reload.delete_reason).to eq(data[:delete_reason])
- expect(user.reload.deleted_at).not_to be_nil
- end
-
- it "set name, nickname and email to blank string" do
- command.call
- expect(user.reload.name).to eq("")
- expect(user.reload.nickname).to eq("")
- expect(user.reload.email).to eq("")
- end
-
- it "destroys the current user avatar" do
- command.call
- expect(user.reload.avatar).not_to be_present
- end
-
- it "deletes user's identities" do
- expect do
- command.call
- end.to change(Identity, :count).by(-1)
- end
-
- it "deletes user group memberships" do
- user_group = create(:user_group)
- create(:user_group_membership, user_group:, user:)
-
- expect do
- command.call
- end.to change(UserGroupMembership, :count).by(-1)
- end
-
- it "deletes the follows" do
- other_user = create(:user)
- create(:follow, followable: user, user: other_user)
- create(:follow, followable: other_user, user:)
-
- expect do
- command.call
- end.to change(Follow, :count).by(-2)
- end
-
- it "deletes participatory space private user" do
- create(:participatory_space_private_user, user:)
-
- expect do
- command.call
- end.to change(ParticipatorySpacePrivateUser, :count).by(-1)
- end
-
- context "when user is admin" do
- let(:user) { create(:user, :confirmed, :admin) }
-
- it "removes admin role" do
- command.call
- expect(user.reload.admin).to be_falsey
- end
- end
- end
- end
-end
diff --git a/spec/factories.rb b/spec/factories.rb
index dcdd368..9924ee8 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -5,10 +5,15 @@
FactoryBot.modify do
factory :organization, class: "Decidim::Organization" do
transient do
+ skip_injection { false }
create_static_pages { true }
end
- name { Faker::Company.unique.name }
+ # we do not want machine translation here
+ name do
+ Decidim.available_locales.index_with { |_locale| Faker::Company.unique.name }
+ end
+
reference_prefix { Faker::Name.suffix }
time_zone { "UTC" }
twitter_handler { Faker::Hipster.word }
@@ -17,12 +22,11 @@
youtube_handler { Faker::Hipster.word }
github_handler { Faker::Hipster.word }
sequence(:host) { |n| "#{n}.lvh.me" }
- description { Decidim::Faker::Localized.wrapped("
", "
") { generate_localized_title } }
+ description { generate_localized_description(:organization_description, skip_injection:) }
favicon { Decidim::Dev.test_file("icon.png", "image/png") }
default_locale { Decidim.default_locale }
available_locales { Decidim.available_locales }
users_registration_mode { :enabled }
- official_img_header { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
official_img_footer { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
official_url { Faker::Internet.url }
highlighted_content_banner_enabled { false }
@@ -31,10 +35,10 @@
user_groups_enabled { true }
send_welcome_notification { true }
comments_max_length { 1000 }
- admin_terms_of_service_body { Decidim::Faker::Localized.wrapped("
", "
") { generate_localized_title } }
+ admin_terms_of_service_body { generate_localized_description(:admin_terms_of_service_body, skip_injection:) }
force_users_to_authenticate_before_access_organization { false }
machine_translation_display_priority { "original" }
- external_domain_whitelist { ["example.org", "twitter.com", "facebook.com", "youtube.com", "github.com", "mytesturl.me"] }
+ external_domain_allowlist { ["example.org", "twitter.com", "facebook.com", "youtube.com", "github.com", "mytesturl.me"] }
smtp_settings do
{
"from" => "test@example.org",
@@ -46,6 +50,26 @@
end
file_upload_settings { Decidim::OrganizationSettings.default(:upload) }
enable_participatory_space_filters { true }
+ content_security_policy do
+ {
+ "default-src" => "localhost:* #{host}:*",
+ "script-src" => "localhost:* #{host}:*",
+ "style-src" => "localhost:* #{host}:*",
+ "img-src" => "localhost:* #{host}:*",
+ "font-src" => "localhost:* #{host}:*",
+ "connect-src" => "localhost:* #{host}:*",
+ "frame-src" => "localhost:* #{host}:* www.example.org",
+ "media-src" => "localhost:* #{host}:*"
+ }
+ end
+ colors do
+ {
+ primary: "#e02d2d",
+ secondary: "#155abf",
+ tertiary: "#ebc34b"
+ }
+ end
+
delete_admin_logs { false }
delete_inactive_users { false }
@@ -56,7 +80,7 @@
after(:create) do |organization, evaluator|
if evaluator.create_static_pages
tos_page = Decidim::StaticPage.find_by(slug: "terms-of-service", organization:)
- create(:static_page, :tos, organization:) if tos_page.nil?
+ create(:static_page, :tos, organization:, skip_injection: evaluator.skip_injection) if tos_page.nil?
end
end
end
diff --git a/spec/lib/decidim/cleaner/version_spec.rb b/spec/lib/decidim/cleaner/version_spec.rb
index 5a21b61..7aaa0b0 100644
--- a/spec/lib/decidim/cleaner/version_spec.rb
+++ b/spec/lib/decidim/cleaner/version_spec.rb
@@ -7,11 +7,11 @@ module Decidim
subject { described_class }
it "has version" do
- expect(subject.version).to eq("4.1.2")
+ expect(subject.version).to eq("5.0.0")
end
it "has decidim version compatibility" do
- expect(subject.compatible_decidim_version).to eq("0.28.dev")
+ expect(subject.compatible_decidim_version).to eq("~> 0.29.0")
end
end
end
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 0000000..fb57ccd
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+