From dddaf336f99eb2678e5ad58d92344aec1505facc Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 7 Feb 2025 11:21:52 -0500
Subject: [PATCH 1/2] set pin validation to min length of 4

---
 apps/browser/src/auth/popup/components/set-pin.component.html | 2 +-
 apps/desktop/src/auth/components/set-pin.component.html       | 2 +-
 libs/angular/src/auth/components/set-pin.component.ts         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/browser/src/auth/popup/components/set-pin.component.html b/apps/browser/src/auth/popup/components/set-pin.component.html
index 80e1b63c7d7..dad897caedb 100644
--- a/apps/browser/src/auth/popup/components/set-pin.component.html
+++ b/apps/browser/src/auth/popup/components/set-pin.component.html
@@ -9,7 +9,7 @@
       </p>
       <bit-form-field>
         <bit-label>{{ "pin" | i18n }}</bit-label>
-        <input class="tw-font-mono" bitInput type="password" formControlName="pin" />
+        <input class="tw-font-mono" bitInput type="password" formControlName="pin" minlength="4" />
         <button type="button" bitIconButton bitSuffix bitPasswordInputToggle></button>
       </bit-form-field>
       <label
diff --git a/apps/desktop/src/auth/components/set-pin.component.html b/apps/desktop/src/auth/components/set-pin.component.html
index cadd5340bb2..a71b9ee227a 100644
--- a/apps/desktop/src/auth/components/set-pin.component.html
+++ b/apps/desktop/src/auth/components/set-pin.component.html
@@ -9,7 +9,7 @@
       </p>
       <bit-form-field>
         <bit-label>{{ "pin" | i18n }}</bit-label>
-        <input class="tw-font-mono" bitInput type="password" formControlName="pin" />
+        <input class="tw-font-mono" bitInput type="password" formControlName="pin" minlength="4" />
         <button type="button" bitIconButton bitSuffix bitPasswordInputToggle></button>
       </bit-form-field>
       <label
diff --git a/libs/angular/src/auth/components/set-pin.component.ts b/libs/angular/src/auth/components/set-pin.component.ts
index 7005f6e15c6..87e57db0b0f 100644
--- a/libs/angular/src/auth/components/set-pin.component.ts
+++ b/libs/angular/src/auth/components/set-pin.component.ts
@@ -42,7 +42,7 @@ export class SetPinComponent implements OnInit {
       "requireMasterPasswordOnClientRestart",
     ).value;
 
-    if (Utils.isNullOrWhitespace(pin)) {
+    if (Utils.isNullOrWhitespace(pin) || pin.length < 4) {
       this.dialogRef.close(false);
       return;
     }

From 4010ab70645024c734ae80f2b108c560ecffa6fb Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 13 Feb 2025 10:04:39 -0500
Subject: [PATCH 2/2] use reactive forms

---
 .../auth/popup/components/set-pin.component.html    |  2 +-
 .../src/auth/components/set-pin.component.html      |  2 +-
 .../src/auth/components/set-pin.component.ts        | 13 ++++++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/apps/browser/src/auth/popup/components/set-pin.component.html b/apps/browser/src/auth/popup/components/set-pin.component.html
index dad897caedb..80e1b63c7d7 100644
--- a/apps/browser/src/auth/popup/components/set-pin.component.html
+++ b/apps/browser/src/auth/popup/components/set-pin.component.html
@@ -9,7 +9,7 @@
       </p>
       <bit-form-field>
         <bit-label>{{ "pin" | i18n }}</bit-label>
-        <input class="tw-font-mono" bitInput type="password" formControlName="pin" minlength="4" />
+        <input class="tw-font-mono" bitInput type="password" formControlName="pin" />
         <button type="button" bitIconButton bitSuffix bitPasswordInputToggle></button>
       </bit-form-field>
       <label
diff --git a/apps/desktop/src/auth/components/set-pin.component.html b/apps/desktop/src/auth/components/set-pin.component.html
index a71b9ee227a..cadd5340bb2 100644
--- a/apps/desktop/src/auth/components/set-pin.component.html
+++ b/apps/desktop/src/auth/components/set-pin.component.html
@@ -9,7 +9,7 @@
       </p>
       <bit-form-field>
         <bit-label>{{ "pin" | i18n }}</bit-label>
-        <input class="tw-font-mono" bitInput type="password" formControlName="pin" minlength="4" />
+        <input class="tw-font-mono" bitInput type="password" formControlName="pin" />
         <button type="button" bitIconButton bitSuffix bitPasswordInputToggle></button>
       </bit-form-field>
       <label
diff --git a/libs/angular/src/auth/components/set-pin.component.ts b/libs/angular/src/auth/components/set-pin.component.ts
index 87e57db0b0f..8031c491985 100644
--- a/libs/angular/src/auth/components/set-pin.component.ts
+++ b/libs/angular/src/auth/components/set-pin.component.ts
@@ -16,7 +16,7 @@ export class SetPinComponent implements OnInit {
   showMasterPasswordOnClientRestartOption = true;
 
   setPinForm = this.formBuilder.group({
-    pin: ["", [Validators.required]],
+    pin: ["", [Validators.required, Validators.minLength(4)]],
     requireMasterPasswordOnClientRestart: true,
   });
 
@@ -37,12 +37,12 @@ export class SetPinComponent implements OnInit {
   }
 
   submit = async () => {
-    const pin = this.setPinForm.get("pin").value;
+    const pinFormControl = this.setPinForm.controls.pin;
     const requireMasterPasswordOnClientRestart = this.setPinForm.get(
       "requireMasterPasswordOnClientRestart",
     ).value;
 
-    if (Utils.isNullOrWhitespace(pin) || pin.length < 4) {
+    if (Utils.isNullOrWhitespace(pinFormControl.value) || pinFormControl.invalid) {
       this.dialogRef.close(false);
       return;
     }
@@ -50,11 +50,14 @@ export class SetPinComponent implements OnInit {
     const userId = (await firstValueFrom(this.accountService.activeAccount$))?.id;
     const userKey = await this.keyService.getUserKey();
 
-    const userKeyEncryptedPin = await this.pinService.createUserKeyEncryptedPin(pin, userKey);
+    const userKeyEncryptedPin = await this.pinService.createUserKeyEncryptedPin(
+      pinFormControl.value,
+      userKey,
+    );
     await this.pinService.setUserKeyEncryptedPin(userKeyEncryptedPin, userId);
 
     const pinKeyEncryptedUserKey = await this.pinService.createPinKeyEncryptedUserKey(
-      pin,
+      pinFormControl.value,
       userKey,
       userId,
     );