fix: login & logout failed issue

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-weread-plugin",
 	"name": "Weread",
-	"version": "0.11.0",
+	"version": "0.11.1",
 	"minAppVersion": "0.12.0",
 	"description": "This is obsidian plugin for Tencent weread.",
 	"author": "hankzhao",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "obsidian-weread-plugin",
-	"version": "0.11.0",
+	"version": "0.11.1",
 	"description": "This is a community plugin for tencent weread (https://r.qq.com)",
 	"main": "main.ts",
 	"scripts": {
@@ -40,7 +40,7 @@
 		"@types/lodash.pickby": "^4.6.7",
 		"@types/set-cookie-parser": "^2.4.2",
 		"crypto-js": "^4.1.1",
-		"electron": "^28.1.0",
+		"electron": "^31.3.1",
 		"lodash.pickby": "^4.6.0",
 		"node-html-markdown": "^1.2.0",
 		"nunjucks": "^3.2.3",

src/components/wereadLoginModel.ts

@@ -23,6 +23,18 @@ export default class WereadLoginModel {
 		});
 
 		const session = this.modal.webContents.session;
+
+		const loginFilter = {
+			urls: ['https://weread.qq.com/api/auth/getLoginInfo?uid=*']
+		};
+
+		session.webRequest.onCompleted(loginFilter, (details) => {
+			if (details.statusCode == 200) {
+				console.log('weread login success, redirect to weread shelf');
+				this.modal.loadURL('https://weread.qq.com/web/shelf')
+			}
+		});
+
 		const filter = {
 			urls: ['https://weread.qq.com/web/user?userVid=*']
 		};

src/components/wereadLogoutModel.ts

@@ -15,15 +15,15 @@ export default class WereadLoginModel {
 			show: false
 		});
 		this.modal.once('ready-to-show', () => {
-			this.modal.setTitle('注销微信读书，右上角头像点击退出登录~');
+			this.modal.setTitle('注销微信读书，点击头像选择->退出登录');
 			this.modal.show();
 		});
 		const session = this.modal.webContents.session;
 		const filter = {
-			urls: ['https://weread.qq.com/web/logout']
+			urls: ['https://weread.qq.com/api/auth/logout']
 		};
 		session.webRequest.onCompleted(filter, (details) => {
-			if (details.statusCode == 200) {
+			if (details.statusCode == 200 || details.statusCode ==204) {
 				console.log('weread logout success, clear cookies...');
 				settingsStore.actions.clearCookies();
 				this.settingTab.display();
@@ -33,7 +33,7 @@ export default class WereadLoginModel {
 	}
 
 	async doLogout() {
-		await this.modal.loadURL('https://weread.qq.com/web/shelf/#logout');
+		await this.modal.loadURL('https://weread.qq.com');
 	}
 
 	onClose() {