feat: removes prefix messages from errors

passageidentity · Dec 20, 2024 · d2875df · d2875df
1 parent 175827e
commit d2875df
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 23 deletions.
diff --git a/src/classes/Auth/Auth.ts b/src/classes/Auth/Auth.ts
@@ -46,7 +46,7 @@ export class Auth extends PassageBase {
 
         const { kid } = decodeProtectedHeader(jwt);
         if (!kid) {
-            throw new Error('Could not find valid cookie for authentication. You must catch this error.');
+            throw new Error('kid missing in jwt header.');
         }
 
         const {
@@ -100,7 +100,7 @@ export class Auth extends PassageBase {
 
             return response.magicLink;
         } catch (err) {
-            throw await this.parseError(err, 'Could not create a magic link for this app');
+            throw await this.parseError(err);
         }
     }
 }
diff --git a/src/classes/User/User.spec.ts b/src/classes/User/User.spec.ts
@@ -2,6 +2,7 @@ import { User } from './User';
 import { PassageInstanceConfig } from '../PassageBase';
 import { UsersApi, ResponseError, ListPaginatedUsersResponse, Configuration } from '../../generated';
 import { PassageUser } from './types';
+import { PassageError } from '../PassageError';
 
 jest.mock('../../generated/apis');
 
@@ -39,24 +40,35 @@ describe('User class', () => {
     });
 
     it('should throw an error if get user by identifier fails', async () => {
-        usersApiMock.listPaginatedUsers.mockRejectedValue(
+        const responseError = new ResponseError(
+            {
+                status: 502,
+                json: async () => ({ code: 'error_code', error: 'Bad gateway' }),
+            } as Response,
+            'Error',
+        );
+        const passageError = await PassageError.fromResponseError(responseError);
+        usersApiMock.listPaginatedUsers.mockRejectedValue(responseError);
+
+        await expect(user.getByIdentifier('[email protected]')).rejects.toThrow(passageError);
+        await expect(user.getByIdentifier('[email protected]')).rejects.toThrow(
+            'Bad gateway',
+        );
+    });
+
+    it('should throw an error if get user by identifier returns an empty array', async () => {
+        const passageError = await PassageError.fromResponseError(
             new ResponseError(
                 {
                     status: 404,
-                    json: async () => ({ code: 'NOT_FOUND', error: 'Resource not found' }),
+                    json: async () => ({ code: 'user_not_found', error: 'User not found.' }),
                 } as Response,
                 'Error',
             ),
         );
-        await expect(user.getByIdentifier('[email protected]')).rejects.toThrow(Error);
-        await expect(user.getByIdentifier('[email protected]')).rejects.toThrow(
-            'Could not fetch user by identifier: Resource not found',
-        );
-    });
 
-    it('should throw an error if get user by identifier returns an empty array', async () => {
         usersApiMock.listPaginatedUsers.mockResolvedValue({ users: [] } as unknown as ListPaginatedUsersResponse);
-        await expect(user.getByIdentifier('[email protected]')).rejects.toThrow(Error);
+        await expect(user.getByIdentifier('[email protected]')).rejects.toThrow(passageError);
         await expect(user.getByIdentifier('[email protected]')).rejects.toThrow('User not found.');
     });
 });
diff --git a/src/classes/User/User.ts b/src/classes/User/User.ts
@@ -1,5 +1,5 @@
 import { PassageBase, PassageInstanceConfig } from '../PassageBase';
-import { TokensApi, UserDevicesApi, UsersApi, WebAuthnDevices } from '../../generated';
+import { ResponseError, TokensApi, UserDevicesApi, UsersApi, WebAuthnDevices } from '../../generated';
 import { CreateUserArgs, PassageUser, UpdateUserArgs } from './types';
 
 /**
@@ -40,7 +40,7 @@ export class User extends PassageBase {
 
             return response.user;
         } catch (err) {
-            throw await this.parseError(err, 'Could not fetch user');
+            throw await this.parseError(err);
         }
     }
 
@@ -64,12 +64,14 @@ export class User extends PassageBase {
 
             const users = response.users;
             if (!users.length) {
-                throw new Error('User not found.');
+                throw new ResponseError(
+                    new Response('{"code":"user_not_found","error":"User not found."}', { status: 404 }),
+                );
             }
 
             return this.get(users[0].id);
         } catch (err) {
-            throw await this.parseError(err, 'Could not fetch user by identifier');
+            throw await this.parseError(err);
         }
     }
 
@@ -91,7 +93,7 @@ export class User extends PassageBase {
             });
             return response.user;
         } catch (err) {
-            throw await this.parseError(err, 'Could not activate user');
+            throw await this.parseError(err);
         }
     }
 
@@ -114,7 +116,7 @@ export class User extends PassageBase {
 
             return response.user;
         } catch (err) {
-            throw await this.parseError(err, 'Could not deactivate user');
+            throw await this.parseError(err);
         }
     }
 
@@ -139,7 +141,7 @@ export class User extends PassageBase {
 
             return response.user;
         } catch (err) {
-            throw await this.parseError(err, 'Could not update user');
+            throw await this.parseError(err);
         }
     }
 
@@ -162,7 +164,7 @@ export class User extends PassageBase {
 
             return response.user;
         } catch (err) {
-            throw await this.parseError(err, 'Could not create user');
+            throw await this.parseError(err);
         }
     }
 
@@ -184,7 +186,7 @@ export class User extends PassageBase {
             });
             return true;
         } catch (err) {
-            throw await this.parseError(err, 'Could not delete user');
+            throw await this.parseError(err);
         }
     }
 
@@ -207,7 +209,7 @@ export class User extends PassageBase {
 
             return response.devices;
         } catch (err) {
-            throw await this.parseError(err, "Could not fetch user's devices:");
+            throw await this.parseError(err);
         }
     }
 
@@ -236,7 +238,7 @@ export class User extends PassageBase {
 
             return true;
         } catch (err) {
-            throw await this.parseError(err, "Could not delete user's device:");
+            throw await this.parseError(err);
         }
     }
 
@@ -258,7 +260,7 @@ export class User extends PassageBase {
             });
             return true;
         } catch (err) {
-            throw await this.parseError(err, "Could not revoke user's refresh tokens:");
+            throw await this.parseError(err);
         }
     }
 }