From af7e2edbf072298e7f27097a609d78e744843ddf Mon Sep 17 00:00:00 2001 From: Matt Gibson Date: Thu, 4 Feb 2021 13:08:16 -0600 Subject: [PATCH] Implement disable send policy (#819) * Implement disable send policy * Update jslib reference * PR review * Lower case enterprise policy --- jslib | 2 +- .../manage/policies.component.ts | 7 ++++ .../manage/policy-edit.component.html | 3 ++ src/app/send/add-edit.component.html | 33 +++++++++++-------- src/app/send/add-edit.component.ts | 6 ++-- src/app/send/send.component.html | 10 +++++- src/app/send/send.component.ts | 12 +++++-- src/locales/en/messages.json | 20 ++++++++++- 8 files changed, 73 insertions(+), 20 deletions(-) diff --git a/jslib b/jslib index 859f317d591..deabffb7b0a 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 859f317d59189d223072a406bc2d6924e1fb71bc +Subproject commit deabffb7b0aaf9873b212f9962158fc312c4f271 diff --git a/src/app/organizations/manage/policies.component.ts b/src/app/organizations/manage/policies.component.ts index 14df95f8537..81d5aa0d0b6 100644 --- a/src/app/organizations/manage/policies.component.ts +++ b/src/app/organizations/manage/policies.component.ts @@ -102,6 +102,13 @@ export class PoliciesComponent implements OnInit { enabled: false, display: true, }, + { + name: this.i18nService.t('disableSend'), + description: this.i18nService.t('disableSendPolicyDesc'), + type: PolicyType.DisableSend, + enabled: false, + display: true, + }, ]; await this.load(); diff --git a/src/app/organizations/manage/policy-edit.component.html b/src/app/organizations/manage/policy-edit.component.html index 02f9313b99a..91f78721ffd 100644 --- a/src/app/organizations/manage/policy-edit.component.html +++ b/src/app/organizations/manage/policy-edit.component.html @@ -32,6 +32,9 @@ {{'personalOwnershipExemption' | i18n}} + + {{'disableSendExemption' | i18n}} +
+ + {{'sendDisabledWarning' | i18n}} +
@@ -21,7 +24,7 @@
- +
@@ -29,12 +32,12 @@
+ class="form-control" [readOnly]="disableSend">
+ id="text-hidden" name="Text.Hidden" [disabled]="disableSend">
@@ -48,7 +51,7 @@
- + {{'maxFileSize' | i18n}}
@@ -64,11 +67,11 @@ + placeholder="MM/DD/YYYY HH:MM AM/PM" [readOnly]="disableSend">
+ [(ngModel)]="deletionDate" required placeholder="MM/DD/YYYY HH:MM AM/PM" [readOnly]="disableSend">
{{'deletionDateDesc' | i18n}}
@@ -87,11 +90,11 @@ + *ngIf="expirationDateSelect === 0" placeholder="MM/DD/YYYY HH:MM AM/PM" [readOnly]="disableSend">
+ [(ngModel)]="expirationDate" placeholder="MM/DD/YYYY HH:MM AM/PM" [readOnly]="disableSend">
{{'expirationDateDesc' | i18n}}
@@ -100,7 +103,7 @@
+ [(ngModel)]="send.maxAccessCount" min="1" [readOnly]="disableSend">
{{'maxAccessCountDesc' | i18n}}
@@ -114,19 +117,20 @@ + [(ngModel)]="password" [readOnly]="disableSend">
{{'sendPasswordDesc' | i18n}}
- +
{{'sendNotesDesc' | i18n}}
+ name="Disabled" [disabled]="disableSend">
@@ -137,7 +141,10 @@
- + diff --git a/src/app/send/add-edit.component.ts b/src/app/send/add-edit.component.ts index eb10f43208f..3843789e99d 100644 --- a/src/app/send/add-edit.component.ts +++ b/src/app/send/add-edit.component.ts @@ -6,6 +6,7 @@ import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { I18nService } from 'jslib/abstractions/i18n.service'; import { MessagingService } from 'jslib/abstractions/messaging.service'; import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; +import { PolicyService } from 'jslib/abstractions/policy.service'; import { SendService } from 'jslib/abstractions/send.service'; import { UserService } from 'jslib/abstractions/user.service'; @@ -19,7 +20,8 @@ export class AddEditComponent extends BaseAddEditComponent { constructor(i18nService: I18nService, platformUtilsService: PlatformUtilsService, environmentService: EnvironmentService, datePipe: DatePipe, sendService: SendService, userService: UserService, - messagingService: MessagingService) { - super(i18nService, platformUtilsService, environmentService, datePipe, sendService, userService, messagingService); + messagingService: MessagingService, policyService: PolicyService) { + super(i18nService, platformUtilsService, environmentService, datePipe, sendService, userService, + messagingService, policyService); } } diff --git a/src/app/send/send.component.html b/src/app/send/send.component.html index 1341c9c93b0..04d093b2449 100644 --- a/src/app/send/send.component.html +++ b/src/app/send/send.component.html @@ -1,4 +1,12 @@
+
+
+ {{'sendDisabled' | i18n}} +
+
+ {{'sendDisabledWarning' | i18n}} +
+
@@ -45,7 +53,7 @@
-
diff --git a/src/app/send/send.component.ts b/src/app/send/send.component.ts index fbb4d1a01d0..ba8930ca0c2 100644 --- a/src/app/send/send.component.ts +++ b/src/app/send/send.component.ts @@ -19,6 +19,8 @@ import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { SendService } from 'jslib/abstractions/send.service'; import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; +import { PolicyService } from 'jslib/abstractions/policy.service'; +import { SearchService, UserService } from 'jslib/abstractions'; @Component({ selector: 'app-send', @@ -31,12 +33,18 @@ export class SendComponent extends BaseSendComponent { constructor(sendService: SendService, i18nService: I18nService, platformUtilsService: PlatformUtilsService, environmentService: EnvironmentService, - broadcasterService: BroadcasterService, ngZone: NgZone, + broadcasterService: BroadcasterService, ngZone: NgZone, searchService: SearchService, + policyService: PolicyService, userService: UserService, private componentFactoryResolver: ComponentFactoryResolver) { - super(sendService, i18nService, platformUtilsService, environmentService, broadcasterService, ngZone); + super(sendService, i18nService, platformUtilsService, environmentService, broadcasterService, ngZone, + searchService, policyService, userService); } addSend() { + if (this.disableSend) { + return; + } + const component = this.editSend(null); component.type = this.type; } diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json index 769c1c505ea..5e250d1d1bb 100644 --- a/src/locales/en/messages.json +++ b/src/locales/en/messages.json @@ -3560,7 +3560,25 @@ "message": "Organization Owners and Administrators are exempt from this policy's enforcement." }, "personalOwnershipSubmitError": { - "message": "Due to an Enterprise Policy, you are restricted from saving items to your personal vault. Change the Ownership option to an organization and choose from available Collections." + "message": "Due to an enterprise policy, you are restricted from saving items to your personal vault. Change the Ownership option to an organization and choose from available Collections." + }, + "disableSend": { + "message": "Disable Send" + }, + "disableSendPolicyDesc": { + "message": "Do not allow users to create or edit a Bitwarden Send. Deleting an existing Send is still allowed.", + "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." + }, + "disableSendExemption": { + "message": "Organization users that can manage the organization's policies are exempt from this policy's enforcement." + }, + "sendDisabled": { + "message": "Send disabled", + "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." + }, + "sendDisabledWarning": { + "message": "Due to an enterprise policy, you are only able to delete an existing Send.", + "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "modifiedPolicyId": { "message": "Modified policy $ID$.",