Change all instances of token expiry to something that actually works…

… :) (#33)
LachlanCourt · Jun 22, 2023 · 2b6bdb5 · 2b6bdb5
1 parent 5ed55e3
commit 2b6bdb5
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/src/routes/api/v1/accounts/new/index.ts b/src/routes/api/v1/accounts/new/index.ts
@@ -20,7 +20,6 @@ export const onPost: RequestHandler = async (requestEvent) => {
   const token = cryptojs.lib.WordArray.random(32).toString();
   // 24 hours
   const expiry = new Date(Date.now() + 1000 * 60 * 60 * 24);
-  console.log(expiry);
 
   await db.token.deleteMany({ where: { email, type: Tokens.ADD_NEW_ACCOUNT } });
   await db.token.create({
@@ -59,7 +58,7 @@ export const onGet: RequestHandler<Response> = async (requestEvent) => {
   const tokenData = await db.token.findFirst({ where: { token } });
   if (!tokenData) throw error(401, "Invalid Token. Error Code 2");
   const { type, expiry, email } = tokenData;
-  const expired = expiry.getTime() < Math.floor(Date.now() / 1000);
+  const expired = expiry < new Date();
   if (expired) throw error(401, "Invalid Token. Error Code 3");
   if (type !== Tokens.ADD_NEW_ACCOUNT)
     throw error(401, "Invalid Token. Error Code 4");

diff --git a/src/routes/api/v1/users/new/index.ts b/src/routes/api/v1/users/new/index.ts
@@ -16,7 +16,7 @@ export const onPost: RequestHandler<Response> = async (requestEvent) => {
   const tokenData = await db.token.findFirst({ where: { token } });
   if (!tokenData) throw error(401, "Invalid Token. Error Code 2");
   const { type, expiry, email } = tokenData;
-  const expired = expiry.getTime() < Math.floor(Date.now() / 1000);
+  const expired = expiry < new Date();
   if (expired) throw error(401, "Invalid Token. Error Code 3");
   if (type !== Tokens.ADD_NEW_USER && type !== Tokens.ADD_NEW_ACCOUNT)
     throw error(401, "Invalid Token. Error Code 4");

diff --git a/src/routes/api/v1/users/reset/index.ts b/src/routes/api/v1/users/reset/index.ts
@@ -17,7 +17,7 @@ export const onPost: RequestHandler<Response> = async (requestEvent) => {
   const tokenData = await db.token.findFirst({ where: { token } });
   if (!tokenData) throw error(401, "Invalid Token. Error Code 2");
   const { type, expiry, email } = tokenData;
-  const expired = expiry.getTime() < Math.floor(Date.now() / 1000);
+  const expired = expiry < new Date();
   if (expired) throw error(401, "Invalid Token. Error Code 3");
   if (type !== Tokens.FORGOT_PASSWORD)
     throw error(401, "Invalid Token. Error Code 4");

diff --git a/src/routes/users/new/index.tsx b/src/routes/users/new/index.tsx
@@ -12,7 +12,7 @@ export const useEndpoint = routeLoader$(async (requestEvent) => {
   const tokenData = await db.token.findFirst({ where: { token } });
   if (!tokenData) throw error(401, "Invalid Token. Error Code 2");
   const { type, expiry } = tokenData;
-  const expired = expiry.getTime() < Math.floor(Date.now() / 1000);
+  const expired = expiry < new Date();
   if (expired) throw error(401, "Invalid Token. Error Code 3");
   if (type !== Tokens.ADD_NEW_USER && type !== Tokens.ADD_NEW_ACCOUNT)
     throw error(401, "Invalid Token. Error Code 4");

diff --git a/src/routes/users/reset/index.tsx b/src/routes/users/reset/index.tsx
@@ -12,7 +12,7 @@ export const useEndpoint = routeLoader$(async (requestEvent) => {
   const tokenData = await db.token.findFirst({ where: { token } });
   if (!tokenData) throw error(401, "Invalid Token. Error Code 2");
   const { type, expiry, email } = tokenData;
-  const expired = expiry.getTime() < Math.floor(Date.now() / 1000);
+  const expired = expiry < new Date();
   if (expired) throw error(401, "Invalid Token. Error Code 3");
 
   if (type !== Tokens.FORGOT_PASSWORD)