From 1aa708aed4669eeeeeb0e9ee49ede01dda3aec82 Mon Sep 17 00:00:00 2001
From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com>
Date: Mon, 2 Nov 2020 16:33:15 -0600
Subject: [PATCH] [GDPR] Adjusted TOS/Privacy acceptance (#684)

* initial commit for GDPR terms/privacy acceptance

* updated styling/formatting

* Fixed line break in blockquote

* removed unused submit message

* Removed variables/logic now found in superclass

* update jslib (76c0964 -> 5e50aa1)
---
 jslib                                    |  2 +-
 src/app/accounts/register.component.html | 31 +++++++++++++++---------
 src/app/accounts/register.component.ts   |  2 --
 src/locales/en/messages.json             |  8 +++---
 4 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/jslib b/jslib
index 76c09641ba..5e50aa1a19 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 76c09641ba8ef6cdbf74977a7a719b9aa099edb7
+Subproject commit 5e50aa1a195bde11fdc14e9bdf71542766fdbb8d
diff --git a/src/app/accounts/register.component.html b/src/app/accounts/register.component.html
index 4dc417e123..a2474bd19d 100644
--- a/src/app/accounts/register.component.html
+++ b/src/app/accounts/register.component.html
@@ -25,8 +25,8 @@
                                 </cite>
                             </figcaption>
                             <blockquote>
-                                "Bitwarden has become a popular choice among open-source software advocates. After using it for a
-                                few months, I can see why." - February 2020
+                                "Bitwarden has become a popular choice among open-source software advocates. After using
+                                it for a few months, I can see why." - February 2020
                             </blockquote>
                         </figure>
                     </div>
@@ -44,14 +44,15 @@
                         <p class="lead text-center mb-4" *ngIf="!layout">{{'createAccount' | i18n}}</p>
                         <div class="card d-block">
                             <div class="card-body">
-                                <app-callout title="{{'createOrganizationStep1' | i18n}}" type="info" icon="fa-thumb-tack"
-                                    *ngIf="showCreateOrgMessage">
+                                <app-callout title="{{'createOrganizationStep1' | i18n}}" type="info"
+                                    icon="fa-thumb-tack" *ngIf="showCreateOrgMessage">
                                     {{'createOrganizationCreatePersonalAccount' | i18n}}
                                 </app-callout>
                                 <div class="form-group">
                                     <label for="email">{{'emailAddress' | i18n}}</label>
                                     <input id="email" class="form-control" type="text" name="Email" [(ngModel)]="email"
-                                        required [appAutofocus]="email === ''" inputmode="email" appInputVerbatim="false">
+                                        required [appAutofocus]="email === ''" inputmode="email"
+                                        appInputVerbatim="false">
                                     <small class="form-text text-muted">{{'emailAddressDesc' | i18n}}</small>
                                 </div>
                                 <div class="form-group">
@@ -120,6 +121,19 @@
                                     <input id="hint" class="form-control" type="text" name="Hint" [(ngModel)]="hint">
                                     <small class="form-text text-muted">{{'masterPassHintDesc' | i18n}}</small>
                                 </div>
+                                <div class="form-group" *ngIf="showTerms">
+                                    <div class="form-check">
+                                        <input class="form-check-input" type="checkbox" id="acceptPolicies"
+                                            [(ngModel)]="acceptPolicies" name="AcceptPolicies">
+                                        <label class="form-check-label small text-muted" for="acceptPolicies">
+                                            {{'acceptPolicies' | i18n}}<br>
+                                            <a href="https://bitwarden.com/terms/" target="_blank"
+                                                rel="noopener">{{'termsOfService' | i18n}}</a>,
+                                            <a href="https://bitwarden.com/privacy/" target="_blank"
+                                                rel="noopener">{{'privacyPolicy' | i18n}}</a>
+                                        </label>
+                                    </div>
+                                </div>
                                 <hr>
                                 <div class="d-flex mb-2">
                                     <button type="submit" class="btn btn-primary btn-block btn-submit"
@@ -132,13 +146,6 @@
                                         {{'cancel' | i18n}}
                                     </a>
                                 </div>
-                                <small class="text-muted" *ngIf="showTerms">
-                                    {{'submitAgreePolicies' | i18n}}
-                                    <a href="https://bitwarden.com/terms/" target="_blank"
-                                        rel="noopener">{{'termsOfService' | i18n}}</a>,
-                                    <a href="https://bitwarden.com/privacy/" target="_blank"
-                                        rel="noopener">{{'privacyPolicy' | i18n}}</a>
-                                </small>
                             </div>
                         </div>
                     </div>
diff --git a/src/app/accounts/register.component.ts b/src/app/accounts/register.component.ts
index 1dc0460bc9..f19c616648 100644
--- a/src/app/accounts/register.component.ts
+++ b/src/app/accounts/register.component.ts
@@ -27,7 +27,6 @@ import { ReferenceEventRequest } from 'jslib/models/request/referenceEventReques
 })
 export class RegisterComponent extends BaseRegisterComponent {
     showCreateOrgMessage = false;
-    showTerms = true;
     layout = '';
     enforcedPolicyOptions: MasterPasswordPolicyOptions;
 
@@ -40,7 +39,6 @@ export class RegisterComponent extends BaseRegisterComponent {
         passwordGenerationService: PasswordGenerationService, private policyService: PolicyService) {
         super(authService, router, i18nService, cryptoService, apiService, stateService, platformUtilsService,
             passwordGenerationService);
-        this.showTerms = !platformUtilsService.isSelfHost();
     }
 
     getPasswordScoreAlertDisplay() {
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 9b158d309e..819886adf5 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -2810,9 +2810,11 @@
   "nothingSelected": {
     "message": "You have not selected anything."
   },
-  "submitAgreePolicies": {
-    "message": "By clicking the \"Submit\" button, you agree to the following policies:",
-    "description": "A policy is something like Terms of Service, Privacy Policy, etc."
+  "acceptPolicies": {
+    "message": "By checking this box you agree to the following:"
+  },
+  "acceptPoliciesError": {
+    "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "termsOfService": {
     "message": "Terms of Service"