Another round of typecheck (take #2)

Signed-off-by: Eric Le Ponner <eric.leponner@icloud.com>

Author: ericleponner

back-end/apps/api/src/auth/auth.service.ts

@@ -66,7 +66,9 @@ export class AuthService {
 
     this.logger.log(`User ${user.id} registered and temporary password generated.`);
 
-    emitUserRegistrationEmail(this.notificationsPublisher, [{ email: user.email, additionalData: { url, tempPassword, downloadUrl } }]);
+    emitUserRegistrationEmail(this.notificationsPublisher, [
+      { email: user.email, additionalData: { url, tempPassword, downloadUrl } },
+    ]);
 
     return user;
   }
@@ -89,7 +91,10 @@ export class AuthService {
     if (!correct) throw new BadRequestException(ErrorCodes.INOP);
 
     if (user.status === UserStatus.NEW && user.keys.length === 0) {
-      emitUserStatusUpdateNotifications(this.notificationsPublisher, { entityId: user.id, additionalData: { username: user.email } });
+      emitUserStatusUpdateNotifications(this.notificationsPublisher, {
+        entityId: user.id,
+        additionalData: { username: user.email },
+      });
     }
 
     await this.usersService.setPassword(user, newPassword);
@@ -104,12 +109,17 @@ export class AuthService {
     // A legitimate new request always gets a clean slate of attempts, and
     // replaces whatever code (if any) was previously pending.
     await this.otpStoreService.resetFailedAttempts(user.email);
-    if (!secret) return null;
 
     const otp = this.generateOtp();
-    await this.otpStoreService.storeCodeHash(user.email, this.hashOtp(otp), this.getOtpWindowSeconds());
+    await this.otpStoreService.storeCodeHash(
+      user.email,
+      this.hashOtp(otp),
+      this.getOtpWindowSeconds(),
+    );
 
-    await emitUserPasswordResetEmail(this.notificationsPublisher, [{ email: user.email, additionalData: { otp } }]);
+    await emitUserPasswordResetEmail(this.notificationsPublisher, [
+      { email: user.email, additionalData: { otp } },
+    ]);
 
     // @deprecated This JWT proves nothing on its own (see OtpJwtStrategy) - it's
     // only issued so pre-existing clients that still send it back as the `otp`
@@ -118,7 +128,7 @@ export class AuthService {
     // pair, not this token.
     const token = this.getOtpToken(
       { email: user.email, verified: false },
-      this.configService.get<number>('OTP_EXPIRATION'),
+      this.configService.get<number>('OTP_EXPIRATION') ?? 2,
     );
     return { token };
   }
@@ -137,7 +147,7 @@ export class AuthService {
 
     // Atomically checks-and-deletes so the same code can never be redeemed twice,
     // even by two requests racing each other.
-    const matched = await this.otpStoreService.consumeCodeHashIfMatch(email, tokenHash) ?? '';
+    const matched = await this.otpStoreService.consumeCodeHashIfMatch(email, tokenHash);
 
     if (!matched) {
       const attempts = await this.otpStoreService.registerFailedAttempt(email, windowSeconds);
@@ -207,18 +217,18 @@ export class AuthService {
    * the failed-attempt counter, since it doesn't need to outlive the code it's
    * protecting. */
   private getOtpWindowSeconds(): number {
-    return this.configService.get<number>('OTP_EXPIRATION') * 60;
+    return this.configService.get<number>('OTP_EXPIRATION')! * 60;
   }
 
   private getOtpMaxAttempts(): number {
-    return this.configService.get<number>('OTP_MAX_ATTEMPTS');
+    return this.configService.get<number>('OTP_MAX_ATTEMPTS')!;
   }
 
   /* How long the verified OTP JWT stays valid, in minutes. Independent of the
    * guessing window above - by this point the code is already spent, so this is
    * just giving the user reasonable time to submit their new password. */
   private getOtpVerifiedExpirationMinutes(): number {
-    return this.configService.get<number>('OTP_VERIFIED_EXPIRATION');
+    return this.configService.get<number>('OTP_VERIFIED_EXPIRATION')!;
   }
 
   /* Sets the OTP jwt */