Mastodon/Sengi-Windows-MacOS-Linux
1
0
Fork 0
mirror of https://github.com/NicolasConstant/sengi synced 2025-02-09 08:28:40 +01:00
Code Issues Releases Wiki Activity

better token renewal, fix #269

Browse Source
This commit is contained in:
Nicolas Constant 2020-04-29 22:04:39 -04:00
parent bd44586d96
commit 560147743d
No known key found for this signature in database
GPG Key ID: 1E9F677FB01A5688
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/app/services/mastodon-wrapper.service.ts
View File

@ -12,6 +12,7 @@ import { AppInfo, RegisteredAppsStateModel } from '../states/registered-apps.sta
providedIn: 'root' providedIn: 'root'
}) })
export class MastodonWrapperService { export class MastodonWrapperService {
private refreshingToken: { [id: string]: Promise<AccountInfo> } = {};
constructor( constructor(
private readonly store: Store, private readonly store: Store,
@ -19,6 +20,10 @@ export class MastodonWrapperService {
private readonly mastodonService: MastodonService) { } private readonly mastodonService: MastodonService) { }
refreshAccountIfNeeded(accountInfo: AccountInfo): Promise<AccountInfo> { refreshAccountIfNeeded(accountInfo: AccountInfo): Promise<AccountInfo> {
if(this.refreshingToken[accountInfo.id]){
return this.refreshingToken[accountInfo.id];
}
let isExpired = false; let isExpired = false;
let storedAccountInfo = this.getStoreAccountInfo(accountInfo.id); let storedAccountInfo = this.getStoreAccountInfo(accountInfo.id);
@ -47,11 +52,8 @@ export class MastodonWrapperService {
} }
if (storedAccountInfo.token.refresh_token && isExpired) { if (storedAccountInfo.token.refresh_token && isExpired) {
console.log('>>> MARTY!! ------------');
console.log('>>> RENEW TOKEN FFS ----');
const app = this.getAllSavedApps().find(x => x.instance === storedAccountInfo.instance); const app = this.getAllSavedApps().find(x => x.instance === storedAccountInfo.instance);
return this.authService.refreshToken(storedAccountInfo.instance, app.app.client_id, app.app.client_secret, storedAccountInfo.token.refresh_token) let p = this.authService.refreshToken(storedAccountInfo.instance, app.app.client_id, app.app.client_secret, storedAccountInfo.token.refresh_token)
.then((tokenData: TokenData) => { .then((tokenData: TokenData) => {
if (tokenData.refresh_token && !tokenData.created_at) { if (tokenData.refresh_token && !tokenData.created_at) {
const nowEpoch = Date.now() / 1000 | 0; const nowEpoch = Date.now() / 1000 | 0;
@ -66,6 +68,13 @@ export class MastodonWrapperService {
.catch(err => { .catch(err => {
return Promise.resolve(storedAccountInfo); return Promise.resolve(storedAccountInfo);
}); });
p.then(() => {
this.refreshingToken[accountInfo.id] = null;
});
this.refreshingToken[accountInfo.id] = p;
return p;
} else { } else {
return Promise.resolve(storedAccountInfo); return Promise.resolve(storedAccountInfo);
} }