From 121f297fcb6516a5f49de74665188eb3ccebafa4 Mon Sep 17 00:00:00 2001
From: Jin <22962980+JYC333@users.noreply.github.com>
Date: Fri, 28 Mar 2025 12:08:32 +0100
Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20better=20oauth=20instru?=
=?UTF-8?q?ction?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../type_widgets/options/multi_factor_authentication.ts | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/public/app/widgets/type_widgets/options/multi_factor_authentication.ts b/src/public/app/widgets/type_widgets/options/multi_factor_authentication.ts
index e7ea2b269..d2970ecb1 100644
--- a/src/public/app/widgets/type_widgets/options/multi_factor_authentication.ts
+++ b/src/public/app/widgets/type_widgets/options/multi_factor_authentication.ts
@@ -96,7 +96,7 @@ const TPL_WEB = `
${t("multi_factor_authentication.oauth_description")}
-
+
${t("multi_factor_authentication.oauth_description_warning")}
@@ -148,6 +148,7 @@ export default class MultiFactorAuthenticationOptions extends OptionsWidget {
private $oauthOptions!: JQuery
;
private $UserAccountName!: JQuery;
private $UserAccountEmail!: JQuery;
+ private $oauthWarning!: JQuery;
private $missingVars!: JQuery;
doRender() {
@@ -166,6 +167,7 @@ export default class MultiFactorAuthenticationOptions extends OptionsWidget {
this.$oauthOptions = this.$widget.find(".oauth-options");
this.$UserAccountName = this.$widget.find(".user-account-name");
this.$UserAccountEmail = this.$widget.find(".user-account-email");
+ this.$oauthWarning = this.$widget.find(".oauth-warning");
this.$missingVars = this.$widget.find(".missing-vars");
this.$recoveryKeys = [];
@@ -312,10 +314,12 @@ export default class MultiFactorAuthenticationOptions extends OptionsWidget {
if (result.enabled) {
if (result.name) this.$UserAccountName.text(result.name);
if (result.email) this.$UserAccountEmail.text(result.email);
+ this.$oauthWarning.hide();
this.$missingVars.hide();
} else {
this.$UserAccountName.text(t("multi_factor_authentication.oauth_user_not_logged_in"));
this.$UserAccountEmail.text(t("multi_factor_authentication.oauth_user_not_logged_in"));
+ this.$oauthWarning.show();
if (result.missingVars && result.missingVars.length > 0) {
this.$missingVars.show();
const missingVarsList = result.missingVars.map(v => `"${v}"`).join(", ");