diff --git a/web/public/theme/venix/js/auth.js b/web/public/theme/venix/js/auth.js index bcb4dae0..4ae01874 100644 --- a/web/public/theme/venix/js/auth.js +++ b/web/public/theme/venix/js/auth.js @@ -9,18 +9,23 @@ return window.VenixUserCopy.text(key, parameters || {}); } - function localizedMessage(value, fallback) { - var message = String(value || "").trim(); - return message || fallback || copy("auth.message.request_failed"); - } - function showMessage(form, type, text) { var message = findMessage(form); if (!message) return; message.className = "auth-message is-visible " + (type || "success"); var fallback = copy(type === "success" ? "auth.message.completed" : "auth.message.request_failed"); - message.textContent = localizedMessage(text, fallback); + var safeText = typeof text === "string" ? text.trim() : ""; + message.textContent = safeText || fallback; + } + + function errorMessage(error, fallbackKey) { + var key = error && typeof error.copyKey === "string" + ? error.copyKey : (fallbackKey || "auth.message.request_failed"); + var parameters = error && error.copyParameters + && typeof error.copyParameters === "object" + ? error.copyParameters : {}; + return copy(key, parameters); } function setLoading(button, loadingText) { @@ -57,21 +62,17 @@ } if (!response.ok) { - var serverMessage = payload && typeof payload === "object" - ? (payload.msg || payload.message || payload.error) - : ""; - var message = typeof serverMessage === "string" && serverMessage.trim() - ? serverMessage.trim().slice(0, 500) - : copy("auth.message.request_http_failed", { status: response.status }); - var error = new Error(message); + var error = new Error(); error.status = response.status; - error.data = payload; + error.copyKey = "auth.message.request_http_failed"; + error.copyParameters = { status: response.status }; throw error; } if (!payload || typeof payload !== "object") { - var formatError = new Error(copy("auth.message.response_invalid")); + var formatError = new Error(); formatError.status = response.status; + formatError.copyKey = "auth.message.response_invalid"; throw formatError; } return payload; @@ -123,6 +124,6 @@ refreshCaptcha: refreshCaptcha, countdown: countdown, blockWeixin: blockWeixin, - localizedMessage: localizedMessage + errorMessage: errorMessage }; })(); diff --git a/web/resources/views/venix/auth/login.tpl b/web/resources/views/venix/auth/login.tpl index 15c5011f..165fb6bf 100644 --- a/web/resources/views/venix/auth/login.tpl +++ b/web/resources/views/venix/auth/login.tpl @@ -91,7 +91,7 @@ gacode: fieldValue('gacode') }).then(function (data) { if (data.ret == 1) { - VenixAuth.showMessage(loginForm, 'success', data.msg || VenixUserCopy.text('auth.login.welcome')); + VenixAuth.showMessage(loginForm, 'success', VenixUserCopy.text('auth.login.welcome')); window.setTimeout(function () { window.location.href = '/user/'; }, 700); @@ -101,7 +101,10 @@ if (data.need_email_verify == 1) { verifyBox.style.display = 'grid'; if (gaVerifyBox) gaVerifyBox.style.display = 'none'; - VenixAuth.showMessage(loginForm, fieldValue('emailcode') ? 'error' : 'warning', data.msg); + VenixAuth.showMessage(loginForm, fieldValue('emailcode') ? 'error' : 'warning', + VenixUserCopy.text(fieldValue('emailcode') + ? 'auth.login.error.email_code_invalid' + : 'auth.login.email_verification_required')); done(); return; } @@ -109,16 +112,19 @@ if (data.need_ga_verify == 1) { if (verifyBox) verifyBox.style.display = 'none'; if (gaVerifyBox) gaVerifyBox.style.display = 'grid'; - VenixAuth.showMessage(loginForm, fieldValue('gacode') ? 'error' : 'warning', data.msg); + VenixAuth.showMessage(loginForm, fieldValue('gacode') ? 'error' : 'warning', + VenixUserCopy.text(fieldValue('gacode') + ? 'auth.login.error.authenticator_invalid' + : 'auth.login.authenticator_required')); done(); return; } - VenixAuth.showMessage(loginForm, 'error', data.msg); + VenixAuth.showMessage(loginForm, 'error', VenixUserCopy.text('auth.message.request_failed')); VenixAuth.refreshCaptcha(); done(); }).catch(function (error) { - VenixAuth.showMessage(loginForm, 'error', error.message); + VenixAuth.showMessage(loginForm, 'error', VenixAuth.errorMessage(error)); done(); }); } @@ -133,19 +139,24 @@ if (data.need_ga_verify == 1) { if (verifyBox) verifyBox.style.display = 'none'; if (gaVerifyBox) gaVerifyBox.style.display = 'grid'; - VenixAuth.showMessage(loginForm, 'warning', data.msg); + VenixAuth.showMessage(loginForm, 'warning', VenixUserCopy.text('auth.login.authenticator_required')); done(); return; } - VenixAuth.showMessage(loginForm, data.ret == 1 ? 'success' : 'error', data.msg); + VenixAuth.showMessage(loginForm, data.ret == 1 ? 'success' : 'error', + VenixUserCopy.text(data.ret == 1 + ? 'auth.login.verify.sent' + : (data.retry_after > 0 + ? 'auth.login.verify.retry_later' + : 'auth.login.verify.send_failed'))); if (data.ret == 1 || data.retry_after > 0) { VenixAuth.countdown(verifyButton, data.retry_after > 0 ? data.retry_after : 60, sendLoginVerifyText); } else { done(); } }).catch(function (error) { - VenixAuth.showMessage(loginForm, 'error', error.message); + VenixAuth.showMessage(loginForm, 'error', VenixAuth.errorMessage(error)); done(); }); } diff --git a/web/resources/views/venix/auth/register.tpl b/web/resources/views/venix/auth/register.tpl index b13821d4..fcb26a45 100644 --- a/web/resources/views/venix/auth/register.tpl +++ b/web/resources/views/venix/auth/register.tpl @@ -154,18 +154,18 @@ accept_legal: {if $tos_reg == 'true'}document.getElementById('accept_legal').checked ? 'true' : 'false'{else}'false'{/if} }).then(function (data) { if (data.ret == 1) { - VenixAuth.showMessage(registerForm, 'success', data.msg || VenixUserCopy.text('auth.register.success')); + VenixAuth.showMessage(registerForm, 'success', VenixUserCopy.text('auth.register.success')); window.setTimeout(function () { window.location.href = '/auth/login'; }, 900); return; } - VenixAuth.showMessage(registerForm, 'error', data.msg); + VenixAuth.showMessage(registerForm, 'error', VenixUserCopy.text('auth.register.error.failed')); VenixAuth.refreshCaptcha(); done(); }).catch(function (error) { - VenixAuth.showMessage(registerForm, 'error', error.message); + VenixAuth.showMessage(registerForm, 'error', VenixAuth.errorMessage(error)); done(); }); } @@ -181,14 +181,17 @@ VenixAuth.post('/auth/send', { email: fieldValue('email') }).then(function (data) { - VenixAuth.showMessage(registerForm, data.ret ? 'success' : 'error', data.msg); + VenixAuth.showMessage(registerForm, data.ret ? 'success' : 'error', + VenixUserCopy.text(data.ret + ? 'auth.register.verify.sent' + : 'auth.login.verify.send_failed')); if (data.ret) { VenixAuth.countdown(emailButton, 60, emailButtonText); } else { done(); } }).catch(function (error) { - VenixAuth.showMessage(registerForm, 'error', error.message); + VenixAuth.showMessage(registerForm, 'error', VenixAuth.errorMessage(error)); done(); }); }); diff --git a/web/resources/views/venix/password/reset.tpl b/web/resources/views/venix/password/reset.tpl index 2939f1f3..9f1e994a 100644 --- a/web/resources/views/venix/password/reset.tpl +++ b/web/resources/views/venix/password/reset.tpl @@ -61,13 +61,16 @@ email: fieldValue('email'), captch: fieldValue('captch') }).then(function (data) { - VenixAuth.showMessage(resetForm, data.ret == 1 ? 'success' : 'error', data.msg); + VenixAuth.showMessage(resetForm, data.ret == 1 ? 'success' : 'error', + VenixUserCopy.text(data.ret == 1 + ? 'auth.password.request.sent' + : 'auth.password.error.send_failed')); if (data.ret != 1) { VenixAuth.refreshCaptcha(); } done(); }).catch(function (error) { - VenixAuth.showMessage(resetForm, 'error', error.message); + VenixAuth.showMessage(resetForm, 'error', VenixAuth.errorMessage(error)); done(); }); }); diff --git a/web/resources/views/venix/password/token.tpl b/web/resources/views/venix/password/token.tpl index 77902f84..db8048ca 100644 --- a/web/resources/views/venix/password/token.tpl +++ b/web/resources/views/venix/password/token.tpl @@ -50,17 +50,17 @@ repasswd: fieldValue('repasswd') }).then(function (data) { if (data.ret) { - VenixAuth.showMessage(resetForm, 'success', data.msg); + VenixAuth.showMessage(resetForm, 'success', VenixUserCopy.text('auth.password.reset_success')); window.setTimeout(function () { window.location.href = '/auth/login'; }, {$config['jump_delay']}); return; } - VenixAuth.showMessage(resetForm, 'error', data.msg); + VenixAuth.showMessage(resetForm, 'error', VenixUserCopy.text('auth.password.error.reset_failed')); done(); }).catch(function (error) { - VenixAuth.showMessage(resetForm, 'error', error.message); + VenixAuth.showMessage(resetForm, 'error', VenixAuth.errorMessage(error)); done(); }); });