✍️ Debug signing

ferdodo · Dec 19, 2024 · 7f02d1c · 7f02d1c
1 parent 4681998
commit 7f02d1c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/back/utils/sign.ts b/back/utils/sign.ts
@@ -23,7 +23,7 @@ export async function sign<T>(
 
 	const payloadAsString: string = JSON.stringify(
 		payload,
-		Object.keys(payload).sort(),
+		Object.keys(payload || {}).sort(),
 	);
 
 	const payloadAsBuffer: Buffer = Buffer.from(payloadAsString, "utf8");

diff --git a/back/utils/verify.ts b/back/utils/verify.ts
@@ -30,7 +30,12 @@ export async function verify<T>({
 
 		const ecdsaParams: EcdsaParams = { name: "ECDSA", hash: "SHA-384" };
 		const signatureBuffer: Buffer = Buffer.from(signature, "hex");
-		const payloadSerialised: string = JSON.stringify(payload);
+
+		const payloadSerialised: string = JSON.stringify(
+			payload,
+			Object.keys(payload).sort(),
+		);
+
 		const payloadBuffer: Buffer = Buffer.from(payloadSerialised, "utf-8");
 
 		const valid = await subtle.verify(
@@ -42,7 +47,7 @@ export async function verify<T>({
 
 		return valid;
 	} catch (_e) {
-		console.log("error", _e);
+		console.error("error", _e);
 
 		return false;
 	}

diff --git a/core/api/shop-buy.ts b/core/api/shop-buy.ts
@@ -14,6 +14,6 @@ export async function shopBuy(
 		throw new Error("playsig is required to buy an item !");
 	}
 
-	const shopBuyRequest = await signMessage({ item, publicKey, stamp, playsig });
+	const shopBuyRequest = await signMessage({ item, stamp, playsig });
 	connection.send({ shopBuyRequest });
 }
diff --git a/ingame/utils/sign.ts b/ingame/utils/sign.ts
@@ -23,7 +23,10 @@ export async function sign<T>(
 		["sign"],
 	);
 
-	const payloadAsString: string = JSON.stringify(payload);
+	const payloadAsString: string = JSON.stringify(
+		payload,
+		Object.keys(payload || {}).sort(),
+	);
 	const payloadAsBuffer = new TextEncoder().encode(payloadAsString);
 	const ecdsaParams: EcdsaParams = { name: "ECDSA", hash: "SHA-384" };