From 677fccab8ced28f4eeeaec535bb8ac3a65218a57 Mon Sep 17 00:00:00 2001
From: Thomas Rittson <trittson@bitwarden.com>
Date: Wed, 24 Mar 2021 09:26:59 +1000
Subject: [PATCH] Revert "Let organizations disable anonymous sends only"

This reverts commit 7877cb7751e6e765d45cf6ffbe5a684e60923b56.
---
 .../manage/policy-edit.component.html         | 19 +++----------------
 .../manage/policy-edit.component.ts           | 18 ------------------
 src/locales/en/messages.json                  | 11 +----------
 3 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/src/app/organizations/manage/policy-edit.component.html b/src/app/organizations/manage/policy-edit.component.html
index f7073664..91f78721 100644
--- a/src/app/organizations/manage/policy-edit.component.html
+++ b/src/app/organizations/manage/policy-edit.component.html
@@ -32,6 +32,9 @@
                 <app-callout type="warning" *ngIf="type === policyType.PersonalOwnership">
                     {{'personalOwnershipExemption' | i18n}}
                 </app-callout>
+                <app-callout type="warning" *ngIf="type === policyType.DisableSend">
+                    {{'disableSendExemption' | i18n}}
+                </app-callout>
                 <div class="form-group">
                     <div class="form-check">
                         <input class="form-check-input" type="checkbox" id="enabled" [(ngModel)]="enabled"
@@ -144,22 +147,6 @@
                         <label class="form-check-label" for="passGenIncludeNumber">{{'includeNumber' | i18n}}</label>
                     </div>
                 </ng-container>
-                <ng-container *ngIf="type === policyType.DisableSend">
-                    <app-callout type="warning">
-                        {{'disableSendExemption' | i18n}}
-                    </app-callout>
-                    <div class="form-group">
-                        <label>{{'disabledSendType' | i18n}}</label>
-                        <div class="form-check" *ngFor="let o of disableSendPolicyOptions">
-                            <input class="form-check-input" type="radio" [(ngModel)]="disableSend" name="Type_{{o.value}}"
-                                id="type_{{o.value}}" [value]="o.value" [checked]="disableSend === o.value"
-                                [disabled]="!enabled">
-                            <label class="form-check-label" for="type_{{o.value}}">
-                                {{o.name}}
-                            </label>
-                        </div>
-                    </div>
-                </ng-container>
             </div>
             <div class="modal-footer">
                 <button type="submit" class="btn btn-primary btn-submit" [disabled]="form.loading">
diff --git a/src/app/organizations/manage/policy-edit.component.ts b/src/app/organizations/manage/policy-edit.component.ts
index 719d8e13..90d6687a 100644
--- a/src/app/organizations/manage/policy-edit.component.ts
+++ b/src/app/organizations/manage/policy-edit.component.ts
@@ -37,7 +37,6 @@ export class PolicyEditComponent implements OnInit {
     formPromise: Promise<any>;
     passwordScores: any[];
     defaultTypes: any[];
-    disableSendPolicyOptions: any[];
 
     // Master password
 
@@ -62,10 +61,6 @@ export class PolicyEditComponent implements OnInit {
     passGenCapitalize?: boolean;
     passGenIncludeNumber?: boolean;
 
-    // Disable Send
-
-    disableSend = DisableSendType.DisableAll;
-
     private policy: PolicyResponse;
 
     constructor(private apiService: ApiService, private i18nService: I18nService,
@@ -83,10 +78,6 @@ export class PolicyEditComponent implements OnInit {
             { name: i18nService.t('password'), value: 'password' },
             { name: i18nService.t('passphrase'), value: 'passphrase' },
         ];
-        this.disableSendPolicyOptions = [
-            { name: i18nService.t('disableAllSends'), value: DisableSendType.DisableAll },
-            { name: i18nService.t('disableAnonymousSends'), value: DisableSendType.DisableAnonymous },
-        ];
     }
 
     async ngOnInit() {
@@ -123,10 +114,6 @@ export class PolicyEditComponent implements OnInit {
                             this.masterPassRequireNumbers = this.policy.data.requireNumbers;
                             this.masterPassRequireSpecial = this.policy.data.requireSpecial;
                             break;
-                        case PolicyType.DisableSend:
-                            this.disableSend = this.policy.data.disableSend ||
-                                DisableSendType.DisableAll;
-                            break;
                         default:
                             break;
                     }
@@ -173,11 +160,6 @@ export class PolicyEditComponent implements OnInit {
                         requireSpecial: this.masterPassRequireSpecial,
                     };
                     break;
-                case PolicyType.DisableSend:
-                    request.data = {
-                        disableSend: this.disableSend,
-                    };
-                    break;
                 default:
                     break;
             }
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 6b7f73b3..a3ba0478 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -3624,18 +3624,9 @@
     "message": "Disable Send"
   },
   "disableSendPolicyDesc": {
-    "message": "Do not allow users to create or edit a Bitwarden Send of a particular type. Deleting an existing Send is still allowed.",
+    "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."
   },
-  "disabledSendType": {
-    "message": "Disable these Sends"
-  },
-  "disableAllSends": {
-    "message": "Disable all Sends"
-  },
-  "disableAnonymousSends": {
-    "message": "Disable anonymous Sends only"
-  },
   "disableSendExemption": {
     "message": "Organization users that can manage the organization's policies are exempt from this policy's enforcement."
   },