fixes

Author: AlbanSdl

web/.env.dist

@@ -8,5 +8,6 @@ JWT_EXPIRES_IN=7y
 SESAME_LENGTH=4
 SENTRY_DSN=
 TIME_BEFORE_CHEST_DEATH=3600
+CODE_LIFETIME=300
 TOTAL_JOYCONS=4
-API_KEY=test
+API_KEY=test

web/src/apiRouter.ts

@@ -1,12 +1,15 @@
-import {Request, Response, Router} from "express";
-import {prisma} from "./prisma";
+import { Request, Response, Router } from "express";
+import { prisma } from "./prisma";
 import logger from "./logger";
-import {generateCode, setLastTimeChestWasAlive} from "./utils";
+import { CODE_LIFETIME, generateCode, setLastTimeChestWasAlive } from "./utils";
 
 const apiRouter = Router();
 
 apiRouter.use((request: Request, response: Response, next) => {
-  if (!request.headers['Authorisation'] || request.headers['Authorisation'] !== `Bearer ${process.env.API_KEY}`) {
+  if (
+    !request.headers["Authorization"] ||
+    request.headers["Authorization"] !== `Bearer ${process.env.API_KEY}`
+  ) {
     return response.status(403).send("Invalid API Key");
   }
   return next();
@@ -25,7 +28,7 @@ apiRouter.post("/sesame", async (request: Request, response: Response) => {
     where: {
       code: sesame,
       date: null,
-      codeGeneratedAt: new Date(Date.now() - 1000 * 60 * 5),
+      codeGeneratedAt: new Date(Date.now() - CODE_LIFETIME),
     },
     select: {
       return: {

web/src/prisma.ts

@@ -1,16 +1,17 @@
-import {PrismaClient} from "@prisma/client";
+import { PrismaClient } from "@prisma/client";
+import { CODE_LIFETIME } from "./utils";
 
 export const prisma = new PrismaClient();
 
 const validOpening = {
-  codeGeneratedAt: { gte: new Date(Date.now() - 1000 * 60 * 5) },
+  codeGeneratedAt: { gte: new Date(Date.now() - CODE_LIFETIME) },
   date: null,
-}
+};
 
 const currentlyBorrowing = {
   borrowOpening: { date: { not: null } },
   returnOpening: { date: null },
-}
+};
 
 export const prismaUtils = {
   validOpening,

web/src/utils.ts

@@ -1,6 +1,6 @@
-import {Request} from "express";
+import { Request } from "express";
 import jwt from "jsonwebtoken";
-import {prisma, prismaUtils} from "./prisma";
+import { prisma, prismaUtils } from "./prisma";
 import { Prisma } from "@prisma/client";
 
 export function authenticate(request: Request) {
@@ -34,8 +34,18 @@ export async function generateCode() {
 }
 
 export async function getJoyconsLeft() {
-  const joyconBorrows = await prisma.borrow.findMany({where: {borrowOpening: {OR: [prismaUtils.validOpening, {date: {not: null}}]}, returnOpening: {date: {not: null}}}});
-  return Number.parseInt(process.env.TOTAL_JOYCONS) - joyconBorrows.reduce((acc, borrow) => acc + borrow.joyconsTaken, 0);
+  const joyconBorrows = await prisma.borrow.findMany({
+    where: {
+      borrowOpening: {
+        OR: [prismaUtils.validOpening, { date: { not: null } }],
+      },
+      returnOpening: { date: { not: null } },
+    },
+  });
+  return (
+    Number.parseInt(process.env.TOTAL_JOYCONS) -
+    joyconBorrows.reduce((acc, borrow) => acc + borrow.joyconsTaken, 0)
+  );
 }
 
 const OPENING_INCLUDE_BEFORE_FORMATTING = {
@@ -45,30 +55,32 @@ const OPENING_INCLUDE_BEFORE_FORMATTING = {
   },
 } as const;
 
-type FormattedOpening = Omit<Prisma.OpeningGetPayload<typeof OPENING_INCLUDE_BEFORE_FORMATTING>, 'return'> & {type: 'borrow' | 'return'}
+type FormattedOpening = Omit<
+  Prisma.OpeningGetPayload<typeof OPENING_INCLUDE_BEFORE_FORMATTING>,
+  "return"
+> & { type: "borrow" | "return" };
 
-export function formatOpening(opening: Prisma.OpeningGetPayload<typeof OPENING_INCLUDE_BEFORE_FORMATTING>): FormattedOpening {
+export function formatOpening(
+  opening: Prisma.OpeningGetPayload<typeof OPENING_INCLUDE_BEFORE_FORMATTING>
+): FormattedOpening {
   if (!opening) {
     return null;
   }
   if (opening.return) {
     opening.borrow = opening.return;
     delete opening.return;
-    return {...opening, type: 'return'};
+    return { ...opening, type: "return" };
   }
   delete opening.return;
-  return {...opening, type: 'borrow'};
+  return { ...opening, type: "borrow" };
 }
 
 export async function getWaitingOpening(userLogin: string) {
   const opening = await prisma.opening.findFirst({
     where: {
       date: null,
       code: { not: null },
-      OR: [
-        { borrow: { userLogin } },
-        { return: { userLogin } },
-      ],
+      OR: [{ borrow: { userLogin } }, { return: { userLogin } }],
     },
     ...OPENING_INCLUDE_BEFORE_FORMATTING,
   });
@@ -79,10 +91,7 @@ export async function getWaitingOpeningWithValidCode(userLogin: string) {
   const opening = await prisma.opening.findFirst({
     where: {
       ...prismaUtils.validOpening,
-      OR: [
-        { borrow: { userLogin } },
-        { return: { userLogin } }
-      ]
+      OR: [{ borrow: { userLogin } }, { return: { userLogin } }],
     },
     ...OPENING_INCLUDE_BEFORE_FORMATTING,
   });
@@ -108,3 +117,5 @@ export function setLastTimeChestWasAlive(time: number) {
 export function getLastTimeChestWasAlive() {
   return lastTimeChestWasAlive;
 }
+
+export const CODE_LIFETIME = (Number(process.env.CODE_LIFETIME) || 300) * 1000;