EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-3909 core: Fix unregister device if token is expired

main
Dani Palou 2021-11-15 14:30:41 +01:00
parent e86d49742a
commit 55a3c0539c
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/classes/site.ts
View File

@ -591,8 +591,7 @@ export class CoreSite {
return response; return response;
} catch (error) { } catch (error) {
if (error.errorcode == 'invalidtoken' || if (CoreUtils.isExpiredTokenError(error)) {
(error.errorcode == 'accessexception' && error.message.indexOf('Invalid token - token expired') > -1)) {
if (initialToken !== this.token && !retrying) { if (initialToken !== this.token && !retrying) {
// Token has changed, retry with the new token. // Token has changed, retry with the new token.
preSets.getFromCache = false; // Don't check cache now. Also, it will skip ongoingRequests. preSets.getFromCache = false; // Don't check cache now. Also, it will skip ongoingRequests.

8
src/core/features/pushnotifications/services/pushnotifications.ts
View File

@ -524,7 +524,13 @@ export class CorePushNotificationsProvider {
try { try {
response = await site.write<CoreUserRemoveUserDeviceWSResponse>('core_user_remove_user_device', data); response = await site.write<CoreUserRemoveUserDeviceWSResponse>('core_user_remove_user_device', data);
} catch (error) { } catch (error) {
if (CoreUtils.isWebServiceError(error)) { if (CoreUtils.isWebServiceError(error) || CoreUtils.isExpiredTokenError(error)) {
// Cannot unregister. Don't try again.
await CoreUtils.ignoreErrors(db.deleteRecords(PENDING_UNREGISTER_TABLE_NAME, {
token: site.getToken(),
siteid: site.getId(),
}));
throw error; throw error;
} }

18
src/core/services/utils/utils.ts
View File

@ -850,7 +850,7 @@ export class CoreUtilsProvider {
} }
/** /**
* Given an error returned by a WS call, check if the error is generated by the app or it has been returned by the WebSwervice. * Given an error returned by a WS call, check if the error is generated by the app or it has been returned by the WebService.
* *
* @param error Error to check. * @param error Error to check.
* @return Whether the error was returned by the WebService. * @return Whether the error was returned by the WebService.
@ -858,10 +858,22 @@ export class CoreUtilsProvider {
// eslint-disable-next-line @typescript-eslint/no-explicit-any // eslint-disable-next-line @typescript-eslint/no-explicit-any
isWebServiceError(error: any): boolean { isWebServiceError(error: any): boolean {
return error && (typeof error.warningcode != 'undefined' || (typeof error.errorcode != 'undefined' && return error && (typeof error.warningcode != 'undefined' || (typeof error.errorcode != 'undefined' &&
error.errorcode != 'invalidtoken' && error.errorcode != 'userdeleted' && error.errorcode != 'upgraderunning' && error.errorcode != 'userdeleted' && error.errorcode != 'upgraderunning' &&
error.errorcode != 'forcepasswordchangenotice' && error.errorcode != 'usernotfullysetup' && error.errorcode != 'forcepasswordchangenotice' && error.errorcode != 'usernotfullysetup' &&
error.errorcode != 'sitepolicynotagreed' && error.errorcode != 'sitemaintenance' && error.errorcode != 'sitepolicynotagreed' && error.errorcode != 'sitemaintenance' &&
(error.errorcode != 'accessexception' || error.message.indexOf('Invalid token - token expired') == -1))); !this.isExpiredTokenError(error)));
}
/**
* Given an error returned by a WS call, check if the error is a token expired error.
*
* @param error Error to check.
* @return Whether the error is a token expired error.
*/
// eslint-disable-next-line @typescript-eslint/no-explicit-any
isExpiredTokenError(error: any): boolean {
return error.errorcode === 'invalidtoken' ||
(error.errorcode === 'accessexception' && error.message.includes('Invalid token - token expired'));
} }
/** /**