From 2e868c8111b7efec1d94bb653c56e7c0a3aa3556 Mon Sep 17 00:00:00 2001 From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com> Date: Mon, 30 Aug 2021 16:19:31 -0500 Subject: [PATCH] [Callout] Removed redundant code (#1131) * [Callout] ARemoved redundant code * Fixed formatting * Update jslib * Updated ul styling for policy options callout * Update jslib --- jslib | 2 +- src/app/accounts/register.component.html | 20 ++---------- src/app/accounts/register.component.ts | 20 ------------ src/app/accounts/set-password.component.html | 20 ++---------- .../update-temp-password.component.html | 20 ++---------- .../manage/reset-password.component.html | 21 ++----------- .../manage/reset-password.component.ts | 22 +------------ .../settings/change-password.component.html | 20 ++---------- .../emergency-access-takeover.component.html | 31 ++++++------------- src/scss/styles.scss | 4 +++ 10 files changed, 27 insertions(+), 153 deletions(-) diff --git a/jslib b/jslib index daa4f6f9a6..f02720a1c6 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit daa4f6f9a6dc84d6cd9a937be6b5392d2cf51eca +Subproject commit f02720a1c654adeb73d68b73bb61fcf7415041f4 diff --git a/src/app/accounts/register.component.html b/src/app/accounts/register.component.html index 038518ae38..d752d9581a 100644 --- a/src/app/accounts/register.component.html +++ b/src/app/accounts/register.component.html @@ -62,24 +62,8 @@ {{'yourNameDesc' | i18n}}
- - {{'masterPasswordPolicyInEffect' | i18n}} - +
diff --git a/src/app/accounts/register.component.ts b/src/app/accounts/register.component.ts index 3623fbd133..f2c640e217 100644 --- a/src/app/accounts/register.component.ts +++ b/src/app/accounts/register.component.ts @@ -43,26 +43,6 @@ export class RegisterComponent extends BaseRegisterComponent { passwordGenerationService, environmentService); } - getPasswordScoreAlertDisplay() { - if (this.enforcedPolicyOptions == null) { - return ''; - } - - let str: string; - switch (this.enforcedPolicyOptions.minComplexity) { - case 4: - str = this.i18nService.t('strong'); - break; - case 3: - str = this.i18nService.t('good'); - break; - default: - str = this.i18nService.t('weak'); - break; - } - return str + ' (' + this.enforcedPolicyOptions.minComplexity + ')'; - } - async ngOnInit() { const queryParamsSub = this.route.queryParams.subscribe(qParams => { this.referenceData = new ReferenceEventRequest(); diff --git a/src/app/accounts/set-password.component.html b/src/app/accounts/set-password.component.html index e3eeacd3fd..b41e5b9914 100644 --- a/src/app/accounts/set-password.component.html +++ b/src/app/accounts/set-password.component.html @@ -10,24 +10,8 @@
{{'ssoCompleteRegistration' | i18n}}
- - {{'masterPasswordPolicyInEffect' | i18n}} -
    -
  • - {{'policyInEffectMinComplexity' | i18n : getPasswordScoreAlertDisplay()}} -
    • -
  • - {{'policyInEffectMinLength' | i18n : enforcedPolicyOptions?.minLength.toString()}} -
    • -
  • - {{'policyInEffectUppercase' | i18n}}
    • -
  • - {{'policyInEffectLowercase' | i18n}}
    • -
  • - {{'policyInEffectNumbers' | i18n}}
    • -
  • - {{'policyInEffectSpecial' | i18n : '!@#$%^&*'}}
    • -
+
diff --git a/src/app/accounts/update-temp-password.component.html b/src/app/accounts/update-temp-password.component.html index 59685dee93..59d7d238d3 100644 --- a/src/app/accounts/update-temp-password.component.html +++ b/src/app/accounts/update-temp-password.component.html @@ -7,24 +7,8 @@ {{'updateMasterPasswordWarning' | i18n}}
- - {{'masterPasswordPolicyInEffect' | i18n}} -
    -
  • - {{'policyInEffectMinComplexity' | i18n : getPasswordScoreAlertDisplay()}} -
    • -
  • - {{'policyInEffectMinLength' | i18n : enforcedPolicyOptions?.minLength.toString()}} -
    • -
  • - {{'policyInEffectUppercase' | i18n}}
    • -
  • - {{'policyInEffectLowercase' | i18n}}
    • -
  • - {{'policyInEffectNumbers' | i18n}}
    • -
  • - {{'policyInEffectSpecial' | i18n : '!@#$%^&*'}}
    • -
+
diff --git a/src/app/organizations/manage/reset-password.component.html b/src/app/organizations/manage/reset-password.component.html index 7c3e708026..65491cb166 100644 --- a/src/app/organizations/manage/reset-password.component.html +++ b/src/app/organizations/manage/reset-password.component.html @@ -13,24 +13,9 @@
{{'resetPasswordLoggedOutWarning' | i18n: loggedOutWarningName}} - - {{'resetPasswordMasterPasswordPolicyInEffect' | i18n}} -
    -
  • - {{'policyInEffectMinComplexity' | i18n : getPasswordScoreAlertDisplay()}} -
    • -
  • - {{'policyInEffectMinLength' | i18n : enforcedPolicyOptions?.minLength.toString()}} -
    • -
  • - {{'policyInEffectUppercase' | i18n}}
    • -
  • - {{'policyInEffectLowercase' | i18n}}
    • -
  • - {{'policyInEffectNumbers' | i18n}}
    • -
  • - {{'policyInEffectSpecial' | i18n : '!@#$%^&*'}}
    • -
+
diff --git a/src/app/organizations/manage/reset-password.component.ts b/src/app/organizations/manage/reset-password.component.ts index 673fe30ff4..493318f709 100644 --- a/src/app/organizations/manage/reset-password.component.ts +++ b/src/app/organizations/manage/reset-password.component.ts @@ -1,5 +1,4 @@ import { - AfterViewInit, Component, EventEmitter, Input, @@ -17,6 +16,7 @@ import { PolicyService } from 'jslib-common/abstractions/policy.service'; import { EncString } from 'jslib-common/models/domain/encString'; import { MasterPasswordPolicyOptions } from 'jslib-common/models/domain/masterPasswordPolicyOptions'; import { SymmetricCryptoKey } from 'jslib-common/models/domain/symmetricCryptoKey'; + import { OrganizationUserResetPasswordRequest } from 'jslib-common/models/request/organizationUserResetPasswordRequest'; @Component({ @@ -50,26 +50,6 @@ export class ResetPasswordComponent implements OnInit { return this.name != null ? this.name : this.i18nService.t('thisUser'); } - getPasswordScoreAlertDisplay() { - if (this.enforcedPolicyOptions == null) { - return ''; - } - - let str: string; - switch (this.enforcedPolicyOptions.minComplexity) { - case 4: - str = this.i18nService.t('strong'); - break; - case 3: - str = this.i18nService.t('good'); - break; - default: - str = this.i18nService.t('weak'); - break; - } - return str + ' (' + this.enforcedPolicyOptions.minComplexity + ')'; - } - async generatePassword() { const options = (await this.passwordGenerationService.getOptions())[0]; this.newPassword = await this.passwordGenerationService.generatePassword(options); diff --git a/src/app/settings/change-password.component.html b/src/app/settings/change-password.component.html index b054586225..33b7264888 100644 --- a/src/app/settings/change-password.component.html +++ b/src/app/settings/change-password.component.html @@ -1,18 +1,5 @@ {{'loggedOutWarning' | i18n}} - - {{'masterPasswordPolicyInEffect' | i18n}} -
    -
  • - {{'policyInEffectMinComplexity' | i18n : getPasswordScoreAlertDisplay()}} -
    • -
  • - {{'policyInEffectMinLength' | i18n : enforcedPolicyOptions?.minLength.toString()}} -
    • -
  • {{'policyInEffectUppercase' | i18n}}
    • -
  • {{'policyInEffectLowercase' | i18n}}
    • -
  • {{'policyInEffectNumbers' | i18n}}
    • -
  • {{'policyInEffectSpecial' | i18n : '!@#$%^&*'}}
    • -
+
@@ -38,9 +25,8 @@
- +
diff --git a/src/app/settings/emergency-access-takeover.component.html b/src/app/settings/emergency-access-takeover.component.html index 466c9b6437..17ea9ae31c 100644 --- a/src/app/settings/emergency-access-takeover.component.html +++ b/src/app/settings/emergency-access-takeover.component.html @@ -12,33 +12,18 @@
{{'loggedOutWarning' | i18n}} - - {{'masterPasswordPolicyInEffect' | i18n}} -
    -
  • - {{'policyInEffectMinComplexity' | i18n : getPasswordScoreAlertDisplay()}} -
    • -
  • - {{'policyInEffectMinLength' | i18n : enforcedPolicyOptions?.minLength.toString()}} -
    • -
  • - {{'policyInEffectUppercase' | i18n}}
    • -
  • - {{'policyInEffectLowercase' | i18n}}
    • -
  • - {{'policyInEffectNumbers' | i18n}}
    • -
  • - {{'policyInEffectSpecial' | i18n : '!@#$%^&*'}}
    • -
+
- - + +
@@ -56,7 +41,9 @@ {{'save' | i18n}} - +
diff --git a/src/scss/styles.scss b/src/scss/styles.scss index c71abd2bf7..a3fb35de7b 100644 --- a/src/scss/styles.scss +++ b/src/scss/styles.scss @@ -758,6 +758,10 @@ app-user-billing { color: $warning; } } + + .enforced-policy-options ul { + margin-bottom: 0px; + } } .list-group-2fa {