From 6df261fae89928c823c0e90f491fad80366028be Mon Sep 17 00:00:00 2001 From: Vanessa Date: Tue, 26 Sep 2023 10:33:06 +0800 Subject: [PATCH] :stethoscope: --- app/src/config/account.ts | 6 +++--- app/src/index.ts | 2 +- app/src/mobile/index.ts | 2 +- app/src/mobile/settings/account.ts | 4 ++-- app/src/window/index.ts | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/config/account.ts b/app/src/config/account.ts index bbb73bf28..b44b453a2 100644 --- a/app/src/config/account.ts +++ b/app/src/config/account.ts @@ -200,7 +200,7 @@ ${renewHTML} fetchPost("/api/setting/getCloudUser", { token: window.siyuan.user.userToken, }, response => { - window.siyuan.user = response.data; + window.siyuan.user = response.data || {}; element.innerHTML = account.genHTML(); account.bindEvent(element); showMessage(window.siyuan.languages.refreshUser, 3000); @@ -211,7 +211,7 @@ ${renewHTML} element.querySelector("#logout").addEventListener("click", () => { fetchPost("/api/setting/logoutCloudUser", {}, () => { fetchPost("/api/setting/getCloudUser", {}, response => { - window.siyuan.user = response.data; + window.siyuan.user = response.data || {}; element.innerHTML = account.genHTML(); account.bindEvent(element); account.onSetaccount(); @@ -383,7 +383,7 @@ ${renewHTML} }); }, _afterLogin(userResponse: IWebSocketData, element: Element) { - window.siyuan.user = userResponse.data; + window.siyuan.user = userResponse.data || {}; processSync(); element.innerHTML = account.genHTML(); account.bindEvent(element); diff --git a/app/src/index.ts b/app/src/index.ts index 074a85b60..aba5dd6f2 100644 --- a/app/src/index.ts +++ b/app/src/index.ts @@ -168,7 +168,7 @@ export class App { window.siyuan.menus = new Menus(this); bootSync(); fetchPost("/api/setting/getCloudUser", {}, userResponse => { - window.siyuan.user = userResponse.data; + window.siyuan.user = userResponse.data || {}; onGetConfig(response.data.start, this); account.onSetaccount(); setTitle(window.siyuan.languages.siyuanNote); diff --git a/app/src/mobile/index.ts b/app/src/mobile/index.ts index 9c262cbf0..6e4ce88f2 100644 --- a/app/src/mobile/index.ts +++ b/app/src/mobile/index.ts @@ -89,7 +89,7 @@ class App { initMessage(); initAssets(); fetchPost("/api/setting/getCloudUser", {}, userResponse => { - window.siyuan.user = userResponse.data; + window.siyuan.user = userResponse.data || {}; fetchPost("/api/system/getEmojiConf", {}, emojiResponse => { window.siyuan.emojis = emojiResponse.data as IEmoji[]; setNoteBook(() => { diff --git a/app/src/mobile/settings/account.ts b/app/src/mobile/settings/account.ts index ba08f7323..ba3ba09c6 100644 --- a/app/src/mobile/settings/account.ts +++ b/app/src/mobile/settings/account.ts @@ -76,7 +76,7 @@ export const showAccountInfo = () => { fetchPost("/api/setting/getCloudUser", { token: window.siyuan.user.userToken, }, response => { - window.siyuan.user = response.data; + window.siyuan.user = response.data || {}; showMessage(window.siyuan.languages.refreshUser, 3000); showAccountInfo(); const menuAccountElement = document.getElementById("menuAccount"); @@ -169,7 +169,7 @@ const afterLogin = (response: IWebSocketData, deactive = false) => { fetchPost("/api/setting/getCloudUser", { token: response.data.token, }, response => { - window.siyuan.user = response.data; + window.siyuan.user = response.data || {}; closePanel(); document.getElementById("menuAccount").innerHTML = ` ${window.siyuan.user.userName}`; diff --git a/app/src/window/index.ts b/app/src/window/index.ts index c9fd8f451..f39198663 100644 --- a/app/src/window/index.ts +++ b/app/src/window/index.ts @@ -134,7 +134,7 @@ class App { window.siyuan.languages = lauguages; window.siyuan.menus = new Menus(this); fetchPost("/api/setting/getCloudUser", {}, userResponse => { - window.siyuan.user = userResponse.data; + window.siyuan.user = userResponse.data || {}; init(this); setTitle(window.siyuan.languages.siyuanNote); initMessage();