From 73d57264938d241b4988cf949a360b8d75dba2f6 Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Wed, 12 Apr 2023 20:07:49 +0800
Subject: [PATCH] ui: fix signin dialog

---
 packages/ui-default/build/ver.js                     |  8 --------
 .../components/signin/signInDialog.page.js           |  2 +-
 packages/ui-default/pages/user_verify.page.ts        | 12 ++++++------
 3 files changed, 7 insertions(+), 15 deletions(-)
 delete mode 100644 packages/ui-default/build/ver.js

diff --git a/packages/ui-default/build/ver.js b/packages/ui-default/build/ver.js
deleted file mode 100644
index 895a08a2..00000000
--- a/packages/ui-default/build/ver.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const { writeFileSync } = require('fs');
-const argv = require('cac')().parse();
-const pkg = require('../package.json');
-
-if (argv.options.dev) pkg.version = `${pkg.version}-dev`;
-else pkg.version = pkg.version.replace('-dev', '');
-
-writeFileSync(`${process.cwd()}/package.json`, JSON.stringify(pkg, null, 2));
diff --git a/packages/ui-default/components/signin/signInDialog.page.js b/packages/ui-default/components/signin/signInDialog.page.js
index 911591fc..4bfef04d 100644
--- a/packages/ui-default/components/signin/signInDialog.page.js
+++ b/packages/ui-default/components/signin/signInDialog.page.js
@@ -42,7 +42,7 @@ const signinDialogPage = new AutoloadPage('signinDialogPage', null, () => {
   $('[data-lostpass]').on('click', (e) => {
     e.preventDefault();
     new InfoDialog({
-      $body: tpl`<p>${i18n('Relax and try to remember your password.')}</p>`,
+      $body: tpl.typoMsg(i18n('Relax and try to remember your password.')),
     }).open();
   });
 });
diff --git a/packages/ui-default/pages/user_verify.page.ts b/packages/ui-default/pages/user_verify.page.ts
index 0141b473..095358e0 100644
--- a/packages/ui-default/pages/user_verify.page.ts
+++ b/packages/ui-default/pages/user_verify.page.ts
@@ -72,8 +72,8 @@ async function chooseAction(authn?: boolean) {
 export default new AutoloadPage('user_verify', () => {
   $(document).on('click', '[name="login_submit"]', async (ev) => {
     ev.preventDefault();
-    const $form = ev.currentTarget.form;
-    const uname = $('[name="uname"]').val() as string;
+    const form = ev.currentTarget.form;
+    const uname = $(form).find('[name="uname"]').val() as string;
     const info = await api(gql`
       uname: user(uname:${uname}){
         tfa authn
@@ -88,13 +88,13 @@ export default new AutoloadPage('user_verify', () => {
       let action = (authn && tfa) ? await chooseAction(true) : '';
       action ||= tfa ? await chooseAction(false) : 'webauthn';
       if (action === 'webauthn') {
-        const challenge = await verifywebauthn($form);
-        if (challenge) $form['authnChallenge'].value = challenge;
+        const challenge = await verifywebauthn(form);
+        if (challenge) form['authnChallenge'].value = challenge;
         else return;
-      } else if (action === 'tfa') $form['tfa'].value = $('[name="tfa_code"]').val() as string;
+      } else if (action === 'tfa') form['tfa'].value = $('[name="tfa_code"]').val() as string;
       else return;
     }
-    $form.submit();
+    form.submit();
   });
   $(document).on('click', '[name=webauthn_verify]', async (ev) => {
     ev.preventDefault();