From 8af88af806b218cb4a64f6e5473a8a24b62e6608 Mon Sep 17 00:00:00 2001 From: bach Date: Tue, 9 Mar 2021 16:46:59 +0100 Subject: [PATCH] added user_registrationpassword --- composer.json | 1 + composer.lock | 51 ++++++++++++++++++- config/sync/core.extension.yml | 1 + .../fr/user_registrationpassword.mail.yml | 2 + config/sync/user.mail.yml | 4 +- config/sync/user.settings.yml | 4 +- .../sync/user_registrationpassword.mail.yml | 6 +++ ...ser_registrationpassword.mail_original.yml | 6 +++ .../user_registrationpassword.settings.yml | 7 +++ 9 files changed, 77 insertions(+), 5 deletions(-) create mode 100644 config/sync/language/fr/user_registrationpassword.mail.yml create mode 100644 config/sync/user_registrationpassword.mail.yml create mode 100644 config/sync/user_registrationpassword.mail_original.yml create mode 100644 config/sync/user_registrationpassword.settings.yml diff --git a/composer.json b/composer.json index ac6a5b4..c123fa3 100644 --- a/composer.json +++ b/composer.json @@ -86,6 +86,7 @@ "drupal/ultimate_cron": "^2.x-dev", "drupal/unique_content_field_validation": "^1.0", "drupal/url_to_video_filter": "^2.0", + "drupal/user_registrationpassword": "^1.0@alpha", "drupal/views_conditional": "^1.x-dev", "drupal/views_ef_fieldset": "^1.5", "drush/drush": "^9", diff --git a/composer.lock b/composer.lock index 2bb8ce6..9fbb6da 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "459fb69fbfeab86bf6217088fd266445", + "content-hash": "6551b226eaa1ce5d151810ee7996bf9d", "packages": [ { "name": "alchemy/zippy", @@ -12080,6 +12080,54 @@ "source": "https://git.drupalcode.org/project/url_to_video_filter" } }, + { + "name": "drupal/user_registrationpassword", + "version": "1.0.0-alpha5", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/user_registrationpassword.git", + "reference": "8.x-1.0-alpha5" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/user_registrationpassword-8.x-1.0-alpha5.zip", + "reference": "8.x-1.0-alpha5", + "shasum": "2443b1e7d1c080863c907da569187add5b0c0814" + }, + "require": { + "drupal/core": "^8.8 || ^9" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.0-alpha5", + "datestamp": "1592713735", + "security-coverage": { + "status": "not-covered", + "message": "Alpha releases are not covered by Drupal security advisories." + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Rob C", + "homepage": "https://www.drupal.org/user/313382" + }, + { + "name": "jide", + "homepage": "https://www.drupal.org/user/146088" + } + ], + "description": "Let users register with a password on the registration form when verification mail is required.", + "homepage": "https://www.drupal.org/project/user_registrationpassword", + "support": { + "source": "https://git.drupalcode.org/project/user_registrationpassword" + } + }, { "name": "drupal/video_embed_field", "version": "2.4.0", @@ -19313,6 +19361,7 @@ "drupal/translate_side_by_side": 20, "drupal/translation_views": 20, "drupal/ultimate_cron": 20, + "drupal/user_registrationpassword": 15, "drupal/views_conditional": 20, "drupal/advanced_text_formatter": 10, "drupal/autocomplete_deluxe": 5, diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index c17cdd7..7b7767f 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -187,6 +187,7 @@ module: update: 0 url_to_video_filter: 0 user: 0 + user_registrationpassword: 0 video_embed_field: 0 video_embed_wysiwyg: 0 views_bulk_edit: 0 diff --git a/config/sync/language/fr/user_registrationpassword.mail.yml b/config/sync/language/fr/user_registrationpassword.mail.yml new file mode 100644 index 0000000..60193af --- /dev/null +++ b/config/sync/language/fr/user_registrationpassword.mail.yml @@ -0,0 +1,2 @@ +register_confirmation_with_pass: + subject: 'Détails du compte [user:display-name] sur [site:name]' diff --git a/config/sync/user.mail.yml b/config/sync/user.mail.yml index 821eeee..56e8bec 100644 --- a/config/sync/user.mail.yml +++ b/config/sync/user.mail.yml @@ -17,8 +17,8 @@ register_pending_approval_admin: body: "[user:display-name] has applied for an account.\r\n\r\n[user:edit-url]" subject: 'Account details for [user:display-name] at [site:name] (pending admin approval)' status_activated: - body: "[user:display-name],\r\n\r\nYour account at [site:name] has been activated.\r\n\r\nYou may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password.\r\n\r\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\r\n\r\nusername: [user:account-name]\r\npassword: Your password\r\n\r\n-- [site:name] team" - subject: 'Account details for [user:display-name] at [site:name] (approved)' + body: "[user:display-name],\r\n\r\nYour account at [site:name] has been activated.\r\n\r\nYou will be able to log in to [site:login-url] in the future using:\r\n\r\nusername: [user:name]\r\npassword: your password.\r\n\r\n-- [site:name] team" + subject: 'Account details for [user:display-name] at [site:name]' status_blocked: body: "[user:display-name],\r\n\r\nYour account on [site:name] has been blocked.\r\n\r\n-- [site:name] team" subject: 'Account details for [user:display-name] at [site:name] (blocked)' diff --git a/config/sync/user.settings.yml b/config/sync/user.settings.yml index 1a5febe..d4fd617 100644 --- a/config/sync/user.settings.yml +++ b/config/sync/user.settings.yml @@ -7,8 +7,8 @@ notify: status_blocked: false status_canceled: false register_admin_created: true - register_no_approval_required: true - register_pending_approval: true + register_no_approval_required: false + register_pending_approval: false register: visitors cancel_method: user_cancel_block password_reset_timeout: 86400 diff --git a/config/sync/user_registrationpassword.mail.yml b/config/sync/user_registrationpassword.mail.yml new file mode 100644 index 0000000..7921fb0 --- /dev/null +++ b/config/sync/user_registrationpassword.mail.yml @@ -0,0 +1,6 @@ +register_confirmation_with_pass: + body: "[user:display-name],\r\n\r\nThank you for registering at [site:name]. You may now log in and verify your account by clicking this link or copying and pasting it to your browser:\r\n\r\n[user:registrationpassword-url]\r\n\r\nThis link can only be used once. You will be able to log in at [site:login-url] in the future using:\r\n\r\nusername: [user:name]\r\npassword: your password\r\n\r\n-- [site:name] team" + subject: 'Détails du compte [user:display-name] sur [site:name]' +langcode: en +_core: + default_config_hash: sd6r3H04eOul_dps8oyinjacaZmLgG7BrRZ3bmYiyZU diff --git a/config/sync/user_registrationpassword.mail_original.yml b/config/sync/user_registrationpassword.mail_original.yml new file mode 100644 index 0000000..b2f874e --- /dev/null +++ b/config/sync/user_registrationpassword.mail_original.yml @@ -0,0 +1,6 @@ +status_activated: + subject: 'Account details for [user:display-name] at [site:name] (approved)' + body: "[user:display-name],\r\n\r\nYour account at [site:name] has been activated.\r\n\r\nYou may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password.\r\n\r\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\r\n\r\nusername: [user:account-name]\r\npassword: Your password\r\n\r\n-- [site:name] team" +langcode: en +_core: + default_config_hash: '-NFASedvrCq04dzkSi6iBCauY3BLjVOxfRNcOKN09kA' diff --git a/config/sync/user_registrationpassword.settings.yml b/config/sync/user_registrationpassword.settings.yml new file mode 100644 index 0000000..2393c70 --- /dev/null +++ b/config/sync/user_registrationpassword.settings.yml @@ -0,0 +1,7 @@ +registration: with-pass +registration_ftll_expire: false +registration_ftll_timeout: 86400 +notify: + register_confirmation_with_pass: true +_core: + default_config_hash: 2fwxXOq3dbjiboKslfHTJXYWAk4u1zadK65SRiDrxug