diff --git a/app/src/config/account.ts b/app/src/config/account.ts
index b44b453a2..bbb73bf28 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 aba5dd6f2..074a85b60 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 c46e9e33c..0b37fe523 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 ba3ba09c6..ba08f7323 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 = `
`;
diff --git a/app/src/util/needSubscribe.ts b/app/src/util/needSubscribe.ts
index 1a807c996..76e49ead6 100644
--- a/app/src/util/needSubscribe.ts
+++ b/app/src/util/needSubscribe.ts
@@ -12,8 +12,7 @@ export const needLogin = (tip = window.siyuan.languages.needLogin) => {
};
export const needSubscribe = (tip = window.siyuan.languages._kernel[29]) => {
- if (window.siyuan.user && (window.siyuan.user.userSiYuanProExpireTime === -1 || window.siyuan.user.userSiYuanProExpireTime > 0) ||
- window.siyuan.user.userSiYuanOneTimePayStatus === 1) {
+ if (window.siyuan.user && (window.siyuan.user.userSiYuanProExpireTime === -1 || window.siyuan.user.userSiYuanProExpireTime > 0)) {
return false;
}
if (tip) {
diff --git a/app/src/window/index.ts b/app/src/window/index.ts
index f39198663..c9fd8f451 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();