From b719931e8e29a5892dcb35588ad7a6c38e5c1e0e Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Wed, 12 Jun 2024 16:22:25 +0100
Subject: [PATCH] =?UTF-8?q?Issue=20#3453676=20by=20nicxvan,=20alexpott,=20?=
=?UTF-8?q?dww,=20lauriii,=20G=C3=A1bor=20Hojtsy:=20Make=20"Who=20can=20re?=
=?UTF-8?q?gister=20accounts=3F"=20"Administrators=20only"=20by=20default?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
core/profiles/minimal/config/install/user.settings.yml | 2 +-
core/profiles/minimal/tests/src/Functional/MinimalTest.php | 6 ++++--
core/profiles/standard/config/install/user.settings.yml | 2 +-
core/recipes/standard/recipe.yml | 2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/core/profiles/minimal/config/install/user.settings.yml b/core/profiles/minimal/config/install/user.settings.yml
index 39c032288a38..cdc311b3c7d6 100644
--- a/core/profiles/minimal/config/install/user.settings.yml
+++ b/core/profiles/minimal/config/install/user.settings.yml
@@ -10,7 +10,7 @@ notify:
register_admin_created: true
register_no_approval_required: true
register_pending_approval: true
-register: visitors_admin_approval
+register: admin_only
cancel_method: user_cancel_block
password_reset_timeout: 86400
password_strength: true
diff --git a/core/profiles/minimal/tests/src/Functional/MinimalTest.php b/core/profiles/minimal/tests/src/Functional/MinimalTest.php
index ffea86934e66..365273dbc96e 100644
--- a/core/profiles/minimal/tests/src/Functional/MinimalTest.php
+++ b/core/profiles/minimal/tests/src/Functional/MinimalTest.php
@@ -32,7 +32,9 @@ class MinimalTest extends BrowserTestBase {
public function testMinimal() {
$this->drupalGet('');
// Check the login block is present.
- $this->assertSession()->linkExists('Create new account');
+ $this->assertSession()->buttonExists('Log in');
+ // Confirm anonymous users cannot create an account.
+ $this->assertSession()->linkNotExists('Create new account');
$this->assertSession()->statusCodeEquals(200);
// Create a user to test tools and navigation blocks for logged in users
@@ -60,7 +62,7 @@ public function testMinimal() {
// Ensure special configuration overrides are correct.
$this->assertFalse($this->config('system.theme.global')->get('features.node_user_picture'), 'Configuration system.theme.global:features.node_user_picture is FALSE.');
- $this->assertEquals(UserInterface::REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL, $this->config('user.settings')->get('register'));
+ $this->assertEquals(UserInterface::REGISTER_ADMINISTRATORS_ONLY, $this->config('user.settings')->get('register'));
// Now we have all configuration imported, test all of them for schema
// conformance. Ensures all imported default configuration is valid when
diff --git a/core/profiles/standard/config/install/user.settings.yml b/core/profiles/standard/config/install/user.settings.yml
index 39c032288a38..cdc311b3c7d6 100644
--- a/core/profiles/standard/config/install/user.settings.yml
+++ b/core/profiles/standard/config/install/user.settings.yml
@@ -10,7 +10,7 @@ notify:
register_admin_created: true
register_no_approval_required: true
register_pending_approval: true
-register: visitors_admin_approval
+register: admin_only
cancel_method: user_cancel_block
password_reset_timeout: 86400
password_strength: true
diff --git a/core/recipes/standard/recipe.yml b/core/recipes/standard/recipe.yml
index ae577ff8a905..cff95d649c54 100644
--- a/core/recipes/standard/recipe.yml
+++ b/core/recipes/standard/recipe.yml
@@ -81,5 +81,5 @@ config:
user.settings:
simple_config_update:
verify_mail: true
- register: visitors_admin_approval
+ register: admin_only
cancel_method: user_cancel_block
--
GitLab