self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-26 18:58:21 +02:00
Code Issues Releases Activity

All: Improved handling of expired sessions when using Joplin Server

Browse Source
This commit is contained in:
Laurent Cozic 2021-10-25 19:46:45 +01:00
parent ace1118cf1
commit 33249ca05a
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/lib/JoplinServerApi.ts
View File

@ -130,7 +130,7 @@ export default class JoplinServerApi {
return output.join(' '); return output.join(' ');
} }
public async exec(method: string, path: string = '', query: Record<string, any> = null, body: any = null, headers: any = null, options: ExecOptions = null) { private async exec_(method: string, path: string = '', query: Record<string, any> = null, body: any = null, headers: any = null, options: ExecOptions = null) {
if (headers === null) headers = {}; if (headers === null) headers = {};
if (options === null) options = {}; if (options === null) options = {};
if (!options.responseFormat) options.responseFormat = ExecOptionsResponseFormat.Json; if (!options.responseFormat) options.responseFormat = ExecOptionsResponseFormat.Json;
@ -258,12 +258,24 @@ export default class JoplinServerApi {
logger.warn(error); logger.warn(error);
} }
if (error.code === 403) {
this.session_ = null;
error.message = 'Session has expired or is invalid, please try again.';
}
throw error; throw error;
} }
} }
public async exec(method: string, path: string = '', query: Record<string, any> = null, body: any = null, headers: any = null, options: ExecOptions = null) {
for (let i = 0; i < 2; i++) {
try {
const response = await this.exec_(method, path, query, body, headers, options);
return response;
} catch (error) {
if (error.code === 403 && i === 0) {
logger.info('Session expired or invalid - trying to login again', error);
this.session_ = null; // By setting it to null, the service will try to login again
} else {
throw error;
}
}
}
}
} }