From 32e9124b9c8e7fe0c85ccfbdb72f02eb51bac0d5 Mon Sep 17 00:00:00 2001 From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com> Date: Mon, 5 Apr 2021 09:48:46 -0500 Subject: [PATCH] [Reset Password] Enrollment actions (#900) * [Reset Password] Enrollment actions * Update jslib (0951424 -> f4f00b1) * Added status icon --- jslib | 2 +- src/app/services/event.service.ts | 7 ++++ src/app/settings/organizations.component.html | 15 +++++++++ src/app/settings/organizations.component.ts | 33 ++++++++++++++++++- src/locales/en/messages.json | 33 +++++++++++++++++++ 5 files changed, 88 insertions(+), 2 deletions(-) diff --git a/jslib b/jslib index 5c734747a9..f4f00b1eb2 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 5c734747a96e3cef62ff5153d8da116559395869 +Subproject commit f4f00b1eb290eb57ee3a93043e8a44685ee51c59 diff --git a/src/app/services/event.service.ts b/src/app/services/event.service.ts index 398aaf3ab5..1eefe62222 100644 --- a/src/app/services/event.service.ts +++ b/src/app/services/event.service.ts @@ -155,6 +155,13 @@ export class EventService { break; case EventType.OrganizationUser_UnlinkedSso: msg = this.i18nService.t('unlinkedSsoUser', this.formatOrgUserId(ev)); + break; + case EventType.OrganizationUser_ResetPassword_Enroll: + msg = this.i18nService.t('eventEnrollPasswordReset', this.formatOrgUserId(ev)); + break; + case EventType.OrganizationUser_ResetPassword_Withdraw: + msg = this.i18nService.t('eventWithdrawPasswordReset', this.formatOrgUserId(ev)); + break; // Org case EventType.Organization_Updated: msg = this.i18nService.t('editedOrgSettings'); diff --git a/src/app/settings/organizations.component.html b/src/app/settings/organizations.component.html index 693d37a368..131b0b1552 100644 --- a/src/app/settings/organizations.component.html +++ b/src/app/settings/organizations.component.html @@ -65,6 +65,11 @@ title="{{'organizationIsDisabled' | i18n}}" aria-hidden="true"> {{'organizationIsDisabled' | i18n}} + + + {{'enrolledPasswordReset' | i18n}} +
@@ -74,6 +79,16 @@
+ + + {{'enrollPasswordReset' | i18n}} + + + + {{'withdrawPasswordReset' | i18n}} + diff --git a/src/app/settings/organizations.component.ts b/src/app/settings/organizations.component.ts index 2297966e90..5ef8917cba 100644 --- a/src/app/settings/organizations.component.ts +++ b/src/app/settings/organizations.component.ts @@ -8,6 +8,7 @@ import { ToasterService } from 'angular2-toaster'; import { Angulartics2 } from 'angulartics2'; import { ApiService } from 'jslib/abstractions/api.service'; +import { CryptoService } from 'jslib/abstractions/crypto.service'; import { I18nService } from 'jslib/abstractions/i18n.service'; import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { SyncService } from 'jslib/abstractions/sync.service'; @@ -17,6 +18,8 @@ import { Organization } from 'jslib/models/domain/organization'; import { Utils } from 'jslib/misc/utils'; +import { OrganizationUserResetPasswordEnrollmentRequest } from 'jslib/models/request/organizationUserResetPasswordEnrollmentRequest'; + @Component({ selector: 'app-organizations', templateUrl: 'organizations.component.html', @@ -31,7 +34,7 @@ export class OrganizationsComponent implements OnInit { constructor(private userService: UserService, private platformUtilsService: PlatformUtilsService, private i18nService: I18nService, private apiService: ApiService, private analytics: Angulartics2, private toasterService: ToasterService, - private syncService: SyncService) { } + private syncService: SyncService, private cryptoService: CryptoService) { } async ngOnInit() { if (!this.vault) { @@ -84,4 +87,32 @@ export class OrganizationsComponent implements OnInit { await this.load(); } catch { } } + + async toggleResetPasswordEnrollment(org: Organization) { + // Set variables + let keyString: string = null; + let toastStringRef = 'withdrawPasswordResetSuccess'; + + // Enroll - encrpyt user's encKey.key with organization key + if (!org.isResetPasswordEnrolled) { + const encKey = await this.cryptoService.getEncKey(); + const orgSymKey = await this.cryptoService.getOrgKey(org.id); + const encryptedKey = await this.cryptoService.encrypt(encKey.key, orgSymKey); + keyString = encryptedKey.encryptedString; + toastStringRef = 'enrollPasswordResetSuccess'; + } + + // Create/Execute request + try { + const request = new OrganizationUserResetPasswordEnrollmentRequest(); + request.resetPasswordKey = keyString; + this.actionPromise = this.apiService.putOrganizationUserResetPasswordEnrollment(org.id, org.userId, request) + .then(() => { + return this.syncService.fullSync(true); + }); + await this.actionPromise; + this.platformUtilsService.showToast('success', null, this.i18nService.t(toastStringRef)); + await this.load(); + } catch { } + } } diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json index d5a7c9137d..f587d35a4f 100644 --- a/src/locales/en/messages.json +++ b/src/locales/en/messages.json @@ -3833,5 +3833,38 @@ }, "hintEqualsPassword": { "message": "Your password hint cannot be the same as your password." + }, + "enrollPasswordReset": { + "message": "Enroll in Password Reset" + }, + "enrolledPasswordReset": { + "message": "Enrolled in Password Reset" + }, + "withdrawPasswordReset": { + "message": "Withdraw from Password Reset" + }, + "enrollPasswordResetSuccess": { + "message": "Enrollment success!" + }, + "withdrawPasswordResetSuccess": { + "message": "Withdrawal success!" + }, + "eventEnrollPasswordReset": { + "message": "User $ID$ enrolled in password reset assistance.", + "placeholders": { + "id": { + "content": "$1", + "example": "John Smith" + } + } + }, + "eventWithdrawPasswordReset": { + "message": "User $ID$ withdrew from password reset assistance.", + "placeholders": { + "id": { + "content": "$1", + "example": "John Smith" + } + } } }