refact: User security TOTP drawer

Author: distantnative

config/areas/account/dialogs.php

@@ -1,7 +1,5 @@
 <?php
 
-use Kirby\Panel\Controller\Dialog\UserTotpEnableDialogController;
-
 $dialogs = require __DIR__ . '/../users/dialogs.php';
 
 return [
@@ -61,12 +59,4 @@
 		...$dialogs['user.file.sections'],
 		'pattern' => '(account)/files/(:any)/sections/(:any)/(:all?)',
 	],
-	'account.totp.enable' => [
-		'pattern' => '(account)/totp/enable',
-		'action'  => UserTotpEnableDialogController::class
-	],
-	'account.totp.disable' => [
-		...$dialogs['user.totp.disable'],
-		'pattern' => '(account)/totp/disable',
-	],
 ];

config/areas/account/drawers.php

@@ -11,6 +11,10 @@
 		...$drawers['user.security.method.code'],
 		'pattern' => '(account)/security/method/code',
 	],
+	'account.security.challenge.totp' => [
+		...$drawers['user.security.challenge.totp'],
+		'pattern' => '(account)/security/challenge/totp',
+	],
 	'account.fields' => [
 		...$drawers['user.fields'],
 		'pattern' => '(account)/fields/(:any)/(:all?)',

config/areas/users/dialogs.php

@@ -13,7 +13,6 @@
 use Kirby\Panel\Controller\Dialog\UserChangeRoleDialogController;
 use Kirby\Panel\Controller\Dialog\UserCreateDialogController;
 use Kirby\Panel\Controller\Dialog\UserDeleteDialogController;
-use Kirby\Panel\Controller\Dialog\UserTotpDisableDialogController;
 
 return [
 	'user.create' => [
@@ -44,10 +43,6 @@
 		'pattern' => 'users/(:any)/delete',
 		'action'  => UserDeleteDialogController::class
 	],
-	'user.totp.disable' => [
-		'pattern' => 'users/(:any)/totp/disable',
-		'action'  => UserTotpDisableDialogController::class
-	],
 
 	'user.fields' => [
 		'pattern' => '(users/[^/]+)/fields/(:any)/(:all?)',

config/areas/users/drawers.php

@@ -4,6 +4,7 @@
 use Kirby\Panel\Controller\Drawer\SectionDrawerController;
 use Kirby\Panel\Controller\Drawer\UserSecurityCodeMethodDrawerController;
 use Kirby\Panel\Controller\Drawer\UserSecurityDrawerController;
+use Kirby\Panel\Controller\Drawer\UserTotpDrawerController;
 
 return [
 	'user.security' => [
@@ -14,6 +15,10 @@
 		'pattern' => 'users/(:any)/security/method/code',
 		'action'  => UserSecurityCodeMethodDrawerController::class
 	],
+	'user.security.challenge.totp' => [
+		'pattern' => 'users/(:any)/security/challenge/totp',
+		'action'  => UserTotpDrawerController::class
+	],
 	'user.fields' => [
 		'pattern' => '(users/[^/]+)/fields/(:any)/(:all?)',
 		'action'  => FieldDrawerController::class

i18n/translations/en.json

@@ -549,7 +549,6 @@
 	"login.totp.enable.qr.help": "Unable to scan? Add the setup key <code>{secret}</code> manually to your authenticator app.",
 	"login.totp.enable.confirm.headline": "2. Confirm with generated code",
 	"login.totp.enable.confirm.text": "Your app generates a new one‑time code every 30 seconds. Enter the current code to complete the setup:",
-	"login.totp.enable.confirm.label": "Current code",
 	"login.totp.enable.confirm.help": "After this setup, we will ask you for a one‑time code every time you log in.",
 	"login.totp.enable.success": "One‑time codes enabled",
 	"login.totp.disable.option": "Disable one‑time codes",

panel/src/components/Dialogs/TotpDialog.vue

@@ -21,7 +21,6 @@ import RemoveDialog from "./RemoveDialog.vue";
 import RequestErrorDialog from "./RequestErrorDialog.vue";
 import SearchDialog from "./SearchDialog.vue";
 import TextDialog from "./TextDialog.vue";
-import TotpDialog from "./TotpDialog.vue";
 import UploadDialog from "./UploadDialog.vue";
 import UploadReplaceDialog from "./UploadReplaceDialog.vue";
 
@@ -54,7 +53,6 @@ export default {
 		app.component("k-request-error-dialog", RequestErrorDialog);
 		app.component("k-search-dialog", SearchDialog);
 		app.component("k-text-dialog", TextDialog);
-		app.component("k-totp-dialog", TotpDialog);
 		app.component("k-upload-dialog", UploadDialog);
 		app.component("k-upload-replace-dialog", UploadReplaceDialog);
 

panel/src/components/Dialogs/index.js

@@ -15,6 +15,7 @@
 			</ol>
 		</nav>
 		<k-drawer-tabs :tab="tab" :tabs="tabs" @open="$emit('tab', $event)" />
+
 		<nav class="k-drawer-options">
 			<slot />
 			<k-button class="k-drawer-option" icon="check" type="submit" />