rhythia-api 66.0.0 → 67.0.0

package/api/editProfile.ts

@@ -1,22 +1,47 @@
+import { NextResponse } from "next/server";
 import z from "zod";
+import { Database } from "../types/database";
+import { protectedApi, validUser } from "../utils/requestUtils";
+import { supabase } from "../utils/supabase";
 
 export const Schema = {
   input: z.object({
-    name: z.string(),
-    age: z.number(),
+    session: z.string(),
+    data: z.object({
+      avatar_url: z.string().optional(),
+      about_me: z.string().optional(),
+      username: z.string().optional(),
+    }),
   }),
   output: z.object({
-    uid: z.string(),
+    error: z.string().optional(),
   }),
 };
 
-export async function GET(
-  res: Response
-): Promise<(typeof Schema)["output"]["_type"]> {
-  const toParse = await res.json();
-  const data = Schema.input.parse(toParse);
+export async function POST(res: Response): Promise<NextResponse> {
+  return protectedApi({
+    response: res,
+    schema: Schema,
+    authorization: validUser,
+    activity: handler,
+  });
+}
+
+async function handler(
+  data: (typeof Schema)["input"]["_type"]
+): Promise<NextResponse<(typeof Schema)["output"]["_type"]>> {
+  const user = (await supabase.auth.getUser(data.session)).data.user!;
 
-  return {
-    uid: data.name,
+  const upsertPayload: Database["public"]["Tables"]["profiles"]["Update"] = {
+    uid: user.id,
+    flag: "",
+    ...data.data,
   };
+
+  const upsertResult = await supabase
+    .from("profiles")
+    .upsert(upsertPayload)
+    .select();
+
+  return NextResponse.json({});
 }

package/api/getProfile.ts

@@ -1,9 +1,13 @@
+import { NOT_FOUND } from "http-status";
+import { NextResponse } from "next/server";
 import z from "zod";
+import { protectedApi, validUser } from "../utils/requestUtils";
 import { supabase } from "../utils/supabase";
 
 export const Schema = {
   input: z.object({
-    id: z.string(),
+    session: z.string(),
+    id: z.number(),
   }),
   output: z.object({
     error: z.string().optional(),
@@ -23,27 +27,38 @@ export const Schema = {
   }),
 };
 
-export async function POST(
-  res: Response
-): Promise<(typeof Schema)["output"]["_type"]> {
-  const toParse = await res.json();
-  const data = Schema.input.parse(toParse);
+export async function POST(res: Response): Promise<NextResponse> {
+  return protectedApi({
+    response: res,
+    schema: Schema,
+    authorization: validUser,
+    activity: handler,
+  });
+}
 
+async function handler(
+  data: (typeof Schema)["input"]["_type"]
+): Promise<NextResponse<(typeof Schema)["output"]["_type"]>> {
   let { data: profiles, error } = await supabase
     .from("profiles")
     .select("*")
-    .eq("column", data.id);
+    .eq("id", data.id);
+
+  console.log(profiles, error);
 
   if (!profiles?.length) {
-    return {
-      error: "User not found",
-    };
+    return NextResponse.json(
+      {
+        error: "User not found",
+      },
+      { status: NOT_FOUND }
+    );
   }
 
   const user = profiles[0];
-  return {
+  return NextResponse.json({
     user: {
       ...user,
     },
-  };
+  });
 }

package/api/webhook_createUser.ts

@@ -1,5 +1,5 @@
 import { createClient } from "@supabase/supabase-js";
-import { Database } from "../types/supabase";
+import { Database } from "../types/database";
 
 const adminClient = createClient<Database>(
   `https://pfkajngbllcbdzoylrvp.supabase.co`,

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "rhythia-api",
-  "version": "66.0.0",
+  "version": "67.0.0",
   "main": "index.ts",
   "scripts": {
     "update": "bun ./scripts/update.ts",
     "ci-deploy": "tsx ./scripts/ci-deploy.ts",
     "test": "bun ./scripts/test.ts",
-    "sync": "npx supabase gen types typescript --project-id \"pfkajngbllcbdzoylrvp\" --schema public > types/supabase.ts",
+    "sync": "npx supabase gen types typescript --project-id \"pfkajngbllcbdzoylrvp\" --schema public > types/database.ts",
     "pipeline:build-api": "tsx ./scripts/build.ts",
     "pipeline:deploy-testing": "tsx ./scripts/build.ts"
   },
@@ -18,14 +18,17 @@
     "@types/bun": "^1.1.6",
     "@types/lodash": "^4.17.7",
     "@types/node": "^22.2.0",
+    "@vercel/node": "^3.2.8",
     "aws-lambda": "^1.0.7",
     "bufferutil": "^4.0.8",
     "bun": "^1.1.22",
     "esbuild": "^0.23.0",
+    "http-status": "^1.7.4",
     "isomorphic-git": "^1.27.1",
     "lodash": "^4.17.21",
+    "next": "^14.2.5",
     "simple-git": "^3.25.0",
-    "supabase": "^1.188.4",
+    "supabase": "^1.190.0",
     "tsx": "^4.17.0",
     "utf-8-validate": "^6.0.4",
     "zod": "^3.23.8"

package/scripts/test.ts

@@ -3,7 +3,7 @@ const res = await fetch("https://development.rhythia.com/api/getProfile", {
   headers: {
     "Content-Type": "application/json",
   },
-  body: JSON.stringify({ id: 0 }),
+  body: JSON.stringify({ id: 0, session: "asd" }),
 });
 
 console.log(await res.text());

package/utils/requestUtils.ts

@@ -0,0 +1,55 @@
+import status, { INTERNAL_SERVER_ERROR, UNAUTHORIZED } from "http-status";
+import { NextResponse } from "next/server";
+import { supabase } from "./supabase";
+
+export async function protectedApi({
+  response,
+  schema,
+  authorization,
+  activity,
+}: {
+  response: Response;
+  schema: { input: Zod.ZodObject<any>; output: Zod.ZodObject<any> };
+  authorization: Function;
+  activity: Function;
+}) {
+  let data;
+
+  try {
+    const toParse = await response.json();
+    data = schema.input.parse(toParse);
+  } catch (error) {
+    return NextResponse.json(
+      { error: error.toString() },
+      { status: status.BAD_REQUEST }
+    );
+  }
+
+  const authorizationReponse = await authorization(data);
+  if (authorizationReponse) {
+    return authorizationReponse;
+  }
+
+  return await activity(data);
+}
+
+export async function validUser(data) {
+  if (!data.session) {
+    return NextResponse.json(
+      {
+        error: "Session is missing",
+      },
+      { status: INTERNAL_SERVER_ERROR }
+    );
+  }
+
+  const user = await supabase.auth.getUser(data.session);
+  if (!user.error || !user.data.user) {
+    return NextResponse.json(
+      {
+        error: "Invalid user session",
+      },
+      { status: UNAUTHORIZED }
+    );
+  }
+}

package/utils/supabase.ts

@@ -1,5 +1,5 @@
 import { createClient } from "@supabase/supabase-js";
-import { Database } from "../types/supabase";
+import { Database } from "../types/database";
 
 export const supabase = createClient<Database>(
   `https://pfkajngbllcbdzoylrvp.supabase.co`,