1 files changed, 3 insertions, 10 deletions
diff --git a/lib/auth.js b/lib/auth.js
index cb9a4f0d..1eca2fa5 100644
--- a/lib/auth.js
+++ b/lib/auth.js
@@ -1,6 +1,6 @@
-import migrate from "$lib/migrate";
 import fastifyPassport from "@fastify/passport";
 import { g } from "$lib/db";
+import { fail, getUser } from "$lib/utils";
 import config from "$config";
 import jwt from "passport-jwt";
 
@@ -23,7 +23,7 @@ export const auth = {
 
 export const requirePin = async ({ body, user }) => {
   if (!user || (user.pin && user.pin !== body.pin))
-    throw new Error("Invalid pin");
+    fail("Invalid pin");
 };
 
 export const jwtStrategy = new jwt.Strategy(
@@ -35,14 +35,7 @@ export const jwtStrategy = new jwt.Strategy(
     secretOrKey: config.jwt,
   },
   async (payload, next) => {
-    let user;
-    if (payload.id) {
-      let { id } = payload;
-      user = await g(`user:${id}`);
-      if (typeof user === "string") user = await g(`user:${user}`);
-      if (!user) user = migrate(id);
-    }
-
+    let user = await getUser(payload.id);
     next(null, user);
   },
 );