Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-19 17:38:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

ui: fix signin dialog

Browse Source
This commit is contained in:
undefined committed 2023-04-12 20:07:49 +08:00
1 parent ba7f4b396f
commit 73d5726493
3 files changed
+7 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/ui-default/build/ver.js
-8
View File
@@ -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));
packages/ui-default/components/signin/signInDialog.page.js
+1 -1
View File
@@ -42,7 +42,7 @@ const signinDialogPage = new AutoloadPage('signinDialogPage', null, () => {
$('[data-lostpass]').on('click', (e) => { $('[data-lostpass]').on('click', (e) => {
e.preventDefault(); e.preventDefault();
new InfoDialog({ 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(); }).open();
}); });
}); });
packages/ui-default/pages/user_verify.page.ts
+6 -6
View File
@@ -72,8 +72,8 @@ async function chooseAction(authn?: boolean) {
export default new AutoloadPage('user_verify', () => { export default new AutoloadPage('user_verify', () => {
$(document).on('click', '[name="login_submit"]', async (ev) => { $(document).on('click', '[name="login_submit"]', async (ev) => {
ev.preventDefault(); ev.preventDefault();
const $form = ev.currentTarget.form; const form = ev.currentTarget.form;
const uname = $('[name="uname"]').val() as string; const uname = $(form).find('[name="uname"]').val() as string;
const info = await api(gql` const info = await api(gql`
uname: user(uname:${uname}){ uname: user(uname:${uname}){
tfa authn tfa authn
@@ -88,13 +88,13 @@ export default new AutoloadPage('user_verify', () => {
let action = (authn && tfa) ? await chooseAction(true) : ''; let action = (authn && tfa) ? await chooseAction(true) : '';
action ||= tfa ? await chooseAction(false) : 'webauthn'; action ||= tfa ? await chooseAction(false) : 'webauthn';
if (action === 'webauthn') { if (action === 'webauthn') {
const challenge = await verifywebauthn($form); const challenge = await verifywebauthn(form);
if (challenge) $form['authnChallenge'].value = challenge; if (challenge) form['authnChallenge'].value = challenge;
else return; 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; else return;
} }
$form.submit(); form.submit();
}); });
$(document).on('click', '[name=webauthn_verify]', async (ev) => { $(document).on('click', '[name=webauthn_verify]', async (ev) => {
ev.preventDefault(); ev.preventDefault();