feat: 🥅 better error handling with edgedb's built-in errors

JitPackJoyride · Sep 27, 2023 · e310646 · e310646
1 parent 1cb5073
commit e310646
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 24 deletions.
diff --git a/src/edgedb.ts b/src/edgedb.ts
@@ -1,4 +1,8 @@
-import type { Client } from "edgedb";
+import {
+  ConstraintViolationError,
+  MissingRequiredError,
+  type Client,
+} from "edgedb";
 import type {
   Adapter,
   GlobalDatabaseSessionAttributes,
@@ -82,13 +86,9 @@ export const edgedbAdapter = (
             await keyInsertQuery.run(tx);
           });
         } catch (error) {
-          // Catch duplicate key errors
-          type ErrorCasting = { message?: string };
           if (
-            (error as ErrorCasting).message &&
-            (error as ErrorCasting).message?.includes(
-              `${modelNames.key}: key_id`
-            )
+            error instanceof ConstraintViolationError &&
+            error.message.includes(`${modelNames.key}: key_id`)
           ) {
             throw new LuciaError("AUTH_DUPLICATE_KEY_ID");
           }
@@ -169,15 +169,10 @@ export const edgedbAdapter = (
           });
           await query.run(client);
         } catch (error) {
-          // Catch invalid user id errors
-          type ErrorCasting = { message?: string };
-
           // Catch invalid user id errors
           if (
-            (error as ErrorCasting).message &&
-            (error as ErrorCasting).message?.includes(
-              `missing value for required link 'user'`
-            )
+            error instanceof MissingRequiredError &&
+            error.message.includes(`missing value for required link 'user'`)
           ) {
             throw new LuciaError("AUTH_INVALID_USER_ID");
           }
@@ -256,23 +251,18 @@ export const edgedbAdapter = (
           });
           await query.run(client);
         } catch (error) {
-          type ErrorCasting = { message?: string };
           // Catch duplicate key id error
           if (
-            (error as ErrorCasting).message &&
-            (error as ErrorCasting).message?.includes(
-              `${modelNames.key}: key_id`
-            )
+            error instanceof ConstraintViolationError &&
+            error.message.includes(`${modelNames.key}: key_id`)
           ) {
             throw new LuciaError("AUTH_DUPLICATE_KEY_ID");
           }
 
           // Catch invalid user id errors
           if (
-            (error as ErrorCasting).message &&
-            (error as ErrorCasting).message?.includes(
-              `missing value for required link 'user'`
-            )
+            error instanceof MissingRequiredError &&
+            error.message.includes(`missing value for required link 'user'`)
           ) {
             throw new LuciaError("AUTH_INVALID_USER_ID");
           }

diff --git a/src/index.ts b/src/index.ts
@@ -1 +1 @@
-export { edgedbAdapter } from "./edgedb.ts";
+export { edgedbAdapter } from "./edgedb";