Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-23 11:56:00 +01:00
Code Issues Projects Releases Wiki Activity

Show reason for invite accept failure if available (#473)

Browse Source
This commit is contained in:
Kyle Spearrin 2020-02-28 15:27:02 -05:00 committed by GitHub
parent 5c492f893b
commit e2108ff85b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/accounts/accept-organization.component.ts
View File

@ -44,6 +44,7 @@ export class AcceptOrganizationComponent implements OnInit {
fired = true; fired = true;
await this.stateService.remove('orgInvitation'); await this.stateService.remove('orgInvitation');
let error = qParams.organizationId == null || qParams.organizationUserId == null || qParams.token == null; let error = qParams.organizationId == null || qParams.organizationUserId == null || qParams.token == null;
let errorMessage: string = null;
if (!error) { if (!error) {
this.authed = await this.userService.isAuthenticated(); this.authed = await this.userService.isAuthenticated();
if (this.authed) { if (this.authed) {
@ -61,8 +62,9 @@ export class AcceptOrganizationComponent implements OnInit {
}; };
this.toasterService.popAsync(toast); this.toasterService.popAsync(toast);
this.router.navigate(['/vault']); this.router.navigate(['/vault']);
} catch { } catch (e) {
error = true; error = true;
errorMessage = e.message;
} }
} else { } else {
await this.stateService.save('orgInvitation', qParams); await this.stateService.save('orgInvitation', qParams);
@ -76,7 +78,14 @@ export class AcceptOrganizationComponent implements OnInit {
} }
if (error) { if (error) {
this.toasterService.popAsync('error', null, this.i18nService.t('inviteAcceptFailed')); const toast: Toast = {
type: 'error',
title: null,
body: errorMessage != null ? this.i18nService.t('inviteAcceptFailedShort', errorMessage) :
this.i18nService.t('inviteAcceptFailed'),
timeout: 10000,
};
this.toasterService.popAsync(toast);
this.router.navigate(['/']); this.router.navigate(['/']);
} }

9
src/locales/en/messages.json
View File

@ -2578,6 +2578,15 @@
"inviteAcceptFailed": { "inviteAcceptFailed": {
"message": "Unable to accept invitation. Ask an organization admin to send a new invitation." "message": "Unable to accept invitation. Ask an organization admin to send a new invitation."
}, },
"inviteAcceptFailedShort": {
"message": "Unable to accept invitation. $DESCRIPTION$",
"placeholders": {
"description": {
"content": "$1",
"example": "You must enable 2FA on your user account before you can join this organization."
}
}
},
"rememberEmail": { "rememberEmail": {
"message": "Remember email" "message": "Remember email"
}, },