Simplify config

Author: duncanmcclean

config/users.php

@@ -180,22 +180,18 @@
 
     'elevated_session_duration' => 15,
 
-    'two_factor' => [
-
-        /*
-        |--------------------------------------------------------------------------
-        | Enforce Two-Factor Authentication
-        |--------------------------------------------------------------------------
-        |
-        | Specify which user roles should be required to enable two-factor
-        | authentication. Use "*" to enforce 2FA for all users, or "super_users"
-        | to enforce it for super users.
-        |
-        */
-
-        'enforced_roles' => [],
+    /*
+    |--------------------------------------------------------------------------
+    | Enforce Two-Factor Authentication
+    |--------------------------------------------------------------------------
+    |
+    | Specify which user roles should be required to enable two-factor
+    | authentication. Use "*" to enforce 2FA for all users, or "super_users"
+    | to enforce it for super users.
+    |
+    */
 
-    ],
+    'two_factor_enforced_roles' => [],
 
     /*
     |--------------------------------------------------------------------------

src/Auth/User.php

@@ -363,7 +363,7 @@ public function preferredTheme()
 
     public function isTwoFactorAuthenticationRequired(): bool
     {
-        $enforcedRoles = config('statamic.users.two_factor.enforced_roles', []);
+        $enforcedRoles = config('statamic.users.two_factor_enforced_roles', []);
 
         if (in_array('*', $enforcedRoles)) {
             return true;

tests/Auth/TwoFactor/TwoFactorAuthenticationControllerTest.php

@@ -46,7 +46,7 @@ public function it_enables_two_factor_authentication_without_elevated_session_wh
     {
         Event::fake();
 
-        config()->set('statamic.users.two_factor.enforced_roles', ['*']);
+        config()->set('statamic.users.two_factor_enforced_roles', ['*']);
 
         $user = $this->user();
 
@@ -264,7 +264,7 @@ public function it_disables_two_factor_authentication_for_the_current_user_when_
         Event::fake();
 
         // Enforced for everyone
-        config()->set('statamic.users.two_factor.enforced_roles', ['*']);
+        config()->set('statamic.users.two_factor_enforced_roles', ['*']);
 
         $user = $this->userWithTwoFactorEnabled();
 
@@ -317,7 +317,7 @@ public function it_disables_two_factor_authentication_for_another_user_when_two_
         Event::fake();
 
         // Enforced for everyone
-        config()->set('statamic.users.two_factor.enforced_roles', ['*']);
+        config()->set('statamic.users.two_factor_enforced_roles', ['*']);
 
         $otherUser = $this->userWithTwoFactorEnabled();
 

tests/Auth/UserContractTests.php

@@ -597,13 +597,13 @@ public function it_determines_if_two_factor_authentication_is_required_for_a_non
 
         $user = tap($this->makeUser()->assignRole('test'))->saveQuietly();
 
-        config()->set('statamic.users.two_factor.enforced_roles', []);
+        config()->set('statamic.users.two_factor_enforced_roles', []);
         $this->assertFalse($user->isTwoFactorAuthenticationRequired());
 
-        config()->set('statamic.users.two_factor.enforced_roles', ['test']);
+        config()->set('statamic.users.two_factor_enforced_roles', ['test']);
         $this->assertTrue($user->isTwoFactorAuthenticationRequired());
 
-        config()->set('statamic.users.two_factor.enforced_roles', ['*']);
+        config()->set('statamic.users.two_factor_enforced_roles', ['*']);
         $this->assertTrue($user->isTwoFactorAuthenticationRequired());
     }
 
@@ -612,13 +612,13 @@ public function it_determines_if_two_factor_authentication_is_required_for_a_non
     {
         $user = tap($this->makeUser())->save();
 
-        config()->set('statamic.users.two_factor.enforced_roles', []);
+        config()->set('statamic.users.two_factor_enforced_roles', []);
         $this->assertFalse($user->isTwoFactorAuthenticationRequired());
 
-        config()->set('statamic.users.two_factor.enforced_roles', ['test']);
+        config()->set('statamic.users.two_factor_enforced_roles', ['test']);
         $this->assertFalse($user->isTwoFactorAuthenticationRequired());
 
-        config()->set('statamic.users.two_factor.enforced_roles', ['*']);
+        config()->set('statamic.users.two_factor_enforced_roles', ['*']);
         $this->assertTrue($user->isTwoFactorAuthenticationRequired());
     }
 
@@ -627,13 +627,13 @@ public function it_determines_if_two_factor_authentication_is_required_for_a_sup
     {
         $user = tap($this->makeUser()->makeSuper())->save();
 
-        config()->set('statamic.users.two_factor.enforced_roles', []);
+        config()->set('statamic.users.two_factor_enforced_roles', []);
         $this->assertFalse($user->isTwoFactorAuthenticationRequired());
 
-        config()->set('statamic.users.two_factor.enforced_roles', ['super_users']);
+        config()->set('statamic.users.two_factor_enforced_roles', ['super_users']);
         $this->assertTrue($user->isTwoFactorAuthenticationRequired());
 
-        config()->set('statamic.users.two_factor.enforced_roles', ['*']);
+        config()->set('statamic.users.two_factor_enforced_roles', ['*']);
         $this->assertTrue($user->isTwoFactorAuthenticationRequired());
     }
 

tests/Fieldtypes/TwoFactorTest.php

@@ -49,7 +49,7 @@ public function it_returns_preload_for_current_user()
             ->save();
         $this->assertTrue($this->fieldtype()->preload()['is_setup']);
 
-        config()->set('statamic.users.two_factor.enforced_roles', ['*']);
+        config()->set('statamic.users.two_factor_enforced_roles', ['*']);
         $this->assertTrue($this->fieldtype()->preload()['is_enforced']);
     }
 
@@ -84,7 +84,7 @@ public function it_returns_preload_for_another_user()
             ->save();
         $this->assertTrue($this->fieldtype()->preload()['is_setup']);
 
-        config()->set('statamic.users.two_factor.enforced_roles', ['*']);
+        config()->set('statamic.users.two_factor_enforced_roles', ['*']);
         $this->assertTrue($this->fieldtype()->preload()['is_enforced']);
     }