lirent/synapse-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: lint

Browse Source
This commit is contained in:
Candinya 2021-03-22 22:28:44 +08:00
parent 5f04420ebd
commit 376f9e9f2f
3 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.js
View File

@ -22,7 +22,7 @@ import chineseMessages from "./i18n/zh";
const messages = { const messages = {
de: germanMessages, de: germanMessages,
en: englishMessages, en: englishMessages,
zh: chineseMessages zh: chineseMessages,
}; };
const i18nProvider = polyglotI18nProvider( const i18nProvider = polyglotI18nProvider(
locale => (messages[locale] ? messages[locale] : messages.en), locale => (messages[locale] ? messages[locale] : messages.en),

64
src/components/LoginPage.js
View File

@ -89,37 +89,36 @@ const LoginPage = ({ theme }) => {
const ssoToken = localStorage.getItem("sso_ret_token"); const ssoToken = localStorage.getItem("sso_ret_token");
if (retToken) { if (retToken) {
console.log('SSO token is', retToken[1]); console.log("SSO token is", retToken[1]);
localStorage.setItem("sso_ret_token", 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 window.location.href = window.location.origin; // prevent further requests
} else if (ssoToken) { } else if (ssoToken) {
const baseUrl = localStorage.getItem("sso_base_url"); const baseUrl = localStorage.getItem("sso_base_url");
localStorage.removeItem("sso_base_url"); localStorage.removeItem("sso_base_url");
localStorage.removeItem("sso_ret_token"); localStorage.removeItem("sso_ret_token");
if (baseUrl) { if (baseUrl) {
const auth = { const auth = {
base_url: baseUrl, base_url: baseUrl,
username: null, username: null,
password: null, password: null,
loginToken: ssoToken, loginToken: ssoToken,
}; };
console.log('Base URL is:', baseUrl); console.log("Base URL is:", baseUrl);
console.log('SSO Token is:', ssoToken); console.log("SSO Token is:", ssoToken);
console.log('Let\'s try token login...'); console.log("Let's try token login...");
login(auth) login(auth).catch(error => {
.catch(error => { alert(
alert( typeof error === "string"
typeof error === "string" ? error
? error : typeof error === "undefined" || !error.message
: typeof error === "undefined" || !error.message ? "ra.auth.sign_in_error"
? "ra.auth.sign_in_error" : error.message
: error.message );
); console.error(error);
console.error(error); });
});
}
} }
}
const renderInput = ({ const renderInput = ({
meta: { touched, error } = {}, meta: { touched, error } = {},
@ -174,7 +173,9 @@ const LoginPage = ({ theme }) => {
const handleSSO = () => { const handleSSO = () => {
localStorage.setItem("sso_base_url", ssoBaseUrl); 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; window.location.href = ssoFullUrl;
}; };
@ -232,14 +233,15 @@ const LoginPage = ({ theme }) => {
// setSSOUrl // setSSOUrl
const authMethodUrl = `${formData.base_url}/_matrix/client/r0/login`; const authMethodUrl = `${formData.base_url}/_matrix/client/r0/login`;
let supportPass = false, supportSSO = false; let supportPass = false,
supportSSO = false;
fetchUtils fetchUtils
.fetchJson(authMethodUrl, { method: "GET" }) .fetchJson(authMethodUrl, { method: "GET" })
.then(({ json }) => { .then(({ json }) => {
json.flows.forEach(f => { json.flows.forEach(f => {
if (f.type === 'm.login.password') { if (f.type === "m.login.password") {
supportPass = true; supportPass = true;
} else if (f.type === 'm.login.sso') { } else if (f.type === "m.login.sso") {
supportSSO = true; supportSSO = true;
} }
}); });

6
src/i18n/zh.js
View File

@ -38,8 +38,7 @@ export default {
required_field: "需要的值 '%{field}' 未被设置。", required_field: "需要的值 '%{field}' 未被设置。",
invalid_value: invalid_value:
"第 %{row} 行出现无效值。 '%{field}' 只可以是 'true' 或 'false'。", "第 %{row} 行出现无效值。 '%{field}' 只可以是 'true' 或 'false'。",
unreasonably_big: unreasonably_big: "拒绝加载过大的文件： %{size} MB",
"拒绝加载过大的文件： %{size} MB",
already_in_progress: "一个导入进程已经在运行中", already_in_progress: "一个导入进程已经在运行中",
id_exits: "ID %{id} 已经存在", id_exits: "ID %{id} 已经存在",
}, },
@ -88,8 +87,7 @@ export default {
}, },
results: { results: {
header: "导入结果", header: "导入结果",
total: total: "共计 %{smart_count} 条记录 |||| 共计 %{smart_count} 条记录",
"共计 %{smart_count} 条记录 |||| 共计 %{smart_count} 条记录",
successful: "%{smart_count} 条记录导入成功", successful: "%{smart_count} 条记录导入成功",
skipped: "跳过 %{smart_count} 条记录", skipped: "跳过 %{smart_count} 条记录",
download_skipped: "下载跳过的记录", download_skipped: "下载跳过的记录",