From ac3e6e68cfb2daf3fc72fbb0e63d139cbae2422c Mon Sep 17 00:00:00 2001
From: greysoh <me@greysoh.dev>
Date: Sat, 4 May 2024 17:16:02 -0400
Subject: [PATCH] chore: Rename generate token.

---
 api/src/libs/{generateToken.ts => generateRandom.ts} | 6 +-----
 api/src/routes/user/create.ts                        | 6 +++---
 api/src/routes/user/login.ts                         | 4 ++--
 3 files changed, 6 insertions(+), 10 deletions(-)
 rename api/src/libs/{generateToken.ts => generateRandom.ts} (79%)

diff --git a/api/src/libs/generateToken.ts b/api/src/libs/generateRandom.ts
similarity index 79%
rename from api/src/libs/generateToken.ts
rename to api/src/libs/generateRandom.ts
index c9e3c8a..df3d7ec 100644
--- a/api/src/libs/generateToken.ts
+++ b/api/src/libs/generateRandom.ts
@@ -4,7 +4,7 @@ function getRandomInt(min: number, max: number): number {
   return Math.floor(Math.random() * (maxFloored - minCeiled) + minCeiled); // The maximum is exclusive and the minimum is inclusive
 }
 
-export function generateRandomData(length: number): string {
+export function generateRandomData(length: number = 128): string {
   let newString = "";
 
   for (let i = 0; i < length; i += 2) {
@@ -19,8 +19,4 @@ export function generateRandomData(length: number): string {
   }
 
   return newString;
-}
-
-export function generateToken() {
-  return generateRandomData(128);
 }
\ No newline at end of file
diff --git a/api/src/routes/user/create.ts b/api/src/routes/user/create.ts
index e5cc619..e41ddc9 100644
--- a/api/src/routes/user/create.ts
+++ b/api/src/routes/user/create.ts
@@ -1,7 +1,7 @@
 import { hash } from "bcrypt";
 
 import { permissionListEnabled } from "../../libs/permissions.js";
-import { generateToken } from "../../libs/generateToken.js";
+import { generateRandomData } from "../../libs/generateRandom.js";
 
 import type { RouteOptions } from "../../libs/types.js";
 
@@ -82,7 +82,7 @@ export function route(routeOptions: RouteOptions) {
 
     if (options.allowUnsafeGlobalTokens) {
       // @ts-ignore
-      userData.rootToken = generateToken();
+      userData.rootToken = generateRandomData();
       // @ts-ignore
       userData.isRootServiceAccount = true;
     }
@@ -98,7 +98,7 @@ export function route(routeOptions: RouteOptions) {
         token: userCreateResults.rootToken
       };
     } else {
-      const generatedToken = generateToken();
+      const generatedToken = generateRandomData();
 
       tokens[userCreateResults.id] = [];
 
diff --git a/api/src/routes/user/login.ts b/api/src/routes/user/login.ts
index 9702131..727d800 100644
--- a/api/src/routes/user/login.ts
+++ b/api/src/routes/user/login.ts
@@ -1,6 +1,6 @@
 import { compare } from "bcrypt";
 
-import { generateToken } from "../../libs/generateToken.js";
+import { generateRandomData } from "../../libs/generateRandom.js";
 import type { RouteOptions } from "../../libs/types.js";
 
 export function route(routeOptions: RouteOptions) {
@@ -48,7 +48,7 @@ export function route(routeOptions: RouteOptions) {
       error: "Email or password is incorrect"
     });
 
-    const token = generateToken();
+    const token = generateRandomData();
     if (!tokens[userSearch.id]) tokens[userSearch.id] = [];
     
     tokens[userSearch.id].push({