From 881a5156bc02227c22a1d85297d5fe4720edbd86 Mon Sep 17 00:00:00 2001
From: rr-bw <102181210+rr-bw@users.noreply.github.com>
Date: Tue, 30 Dec 2025 17:29:49 -0800
Subject: [PATCH] [PM-27086] minor refactoring & comment update

---
 .../default-set-initial-password.service.implementation.ts     | 2 +-
 .../set-initial-password/set-initial-password.component.ts     | 3 ++-
 .../set-initial-password.service.abstraction.ts                | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libs/angular/src/auth/password-management/set-initial-password/default-set-initial-password.service.implementation.ts b/libs/angular/src/auth/password-management/set-initial-password/default-set-initial-password.service.implementation.ts
index d700af29282..a1cd77a4b0e 100644
--- a/libs/angular/src/auth/password-management/set-initial-password/default-set-initial-password.service.implementation.ts
+++ b/libs/angular/src/auth/password-management/set-initial-password/default-set-initial-password.service.implementation.ts
@@ -237,7 +237,7 @@ export class DefaultSetInitialPasswordService implements SetInitialPasswordServi
       throw new Error("userType not found. Could not set password.");
     }
 
-    let userKey = await firstValueFrom(this.keyService.userKey$(userId));
+    let userKey: UserKey = await firstValueFrom(this.keyService.userKey$(userId));
 
     if (userKey == null) {
       userKey = new SymmetricCryptoKey(PureCrypto.make_user_key_aes256_cbc_hmac()) as UserKey;
diff --git a/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.component.ts b/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.component.ts
index b395d4def0c..82d221b9abc 100644
--- a/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.component.ts
+++ b/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.component.ts
@@ -271,11 +271,12 @@ export class SetInitialPasswordComponent implements OnInit {
     assertTruthy(passwordInputResult.newPassword, "newPassword", ctx);
     assertTruthy(passwordInputResult.kdfConfig, "kdfConfig", ctx);
     assertTruthy(passwordInputResult.salt, "salt", ctx);
+    assertNonNullish(passwordInputResult.newPasswordHint, "newPasswordHint", ctx); // can have an empty string as a valid value, so check non-nullish
+
     assertTruthy(this.orgSsoIdentifier, "orgSsoIdentifier", ctx);
     assertTruthy(this.orgId, "orgId", ctx);
     assertTruthy(this.userType, "userType", ctx);
     assertTruthy(this.userId, "userId", ctx);
-    assertNonNullish(passwordInputResult.newPasswordHint, "newPasswordHint", ctx); // can have an empty string as a valid value, so check non-nullish
     assertNonNullish(this.resetPasswordAutoEnroll, "resetPasswordAutoEnroll", ctx); // can have `false` as a valid value, so check non-nullish
 
     try {
diff --git a/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.service.abstraction.ts b/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.service.abstraction.ts
index 8fd98c45b0a..da18c44c04e 100644
--- a/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.service.abstraction.ts
+++ b/libs/angular/src/auth/password-management/set-initial-password/set-initial-password.service.abstraction.ts
@@ -116,7 +116,7 @@ export abstract class SetInitialPasswordService {
    *
    * @param credentials An object of the credentials needed to set the initial password
    * @throws If any property on the `credentials` object is null or undefined, or if a
-   *         masterKeyEncryptedUserKey or newKeyPair could not be created.
+   *         keyPair could not be found/created for a JIT_PROVISIONED_MP_ORG_USER
    */
   abstract setInitialPassword: (
     credentials: SetInitialPasswordCredentials,