From f239b0cd34bfd0cb907635c41104307585499808 Mon Sep 17 00:00:00 2001 From: Thomas Rittson <31796059+eliykat@users.noreply.github.com> Date: Fri, 12 Feb 2021 09:58:22 +1000 Subject: [PATCH] Improved handling of grantor access to organizations after takeover (#820) * Add emergency access warning for Owners of orgs * Add master password policy enforcement * Only show password policy if taking over an Owner * Fix linting errors * Fix code style and typos * Fix implicit 'any' type * Get grantor policies in separate api call * Update jslib --- jslib | 2 +- .../emergency-access-takeover.component.html | 19 +++++++++++++++++++ .../emergency-access-takeover.component.ts | 14 ++++++++++++-- .../settings/emergency-access.component.html | 4 ++++ .../settings/emergency-access.component.ts | 3 +++ src/locales/en/messages.json | 5 ++++- 6 files changed, 43 insertions(+), 4 deletions(-) diff --git a/jslib b/jslib index ee164bebc6..d376927e5e 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit ee164bebc65aa56e41a122eb4ece8971eb23119b +Subproject commit d376927e5e583d816e78a26168f870ac78b071c0 diff --git a/src/app/settings/emergency-access-takeover.component.html b/src/app/settings/emergency-access-takeover.component.html index 23a27703c5..b2825d078c 100644 --- a/src/app/settings/emergency-access-takeover.component.html +++ b/src/app/settings/emergency-access-takeover.component.html @@ -12,6 +12,25 @@
{{'loggedOutWarning' | i18n}} + + {{'masterPasswordPolicyInEffect' | i18n}} + +
diff --git a/src/app/settings/emergency-access-takeover.component.ts b/src/app/settings/emergency-access-takeover.component.ts index 235036c9dc..0ecbe2871a 100644 --- a/src/app/settings/emergency-access-takeover.component.ts +++ b/src/app/settings/emergency-access-takeover.component.ts @@ -19,8 +19,13 @@ import { UserService } from 'jslib/abstractions/user.service'; import { ChangePasswordComponent } from 'jslib/angular/components/change-password.component'; import { KdfType } from 'jslib/enums/kdfType'; +import { PolicyData } from 'jslib/models/data/policyData'; +import { Policy } from 'jslib/models/domain/policy'; import { SymmetricCryptoKey } from 'jslib/models/domain/symmetricCryptoKey'; import { EmergencyAccessPasswordRequest } from 'jslib/models/request/emergencyAccessPasswordRequest'; +import { ListResponse } from 'jslib/models/response'; +import { EmergencyAccessTakeoverResponse } from 'jslib/models/response/emergencyAccessResponse'; +import { PolicyResponse } from 'jslib/models/response/policyResponse'; @Component({ selector: 'emergency-access-takeover', @@ -45,8 +50,13 @@ export class EmergencyAccessTakeoverComponent extends ChangePasswordComponent im platformUtilsService, policyService); } - // tslint:disable-next-line - async ngOnInit() { } + async ngOnInit() { + const response = await this.apiService.getEmergencyGrantorPolicies(this.emergencyAccessId); + if (response.data != null && response.data.length > 0) { + const policies = response.data.map((policyResponse: PolicyResponse) => new Policy(new PolicyData(policyResponse))); + this.enforcedPolicyOptions = await this.policyService.getMasterPasswordPolicyOptions(policies); + } + } async submit() { if (!await this.strongPassword()) { diff --git a/src/app/settings/emergency-access.component.html b/src/app/settings/emergency-access.component.html index 3e9578d367..5a89f4c706 100644 --- a/src/app/settings/emergency-access.component.html +++ b/src/app/settings/emergency-access.component.html @@ -8,6 +8,10 @@

+

+ {{'warning' | i18n }}: {{'emergencyAccessOwnerWarning' | i18n}} +

+

{{'trustedEmergencyContacts' | i18n}} diff --git a/src/app/settings/emergency-access.component.ts b/src/app/settings/emergency-access.component.ts index b3838858ec..791450272f 100644 --- a/src/app/settings/emergency-access.component.ts +++ b/src/app/settings/emergency-access.component.ts @@ -36,6 +36,7 @@ export class EmergencyAccessComponent implements OnInit { emergencyAccessType = EmergencyAccessType; emergencyAccessStatusType = EmergencyAccessStatusType; actionPromise: Promise; + isOrganizationOwner: boolean; private modal: ModalComponent = null; @@ -48,6 +49,8 @@ export class EmergencyAccessComponent implements OnInit { async ngOnInit() { this.canAccessPremium = await this.userService.canAccessPremium(); + const orgs = await this.userService.getAllOrganizations(); + this.isOrganizationOwner = orgs.some(o => o.isOwner); this.load(); } diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json index 81ebfeeca3..1d44e34994 100644 --- a/src/locales/en/messages.json +++ b/src/locales/en/messages.json @@ -3424,7 +3424,10 @@ "message": "Emergency Access" }, "emergencyAccessDesc": { - "message": "Grant and manage emergency access for trusted contacts. Trusted contacts may request access to either View or Takeover your account in case of a emergency. Visit our help page for more information and details into how zero knowledge sharing works." + "message": "Grant and manage emergency access for trusted contacts. Trusted contacts may request access to either View or Takeover your account in case of an emergency. Visit our help page for more information and details into how zero knowledge sharing works." + }, + "emergencyAccessOwnerWarning": { + "message": "You are an Owner of one or more organizations. If you give takeover access to an emergency contact, they will be able to use all your permissions as Owner after a takeover." }, "trustedEmergencyContacts": { "message": "Trusted emergency contacts"