rhythia-api 152.0.0 → 153.0.0

package/api/getPassToken.ts

@@ -3,7 +3,6 @@ import z from "zod";
 import { Database } from "../types/database";
 import { protectedApi, validUser } from "../utils/requestUtils";
 import { supabase } from "../utils/supabase";
-import md5 from "md5";
 import { encryptString } from "../utils/security";
 export const Schema = {
   input: z.strictObject({

package/api/getProfile.ts

@@ -4,6 +4,8 @@ import z from "zod";
 import { Database } from "../types/database";
 import { protectedApi } from "../utils/requestUtils";
 import { supabase } from "../utils/supabase";
+import { getUserBySession } from "../utils/getUserBySession";
+import { User } from "@supabase/supabase-js";
 
 export const Schema = {
   input: z.strictObject({
@@ -71,7 +73,7 @@ export async function handler(
     profiles = queryData;
   } else {
     // Fetch by session id
-    const user = (await supabase.auth.getUser(data.session)).data.user;
+    const user = (await getUserBySession(data.session)) as User;
 
     if (user) {
       let { data: queryData, error } = await supabase

package/api/setPasskey.ts

@@ -3,7 +3,6 @@ import z from "zod";
 import { Database } from "../types/database";
 import { protectedApi, validUser } from "../utils/requestUtils";
 import { supabase } from "../utils/supabase";
-import md5 from "md5";
 import { getUserBySession } from "../utils/getUserBySession";
 import { User } from "@supabase/supabase-js";
 export const Schema = {
@@ -53,7 +52,7 @@ export async function handler(
   await supabase.from("passkeys").upsert({
     id: userData.id!,
     email: user.email!,
-    passkey: md5(data.data.passkey),
+    passkey: data.data.passkey,
   });
 
   return NextResponse.json({});

package/api/submitScore.ts

@@ -17,7 +17,6 @@ export const Schema = {
       misses: z.number(),
       hits: z.number(),
       mapHash: z.string(),
-      mapNoteCount: z.number(),
       speed: z.number(),
     }),
   }),
@@ -62,7 +61,6 @@ export async function handler({
       misses: data.misses,
       hits: data.hits,
       mapHash: data.mapHash,
-      mapNoteCount: data.mapNoteCount,
       speed: data.speed,
     })
   ) {
@@ -121,7 +119,8 @@ export async function handler({
     );
   }
 
-  if (beatmaps.noteCount !== data.mapNoteCount) {
+  const noteCount = data.misses + data.hits;
+  if (noteCount !== beatmaps.noteCount) {
     return NextResponse.json(
       {
         error: "Wrong map",
@@ -142,7 +141,7 @@ export async function handler({
     passed = false;
   }
 
-  const accurracy = data.hits / beatmaps.noteCount;
+  const accurracy = data.hits / noteCount;
   let awarded_sp = 0;
 
   console.log(

package/index.ts

@@ -613,7 +613,6 @@ export const Schema = {
       misses: z.number(),
       hits: z.number(),
       mapHash: z.string(),
-      mapNoteCount: z.number(),
       speed: z.number(),
     }),
   }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rhythia-api",
-  "version": "152.0.0",
+  "version": "153.0.0",
   "main": "index.ts",
   "scripts": {
     "update": "bun ./scripts/update.ts",

package/utils/getUserBySession.ts

@@ -10,6 +10,7 @@ export async function getUserBySession(session: string): Promise<User | null> {
   }
 
   try {
+    console.log("trying legacy token");
     const decryptedToken = JSON.parse(decryptString(session)) as {
       userId: number;
       email: string;
@@ -17,14 +18,24 @@ export async function getUserBySession(session: string): Promise<User | null> {
       computerName: string;
     };
 
+    for (const key of Object.keys(decryptedToken)) {
+      if (decryptedToken[key] === undefined || decryptedToken[key] === null) {
+        return null;
+      }
+    }
+
+    console.log(decryptedToken);
+
     let { data: queryPasskey, error } = await supabase
       .from("passkeys")
       .select("*,profiles(uid)")
-      .eq("id", decryptedToken.userId || "nil")
-      .eq("email", decryptedToken.email || "nil")
-      .eq("passkey", decryptedToken.passKey || "nil")
+      .eq("id", decryptedToken.userId)
+      .eq("email", decryptedToken.email)
+      .eq("passkey", decryptedToken.passKey)
       .single();
 
+    console.log(queryPasskey);
+
     if (!queryPasskey) {
       return null;
     }