From d46a9413b441b02cc70fd6633c418c7dae41a3f4 Mon Sep 17 00:00:00 2001
From: Jonathan Barrow <jonbarrow1998@gmail.com>
Date: Fri, 28 Apr 2023 16:02:31 -0400
Subject: [PATCH] Changed decryptToken to always use the account server key

---
 src/database.ts                             | 2 +-
 src/services/api/routes/v1/resetPassword.ts | 3 +--
 src/util.ts                                 | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/database.ts b/src/database.ts
index e7f7748..cbb20cc 100644
--- a/src/database.ts
+++ b/src/database.ts
@@ -104,7 +104,7 @@ export async function getPNIDByBearerAuth(token: string): Promise<HydratedPNIDDo
 	verifyConnected();
 
 	try {
-		const decryptedToken: Buffer = await decryptToken(config.aes_key, Buffer.from(token, 'hex'));
+		const decryptedToken: Buffer = await decryptToken(Buffer.from(token, 'hex'));
 		const unpackedToken: Token = unpackToken(decryptedToken);
 
 		const pnid: HydratedPNIDDocument | null = await getPNIDByPID(unpackedToken.pid);
diff --git a/src/services/api/routes/v1/resetPassword.ts b/src/services/api/routes/v1/resetPassword.ts
index 266e887..9b90138 100644
--- a/src/services/api/routes/v1/resetPassword.ts
+++ b/src/services/api/routes/v1/resetPassword.ts
@@ -2,7 +2,6 @@ import express from 'express';
 import bcrypt from 'bcrypt';
 import { PNID } from '@/models/pnid';
 import { decryptToken, unpackToken, nintendoPasswordHash } from '@/util';
-import { config } from '@/config-manager';
 import { Token } from '@/types/common/token';
 import { HydratedPNIDDocument } from '@/types/mongoose/pnid';
 
@@ -29,7 +28,7 @@ router.post('/', async (request: express.Request, response: express.Response) =>
 
 	let unpackedToken: Token;
 	try {
-		const decryptedToken: Buffer = await decryptToken(config.aes_key, Buffer.from(token, 'base64'));
+		const decryptedToken: Buffer = await decryptToken(Buffer.from(token, 'base64'));
 		unpackedToken = unpackToken(decryptedToken);
 	} catch (error) {
 		console.log(error);
diff --git a/src/util.ts b/src/util.ts
index a884cad..d335934 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -78,9 +78,9 @@ export function generateToken(key: string, options: TokenOptions): Buffer | null
 	]);
 }
 
-export function decryptToken(key: string, token: Buffer): Buffer {
+export function decryptToken(token: Buffer): Buffer {
 	const iv: Buffer = Buffer.alloc(16);
-	const decipher: crypto.Decipher = crypto.createDecipheriv('aes-256-cbc', Buffer.from(key, 'hex'), iv);
+	const decipher: crypto.Decipher = crypto.createDecipheriv('aes-256-cbc', Buffer.from(config.aes_key, 'hex'), iv);
 
 	return Buffer.concat([
 		decipher.update(token),