fix: do not enqueue notification if user.ID is uuid.Nil

DanielleMaywood · DanielleMaywood · commit fa9d426a74e2 · 2024-10-02T13:26:08.000Z
diff --git a/coderd/userauth.go b/coderd/userauth.go
@@ -279,10 +279,12 @@ func (api *API) postRequestOneTimePasscode(rw http.ResponseWriter, r *http.Reque
 	auditUser.OneTimePasscodeExpiresAt = sql.NullTime{Time: passcodeExpiresAt, Valid: true}
 	aReq.New = auditUser
 
-	// Send the one-time passcode to the user.
-	err = api.notifyUserRequestedOneTimePasscode(ctx, user, passcode.String())
-	if err != nil {
-		logger.Error(ctx, "unable to notify user about one-time passcode request", slog.Error(err))
+	if user.ID != uuid.Nil {
+		// Send the one-time passcode to the user.
+		err = api.notifyUserRequestedOneTimePasscode(ctx, user, passcode.String())
+		if err != nil {
+			logger.Error(ctx, "unable to notify user about one-time passcode request", slog.Error(err))
+		}
 	}
 }
 
diff --git a/coderd/userauth_test.go b/coderd/userauth_test.go
@@ -1665,7 +1665,7 @@ func TestUserForgotPassword(t *testing.T) {
 		require.Equal(t, userID, notif.Targets[0])
 	}
 
-	t.Run("CanChangeTheirPassword", func(t *testing.T) {
+	t.Run("CanChangePassword", func(t *testing.T) {
 		const newPassword = "SomeNewSecurePassword!"
 
 		t.Parallel()
@@ -1813,10 +1813,10 @@ func TestUserForgotPassword(t *testing.T) {
 		})
 		require.NoError(t, err)
 
-		require.Equal(t, 2, len(notifyEnq.Sent))
+		require.Equal(t, 1, len(notifyEnq.Sent))
 
-		notif := notifyEnq.Sent[1]
-		verifyOneTimePasscodeNotification(t, notif, uuid.Nil)
+		notif := notifyEnq.Sent[0]
+		require.NotEqual(t, notifications.TemplateUserRequestedOneTimePasscode, notif.TemplateID)
 	})
 }
 
