imterah/hermes
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 1 Packages Wiki Activity Actions

chore: Rename generate token.

Browse source
This commit is contained in:
greysoh 2024-05-04 17:16:02 -04:00
parent ea10669374
commit ac3e6e68cf
No known key found for this signature in database
GPG key ID: FE0F173B8FC01571
3 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
api/src/libs/generateToken.ts → api/src/libs/generateRandom.ts
View file

@ -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 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 = ""; let newString = "";
for (let i = 0; i < length; i += 2) { for (let i = 0; i < length; i += 2) {
@ -19,8 +19,4 @@ export function generateRandomData(length: number): string {
} }
return newString; return newString;
}
export function generateToken() {
return generateRandomData(128);
} }

6
api/src/routes/user/create.ts
View file

@ -1,7 +1,7 @@
import { hash } from "bcrypt"; import { hash } from "bcrypt";
import { permissionListEnabled } from "../../libs/permissions.js"; 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"; import type { RouteOptions } from "../../libs/types.js";
@ -82,7 +82,7 @@ export function route(routeOptions: RouteOptions) {
if (options.allowUnsafeGlobalTokens) { if (options.allowUnsafeGlobalTokens) {
// @ts-ignore // @ts-ignore
userData.rootToken = generateToken(); userData.rootToken = generateRandomData();
// @ts-ignore // @ts-ignore
userData.isRootServiceAccount = true; userData.isRootServiceAccount = true;
} }
@ -98,7 +98,7 @@ export function route(routeOptions: RouteOptions) {
token: userCreateResults.rootToken token: userCreateResults.rootToken
}; };
} else { } else {
const generatedToken = generateToken(); const generatedToken = generateRandomData();
tokens[userCreateResults.id] = []; tokens[userCreateResults.id] = [];

4
api/src/routes/user/login.ts
View file

@ -1,6 +1,6 @@
import { compare } from "bcrypt"; import { compare } from "bcrypt";
import { generateToken } from "../../libs/generateToken.js"; import { generateRandomData } from "../../libs/generateRandom.js";
import type { RouteOptions } from "../../libs/types.js"; import type { RouteOptions } from "../../libs/types.js";
export function route(routeOptions: RouteOptions) { export function route(routeOptions: RouteOptions) {
@ -48,7 +48,7 @@ export function route(routeOptions: RouteOptions) {
error: "Email or password is incorrect" error: "Email or password is incorrect"
}); });
const token = generateToken(); const token = generateRandomData();
if (!tokens[userSearch.id]) tokens[userSearch.id] = []; if (!tokens[userSearch.id]) tokens[userSearch.id] = [];
tokens[userSearch.id].push({ tokens[userSearch.id].push({