rhythia-api 83.0.0 → 85.0.0

package/utils/requestUtils.ts

@@ -1,51 +1,55 @@
-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: 400 });
-  }
-
-  const authorizationReponse = await authorization(data);
-  if (authorizationReponse) {
-    return authorizationReponse;
-  }
-
-  return await activity(data, response);
-}
-
-export async function validUser(data) {
-  if (!data.session) {
-    return NextResponse.json(
-      {
-        error: "Session is missing",
-      },
-      { status: 501 }
-    );
-  }
-
-  const user = await supabase.auth.getUser(data.session);
-  if (user.error || !user.data.user) {
-    return NextResponse.json(
-      {
-        error: "Invalid user session",
-      },
-      { status: 400 }
-    );
-  }
-}
+import { NextResponse } from "next/server";
+import { supabase } from "./supabase";
+import { ZodObject } from "zod";
+
+interface Props<
+  K = (...args: any[]) => Promise<NextResponse<any>>,
+  T = ZodObject<any>
+> {
+  request: Request;
+  schema: { input: T; output: T };
+  authorization?: Function;
+  activity: K;
+}
+
+export async function protectedApi({
+  request,
+  schema,
+  authorization,
+  activity,
+}: Props) {
+  try {
+    const toParse = await request.json();
+    const data = schema.input.parse(toParse);
+    if (authorization) {
+      const authorizationResponse = await authorization(data);
+      if (authorizationResponse) {
+        return authorizationResponse;
+      }
+    }
+    return await activity(data, request);
+  } catch (error) {
+    return NextResponse.json({ error: error.toString() }, { status: 400 });
+  }
+}
+
+export async function validUser(data) {
+  if (!data.session) {
+    return NextResponse.json(
+      {
+        error: "Session is missing",
+      },
+      { status: 501 }
+    );
+  }
+
+  const user = await supabase.auth.getUser(data.session);
+  if (user.error || !user.data.user) {
+    return NextResponse.json(
+      {
+        error: "Invalid user session",
+      },
+      { status: 400 }
+    );
+  }
+}

package/utils/supabase.ts

@@ -1,13 +1,13 @@
-import { createClient } from "@supabase/supabase-js";
-import { Database } from "../types/database";
-
-export const supabase = createClient<Database>(
-  `https://pfkajngbllcbdzoylrvp.supabase.co`,
-  process.env.ADMIN_KEY || "key",
-  {
-    auth: {
-      autoRefreshToken: false,
-      persistSession: false,
-    },
-  }
-);
+import { createClient } from "@supabase/supabase-js";
+import { Database } from "../types/database";
+
+export const supabase = createClient<Database>(
+  `https://pfkajngbllcbdzoylrvp.supabase.co`,
+  process.env.ADMIN_KEY || "key",
+  {
+    auth: {
+      autoRefreshToken: false,
+      persistSession: false,
+    },
+  }
+);

package/vercel.json

@@ -1,13 +1,13 @@
-{
-  "headers": [
-    {
-      "source": "/api/(.*)",
-      "headers": [
-        { "key": "Access-Control-Allow-Credentials", "value": "true" },
-        { "key": "Access-Control-Allow-Origin", "value": "*" },
-        { "key": "Access-Control-Allow-Methods", "value": "GET,OPTIONS,PATCH,DELETE,POST,PUT" },
-        { "key": "Access-Control-Allow-Headers", "value": "X-CSRF-Token, X-Requested-With, Accept, Accept-Version, Content-Length, Content-MD5, Content-Type, Date, X-Api-Version" }
-      ]
-    }
-  ]
+{
+  "headers": [
+    {
+      "source": "/api/(.*)",
+      "headers": [
+        { "key": "Access-Control-Allow-Credentials", "value": "true" },
+        { "key": "Access-Control-Allow-Origin", "value": "*" },
+        { "key": "Access-Control-Allow-Methods", "value": "GET,OPTIONS,PATCH,DELETE,POST,PUT" },
+        { "key": "Access-Control-Allow-Headers", "value": "X-CSRF-Token, X-Requested-With, Accept, Accept-Version, Content-Length, Content-MD5, Content-Type, Date, X-Api-Version" }
+      ]
+    }
+  ]
 }