From fdc122b486f94e620cac9870166e5ff649c11462 Mon Sep 17 00:00:00 2001
From: William Oldham <github@binaryoverload.co.uk>
Date: Sat, 1 Feb 2025 11:26:39 +0000
Subject: [PATCH] chore: resolve review comments

---
 src/models/server.ts                 | 8 +-------
 src/services/grpc/api/login.ts       | 6 +++---
 src/services/nnas/routes/provider.ts | 2 +-
 src/types/common/token.ts            | 5 +++++
 src/util.ts                          | 4 ++--
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/models/server.ts b/src/models/server.ts
index 61a53dab..3ab6fce8 100644
--- a/src/models/server.ts
+++ b/src/models/server.ts
@@ -1,7 +1,6 @@
 import { Schema, model } from 'mongoose';
 import uniqueValidator from 'mongoose-unique-validator';
 import { IServer, IServerMethods, ServerModel } from '@/types/mongoose/server';
-import type { SystemType } from '@/types/common/token';
 
 const ServerSchema = new Schema<IServer, ServerModel, IServerMethods>({
 	client_id: String,
@@ -19,9 +18,4 @@ const ServerSchema = new Schema<IServer, ServerModel, IServerMethods>({
 
 ServerSchema.plugin(uniqueValidator, { message: '{PATH} already in use.' });
 
-export const Server = model<IServer, ServerModel>('Server', ServerSchema);
-
-export const serverDeviceToSystemType: Record<number, SystemType> = {
-	1: 'WIIU',
-	2: '3DS'
-};
\ No newline at end of file
+export const Server = model<IServer, ServerModel>('Server', ServerSchema);
\ No newline at end of file
diff --git a/src/services/grpc/api/login.ts b/src/services/grpc/api/login.ts
index d4ad715c..63929c6e 100644
--- a/src/services/grpc/api/login.ts
+++ b/src/services/grpc/api/login.ts
@@ -21,11 +21,11 @@ export async function login(request: LoginRequest): Promise<DeepPartial<LoginRes
 		if (!username) throw new ServerError(Status.INVALID_ARGUMENT, 'Invalid or missing username');
 		if (!password) throw new ServerError(Status.INVALID_ARGUMENT, 'Invalid or missing password');
 
-		pnid = await getPNIDByUsername(username); // * We know username will never be null here
+		pnid = await getPNIDByUsername(username);
 
 		if (!pnid) throw new ServerError(Status.INVALID_ARGUMENT, 'User not found');
 
-		const hashedPassword = nintendoPasswordHash(password, pnid.pid); // * We know password will never be null here
+		const hashedPassword = nintendoPasswordHash(password, pnid.pid);
 
 		if (!bcrypt.compareSync(hashedPassword, pnid.password)) {
 			throw new ServerError(Status.INVALID_ARGUMENT, 'Password is incorrect');
@@ -33,7 +33,7 @@ export async function login(request: LoginRequest): Promise<DeepPartial<LoginRes
 	} else {
 		if (!refreshToken) throw new ServerError(Status.INVALID_ARGUMENT, 'Invalid or missing refresh token');
 
-		pnid = await getPNIDByAPIRefreshToken(refreshToken); // * We know refreshToken will never be null here
+		pnid = await getPNIDByAPIRefreshToken(refreshToken);
 
 		if (!pnid) throw new ServerError(Status.INVALID_ARGUMENT, 'Invalid or missing refresh token');
 	}
diff --git a/src/services/nnas/routes/provider.ts b/src/services/nnas/routes/provider.ts
index aee2bfb6..94ae11af 100644
--- a/src/services/nnas/routes/provider.ts
+++ b/src/services/nnas/routes/provider.ts
@@ -4,7 +4,7 @@ import { getServerByClientID, getServerByGameServerID } from '@/database';
 import { generateToken, getValueFromHeaders, getValueFromQueryString } from '@/util';
 import { NEXAccount } from '@/models/nex-account';
 import { TokenOptions } from '@/types/common/token';
-import { serverDeviceToSystemType } from '@/models/server';
+import { serverDeviceToSystemType } from '@/types/common/token';
 
 const router = express.Router();
 
diff --git a/src/types/common/token.ts b/src/types/common/token.ts
index 6c1de4c2..6640e3e9 100644
--- a/src/types/common/token.ts
+++ b/src/types/common/token.ts
@@ -19,6 +19,11 @@ export const SystemTypes = {
 } as const;
 export type SystemType = keyof typeof SystemTypes;
 
+export const serverDeviceToSystemType: Record<number, SystemType> = {
+	1: 'WIIU',
+	2: '3DS'
+};
+
 export function getSystemTypeFromValue(type: number): SystemType | undefined {
 	const keys = Object.keys(SystemTypes) as SystemType[];
 	return keys.find((key) => SystemTypes[key] === type);
diff --git a/src/util.ts b/src/util.ts
index e700e61b..e4e01b89 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -61,7 +61,7 @@ export function generateOAuthTokens(systemType: SystemType, pnid: HydratedPNIDDo
 		token_type: 'OAUTH_ACCESS',
 		pid: pnid.pid,
 		access_level: pnid.access_level,
-		expire_time: BigInt(Date.now() + (accessTokenExpiresInSecs * 1000)) // * 1 hour
+		expire_time: BigInt(Date.now() + (accessTokenExpiresInSecs * 1000))
 	};
 
 	const refreshTokenOptions: TokenOptions = {
@@ -69,7 +69,7 @@ export function generateOAuthTokens(systemType: SystemType, pnid: HydratedPNIDDo
 		token_type: 'OAUTH_REFRESH',
 		pid: pnid.pid,
 		access_level: pnid.access_level,
-		expire_time: BigInt(Date.now() + (refreshTokenExpiresInSecs * 1000)) // * 30 days
+		expire_time: BigInt(Date.now() + (refreshTokenExpiresInSecs * 1000))
 	};
 
 	const accessToken = generateToken(config.aes_key, accessTokenOptions)?.toString('hex');