Improve user retrieval error handling (#1734)

Part of OPS-3009.

Author: cezudas

packages/server/api/src/app/authentication/context/create-project-auth-context.ts

@@ -23,7 +23,7 @@ export async function getProjectAndToken(
   tablesRefreshToken: string;
   projectRole: ProjectMemberRole;
 }> {
-  const updatedUser = await userService.getOneOrFail({ id: user.id });
+  const updatedUser = await userService.getOneOrThrow({ id: user.id });
 
   const project = await projectService.getOneForUser(updatedUser);
   if (isNil(project)) {

packages/server/api/src/app/authentication/new-user/organization-assignment.ts

@@ -31,7 +31,7 @@ export async function assignDefaultOrganization(user: User): Promise<void> {
     organizationId: organization.id,
   });
 
-  const updatedUser = await userService.getOneOrFail({ id: user.id });
+  const updatedUser = await userService.getOneOrThrow({ id: user.id });
   const project = await projectService.getOneForUser(updatedUser);
 
   if (isNil(project)) {

packages/server/api/src/app/user/user-service.ts

@@ -101,8 +101,18 @@ export const userService = {
   async get({ id }: IdParams): Promise<User | null> {
     return userRepo().findOneBy({ id });
   },
-  async getOneOrFail({ id }: IdParams): Promise<User> {
-    return userRepo().findOneByOrFail({ id });
+  async getOneOrThrow({ id }: IdParams): Promise<User> {
+    const user = await this.get({ id });
+    if (isNil(user)) {
+      throw new ApplicationError({
+        code: ErrorCode.ENTITY_NOT_FOUND,
+        params: {
+          entityId: id,
+          entityType: 'user',
+        },
+      });
+    }
+    return user;
   },
 
   async getDefaultAdmin(): Promise<User | null> {
@@ -201,7 +211,7 @@ export const userService = {
       password: hashedPassword,
     });
 
-    return userService.getOneOrFail({ id });
+    return userService.getOneOrThrow({ id });
   },
 
   async updateEmail({ id, newEmail }: UpdateEmailParams): Promise<void> {

packages/server/api/test/integration/cloud/organization/organization.service.test.ts

@@ -69,7 +69,7 @@ describe('Organization Service', () => {
 
       expect(savedOrganization.id).toBe(result.id);
 
-      const savedUser = await userService.getOneOrFail({
+      const savedUser = await userService.getOneOrThrow({
         id: mockOrganization.ownerId,
       });