[EC-177] Update Key Connector error handling (#2748)
* Update jslib, deps and messages.json
This commit is contained in:
parent
ebb66e71dd
commit
8519decb7c
|
@ -1 +1 @@
|
||||||
Subproject commit 2f54893854da61a742f87b02ec4328f7933bfe27
|
Subproject commit a6fe5c79002370d7ac8e52f2ff16154b853b7974
|
|
@ -1961,5 +1961,8 @@
|
||||||
},
|
},
|
||||||
"apiKey": {
|
"apiKey": {
|
||||||
"message": "API Key"
|
"message": "API Key"
|
||||||
|
},
|
||||||
|
"ssoKeyConnectorError": {
|
||||||
|
"message": "Key Connector error: make sure Key Connector is available and working correctly."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -163,6 +163,21 @@ export default class MainBackground {
|
||||||
|
|
||||||
constructor(public isPrivateMode: boolean = false) {
|
constructor(public isPrivateMode: boolean = false) {
|
||||||
// Services
|
// Services
|
||||||
|
const lockedCallback = async (userId?: string) => {
|
||||||
|
if (this.notificationsService != null) {
|
||||||
|
this.notificationsService.updateConnection(false);
|
||||||
|
}
|
||||||
|
await this.setIcon();
|
||||||
|
await this.refreshBadgeAndMenu(true);
|
||||||
|
if (this.systemService != null) {
|
||||||
|
await this.systemService.clearPendingClipboard();
|
||||||
|
await this.reloadProcess();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const logoutCallback = async (expired: boolean, userId?: string) =>
|
||||||
|
await this.logout(expired, userId);
|
||||||
|
|
||||||
this.messagingService = isPrivateMode
|
this.messagingService = isPrivateMode
|
||||||
? new BrowserMessagingPrivateModeBackgroundService()
|
? new BrowserMessagingPrivateModeBackgroundService()
|
||||||
: new BrowserMessagingService();
|
: new BrowserMessagingService();
|
||||||
|
@ -267,7 +282,8 @@ export default class MainBackground {
|
||||||
this.tokenService,
|
this.tokenService,
|
||||||
this.logService,
|
this.logService,
|
||||||
this.organizationService,
|
this.organizationService,
|
||||||
this.cryptoFunctionService
|
this.cryptoFunctionService,
|
||||||
|
logoutCallback
|
||||||
);
|
);
|
||||||
this.vaultFilterService = new VaultFilterService(
|
this.vaultFilterService = new VaultFilterService(
|
||||||
this.stateService,
|
this.stateService,
|
||||||
|
@ -304,21 +320,6 @@ export default class MainBackground {
|
||||||
this.i18nService
|
this.i18nService
|
||||||
);
|
);
|
||||||
|
|
||||||
const lockedCallback = async (userId?: string) => {
|
|
||||||
if (this.notificationsService != null) {
|
|
||||||
this.notificationsService.updateConnection(false);
|
|
||||||
}
|
|
||||||
await this.setIcon();
|
|
||||||
await this.refreshBadgeAndMenu(true);
|
|
||||||
if (this.systemService != null) {
|
|
||||||
await this.systemService.clearPendingClipboard();
|
|
||||||
await this.reloadProcess();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const logoutCallback = async (expired: boolean, userId?: string) =>
|
|
||||||
await this.logout(expired, userId);
|
|
||||||
|
|
||||||
this.vaultTimeoutService = new VaultTimeoutService(
|
this.vaultTimeoutService = new VaultTimeoutService(
|
||||||
this.cipherService,
|
this.cipherService,
|
||||||
this.folderService,
|
this.folderService,
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 1370006f6ea310cf85a12bcbd8213f74f9552c4d
|
Subproject commit a6fe5c79002370d7ac8e52f2ff16154b853b7974
|
|
@ -228,7 +228,8 @@ export class Main {
|
||||||
this.tokenService,
|
this.tokenService,
|
||||||
this.logService,
|
this.logService,
|
||||||
this.organizationService,
|
this.organizationService,
|
||||||
this.cryptoFunctionService
|
this.cryptoFunctionService,
|
||||||
|
async (expired: boolean) => await this.logout()
|
||||||
);
|
);
|
||||||
|
|
||||||
this.twoFactorService = new TwoFactorService(this.i18nService, this.platformUtilsService);
|
this.twoFactorService = new TwoFactorService(this.i18nService, this.platformUtilsService);
|
||||||
|
|
|
@ -40,5 +40,8 @@
|
||||||
},
|
},
|
||||||
"sessionTimeout": {
|
"sessionTimeout": {
|
||||||
"message": "Your session has timed out. Please go back and try logging in again."
|
"message": "Your session has timed out. Please go back and try logging in again."
|
||||||
|
},
|
||||||
|
"ssoKeyConnectorError": {
|
||||||
|
"message": "Key Connector error: make sure Key Connector is available and working correctly."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 2f54893854da61a742f87b02ec4328f7933bfe27
|
Subproject commit a6fe5c79002370d7ac8e52f2ff16154b853b7974
|
|
@ -1805,8 +1805,8 @@
|
||||||
"leftOrganization": {
|
"leftOrganization": {
|
||||||
"message": "You have left the organization."
|
"message": "You have left the organization."
|
||||||
},
|
},
|
||||||
"ssoKeyConnectorUnavailable": {
|
"ssoKeyConnectorError": {
|
||||||
"message": "Unable to reach the key connector, try again later."
|
"message": "Key Connector error: make sure Key Connector is available and working correctly."
|
||||||
},
|
},
|
||||||
"lockAllVaults": {
|
"lockAllVaults": {
|
||||||
"message": "Lock All Vaults"
|
"message": "Lock All Vaults"
|
||||||
|
|
Loading…
Reference in New Issue