diff --git a/src/App.js b/src/App.js index 720b050..acfb540 100644 --- a/src/App.js +++ b/src/App.js @@ -22,7 +22,7 @@ import chineseMessages from "./i18n/zh"; const messages = { de: germanMessages, en: englishMessages, - zh: chineseMessages + zh: chineseMessages, }; const i18nProvider = polyglotI18nProvider( locale => (messages[locale] ? messages[locale] : messages.en), diff --git a/src/components/LoginPage.js b/src/components/LoginPage.js index a3b1395..200ac1b 100644 --- a/src/components/LoginPage.js +++ b/src/components/LoginPage.js @@ -89,37 +89,36 @@ const LoginPage = ({ theme }) => { const ssoToken = localStorage.getItem("sso_ret_token"); if (retToken) { - console.log('SSO token is', retToken[1]); + console.log("SSO token is", retToken[1]); localStorage.setItem("sso_ret_token", retToken[1]); - console.log('SSO token saved. Reloading the page to prevent loging again.'); + console.log("SSO token saved. Reloading the page to prevent loging again."); window.location.href = window.location.origin; // prevent further requests } else if (ssoToken) { - const baseUrl = localStorage.getItem("sso_base_url"); - localStorage.removeItem("sso_base_url"); - localStorage.removeItem("sso_ret_token"); - if (baseUrl) { - const auth = { - base_url: baseUrl, - username: null, - password: null, - loginToken: ssoToken, - }; - console.log('Base URL is:', baseUrl); - console.log('SSO Token is:', ssoToken); - console.log('Let\'s try token login...'); - login(auth) - .catch(error => { - alert( - typeof error === "string" - ? error - : typeof error === "undefined" || !error.message - ? "ra.auth.sign_in_error" - : error.message - ); - console.error(error); - }); - } + const baseUrl = localStorage.getItem("sso_base_url"); + localStorage.removeItem("sso_base_url"); + localStorage.removeItem("sso_ret_token"); + if (baseUrl) { + const auth = { + base_url: baseUrl, + username: null, + password: null, + loginToken: ssoToken, + }; + console.log("Base URL is:", baseUrl); + console.log("SSO Token is:", ssoToken); + console.log("Let's try token login..."); + login(auth).catch(error => { + alert( + typeof error === "string" + ? error + : typeof error === "undefined" || !error.message + ? "ra.auth.sign_in_error" + : error.message + ); + console.error(error); + }); } + } const renderInput = ({ meta: { touched, error } = {}, @@ -174,7 +173,9 @@ const LoginPage = ({ theme }) => { const handleSSO = () => { localStorage.setItem("sso_base_url", ssoBaseUrl); - const ssoFullUrl = `${ssoBaseUrl}/_matrix/client/r0/login/sso/redirect?redirectUrl=${encodeURIComponent(window.location.href)}`; + const ssoFullUrl = `${ssoBaseUrl}/_matrix/client/r0/login/sso/redirect?redirectUrl=${encodeURIComponent( + window.location.href + )}`; window.location.href = ssoFullUrl; }; @@ -232,14 +233,15 @@ const LoginPage = ({ theme }) => { // setSSOUrl const authMethodUrl = `${formData.base_url}/_matrix/client/r0/login`; - let supportPass = false, supportSSO = false; + let supportPass = false, + supportSSO = false; fetchUtils .fetchJson(authMethodUrl, { method: "GET" }) .then(({ json }) => { json.flows.forEach(f => { - if (f.type === 'm.login.password') { + if (f.type === "m.login.password") { supportPass = true; - } else if (f.type === 'm.login.sso') { + } else if (f.type === "m.login.sso") { supportSSO = true; } }); diff --git a/src/i18n/zh.js b/src/i18n/zh.js index bc49bc7..157b163 100644 --- a/src/i18n/zh.js +++ b/src/i18n/zh.js @@ -38,8 +38,7 @@ export default { required_field: "需要的值 '%{field}' 未被设置。", invalid_value: "第 %{row} 行出现无效值。 '%{field}' 只可以是 'true' 或 'false'。", - unreasonably_big: - "拒绝加载过大的文件: %{size} MB", + unreasonably_big: "拒绝加载过大的文件: %{size} MB", already_in_progress: "一个导入进程已经在运行中", id_exits: "ID %{id} 已经存在", }, @@ -88,8 +87,7 @@ export default { }, results: { header: "导入结果", - total: - "共计 %{smart_count} 条记录 |||| 共计 %{smart_count} 条记录", + total: "共计 %{smart_count} 条记录 |||| 共计 %{smart_count} 条记录", successful: "%{smart_count} 条记录导入成功", skipped: "跳过 %{smart_count} 条记录", download_skipped: "下载跳过的记录",