From aeba95a8b536df83dfb2dab2a0edaf361ad3d7b0 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 1 Apr 2023 21:04:15 -0700
Subject: [PATCH] fix: :passport_control: no longer need 2fa for webauthn

---
 .../src/server/api/endpoints/i/2fa/register-key.ts        | 6 +++---
 packages/client/src/components/MkDialog.vue               | 1 +
 packages/client/src/pages/settings/2fa.vue                | 8 +++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts b/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts
index 8c0af28ee..96239b56d 100644
--- a/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts
+++ b/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts
@@ -32,9 +32,9 @@ export default define(meta, paramDef, async (ps, user) => {
 		throw new Error("incorrect password");
 	}
 
-	if (!profile.twoFactorEnabled) {
-		throw new Error("2fa not enabled");
-	}
+	// if (!profile.twoFactorEnabled) {
+	// 	throw new Error("2fa not enabled");
+	// }
 
 	// 32 byte challenge
 	const entropy = await randomBytes(32);
diff --git a/packages/client/src/components/MkDialog.vue b/packages/client/src/components/MkDialog.vue
index 5d5ca1e8d..708db22ef 100644
--- a/packages/client/src/components/MkDialog.vue
+++ b/packages/client/src/components/MkDialog.vue
@@ -13,6 +13,7 @@
 				<MkLoading v-else-if="type === 'waiting'" :class="$style.iconInner" :em="true"/>
 			</div>
 			<header v-if="title" :class="$style.title"><Mfm :text="title"/></header>
+			<header v-if="title == null && input.type === 'password'" :class="$style.title"><Mfm :text="i18n.ts.password"/></header>
 			<div v-if="text" :class="$style.text"><Mfm :text="text"/></div>
 			<MkInput v-if="input && input.type !== 'paragraph'" v-model="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder || undefined" @keydown="onInputKeydown">
 				<template v-if="input.type === 'password'" #prefix><i class="ph-password ph-bold ph-lg"></i></template>
diff --git a/packages/client/src/pages/settings/2fa.vue b/packages/client/src/pages/settings/2fa.vue
index 71a76c716..bb3862b4b 100644
--- a/packages/client/src/pages/settings/2fa.vue
+++ b/packages/client/src/pages/settings/2fa.vue
@@ -4,7 +4,9 @@
 	<template v-if="$i.twoFactorEnabled">
 		<p>{{ i18n.ts._2fa.alreadyRegistered }}</p>
 		<MkButton @click="unregister">{{ i18n.ts.unregister }}</MkButton>
+	</template>
 
+	<template>
 		<template v-if="supportsCredentials">
 			<hr class="totp-method-sep">
 
@@ -20,7 +22,7 @@
 
 			<MkSwitch v-if="$i.securityKeysList.length > 0" v-model="usePasswordLessLogin" @update:modelValue="updatePasswordLessLogin">{{ i18n.ts.passwordLessLogin }}</MkSwitch>
 
-			<MkInfo v-if="registration && registration.error" warn>{{ i18n.ts.error }} {{ registration.error }}</MkInfo>
+			<MkInfo v-if="registration && registration.error" style="margin-bottom: 1rem;" warn>{{ i18n.ts.error }}: {{ registration.error }}</MkInfo>
 			<MkButton v-if="!registration || registration.error" @click="addSecurityKey">{{ i18n.ts._2fa.registerKey }}</MkButton>
 
 			<ol v-if="registration && !registration.error">
@@ -45,7 +47,7 @@
 			<li>
 				<I18n :src="i18n.ts._2fa.step1" tag="span">
 					<template #a>
-						<a href="https://authy.com/" rel="noopener" target="_blank" class="_link">Authy</a>
+						<a href="https://authpass.app/" rel="noopener" target="_blank" class="_link">AuthPass</a>
 					</template>
 					<template #b>
 						<a href="https://support.google.com/accounts/answer/1066447" rel="noopener" target="_blank" class="_link">Google Authenticator</a>
@@ -140,7 +142,7 @@ function registerKey() {
 		attestationObject: hexify(registration.value.credential.response.attestationObject)
 	}).then(key => {
 		registration.value = null;
-		key.lastUsed = new Date();
+		key!.lastUsed = new Date();
 		os.success();
 	});
 }