@cedarjs/auth-supabase-middleware 5.0.2-rc.5 → 6.0.0-canary.2616

package/dist/cjs/util.d.ts

@@ -1,4 +1,12 @@
 import type { MiddlewareRequest, MiddlewareResponse } from '@cedarjs/web/middleware';
+/**
+ * Creates Supabase Server Client used to get the session cookie (only)
+ * from a given collection of auth cookies
+ */
+export declare const createSupabaseServerClient: (req: MiddlewareRequest, res: MiddlewareResponse) => {
+    cookieName: null;
+    supabase: import("@supabase/supabase-js").SupabaseClient<any, "public", "public", any, any>;
+};
 /**
  * Clear the Supabase and auth cookies from the request and response
  * and clear the auth context

package/dist/cjs/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/util.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,iBAAiB,EACjB,kBAAkB,EACnB,MAAM,yBAAyB,CAAA;AAEhC;;;GAGG;AACH,eAAO,MAAM,cAAc,GACzB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,SAuBxB,CAAA"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/util.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,iBAAiB,EACjB,kBAAkB,EACnB,MAAM,yBAAyB,CAAA;AAChC;;;GAGG;AACH,eAAO,MAAM,0BAA0B,GACrC,KAAK,iBAAiB,EACtB,KAAK,kBAAkB;;;CAoCxB,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,GACzB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,SAgBxB,CAAA"}

package/dist/cjs/util.js

@@ -18,25 +18,55 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var util_exports = {};
 __export(util_exports, {
-  clearAuthState: () => clearAuthState
+  clearAuthState: () => clearAuthState,
+  createSupabaseServerClient: () => createSupabaseServerClient
 });
 module.exports = __toCommonJS(util_exports);
+var import_ssr = require("@supabase/ssr");
 var import_api = require("@cedarjs/api");
+var import_auth_supabase_api = require("@cedarjs/auth-supabase-api");
+const createSupabaseServerClient = (req, res) => {
+  let cookieName = null;
+  if (!process.env.SUPABASE_URL) {
+    (0, import_auth_supabase_api.throwSupabaseSettingsError)("SUPABASE_URL");
+  }
+  if (!process.env.SUPABASE_KEY) {
+    (0, import_auth_supabase_api.throwSupabaseSettingsError)("SUPABASE_KEY");
+  }
+  const supabase = (0, import_ssr.createServerClient)(
+    process.env.SUPABASE_URL || "",
+    process.env.SUPABASE_KEY || "",
+    {
+      cookies: {
+        get(name) {
+          cookieName = name;
+          return req.cookies.get(name)?.valueOf();
+        },
+        set(name, value, options) {
+          cookieName = name;
+          req.cookies.set(name, value, options);
+          res.cookies.set(name, value, options);
+        },
+        remove(name, options) {
+          cookieName = name;
+          req.cookies.set(name, "", options);
+          res.cookies.set(name, "", options);
+        }
+      }
+    }
+  );
+  return { cookieName, supabase };
+};
 const clearAuthState = (req, res) => {
   req.serverAuthState.clear();
-  const cookieHeader = req.headers.get("cookie");
-  if (cookieHeader) {
-    const cookies = cookieHeader.split(";").map((c) => c.trim().split("=")[0]);
-    const supabaseCookie = cookies.find(
-      (name) => /^sb-.*-auth-token$/.test(name)
-    );
-    if (supabaseCookie) {
-      res.cookies.unset(supabaseCookie);
-    }
+  const { cookieName } = createSupabaseServerClient(req, res);
+  if (cookieName) {
+    res.cookies.unset(cookieName);
   }
   res.cookies.unset(import_api.AUTH_PROVIDER_HEADER);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  clearAuthState
+  clearAuthState,
+  createSupabaseServerClient
 });

package/dist/util.d.ts

@@ -1,4 +1,12 @@
 import type { MiddlewareRequest, MiddlewareResponse } from '@cedarjs/web/middleware';
+/**
+ * Creates Supabase Server Client used to get the session cookie (only)
+ * from a given collection of auth cookies
+ */
+export declare const createSupabaseServerClient: (req: MiddlewareRequest, res: MiddlewareResponse) => {
+    cookieName: null;
+    supabase: import("@supabase/supabase-js/dist/index.cjs").SupabaseClient<any, "public", "public", any, any>;
+};
 /**
  * Clear the Supabase and auth cookies from the request and response
  * and clear the auth context

package/dist/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,iBAAiB,EACjB,kBAAkB,EACnB,MAAM,yBAAyB,CAAA;AAEhC;;;GAGG;AACH,eAAO,MAAM,cAAc,GACzB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,SAuBxB,CAAA"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,iBAAiB,EACjB,kBAAkB,EACnB,MAAM,yBAAyB,CAAA;AAChC;;;GAGG;AACH,eAAO,MAAM,0BAA0B,GACrC,KAAK,iBAAiB,EACtB,KAAK,kBAAkB;;;CAoCxB,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,GACzB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,SAgBxB,CAAA"}

package/dist/util.js

@@ -1,18 +1,47 @@
+import { createServerClient } from "@supabase/ssr";
 import { AUTH_PROVIDER_HEADER } from "@cedarjs/api";
+import { throwSupabaseSettingsError } from "@cedarjs/auth-supabase-api";
+const createSupabaseServerClient = (req, res) => {
+  let cookieName = null;
+  if (!process.env.SUPABASE_URL) {
+    throwSupabaseSettingsError("SUPABASE_URL");
+  }
+  if (!process.env.SUPABASE_KEY) {
+    throwSupabaseSettingsError("SUPABASE_KEY");
+  }
+  const supabase = createServerClient(
+    process.env.SUPABASE_URL || "",
+    process.env.SUPABASE_KEY || "",
+    {
+      cookies: {
+        get(name) {
+          cookieName = name;
+          return req.cookies.get(name)?.valueOf();
+        },
+        set(name, value, options) {
+          cookieName = name;
+          req.cookies.set(name, value, options);
+          res.cookies.set(name, value, options);
+        },
+        remove(name, options) {
+          cookieName = name;
+          req.cookies.set(name, "", options);
+          res.cookies.set(name, "", options);
+        }
+      }
+    }
+  );
+  return { cookieName, supabase };
+};
 const clearAuthState = (req, res) => {
   req.serverAuthState.clear();
-  const cookieHeader = req.headers.get("cookie");
-  if (cookieHeader) {
-    const cookies = cookieHeader.split(";").map((c) => c.trim().split("=")[0]);
-    const supabaseCookie = cookies.find(
-      (name) => /^sb-.*-auth-token$/.test(name)
-    );
-    if (supabaseCookie) {
-      res.cookies.unset(supabaseCookie);
-    }
+  const { cookieName } = createSupabaseServerClient(req, res);
+  if (cookieName) {
+    res.cookies.unset(cookieName);
   }
   res.cookies.unset(AUTH_PROVIDER_HEADER);
 };
 export {
-  clearAuthState
+  clearAuthState,
+  createSupabaseServerClient
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/auth-supabase-middleware",
-  "version": "5.0.2-rc.5",
+  "version": "6.0.0-canary.2616",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -38,16 +38,16 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/auth-supabase-api": "5.0.2-rc.5",
-    "@cedarjs/web": "5.0.2-rc.5",
+    "@cedarjs/auth-supabase-api": "6.0.0-canary.2616",
+    "@cedarjs/web": "6.0.0-canary.2616",
     "@supabase/ssr": "0.12.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.4",
-    "@cedarjs/api": "5.0.2-rc.5",
-    "@cedarjs/auth": "5.0.2-rc.5",
-    "@cedarjs/framework-tools": "5.0.2-rc.5",
-    "@cedarjs/graphql-server": "5.0.2-rc.5",
+    "@cedarjs/api": "6.0.0-canary.2616",
+    "@cedarjs/auth": "6.0.0-canary.2616",
+    "@cedarjs/framework-tools": "6.0.0-canary.2616",
+    "@cedarjs/graphql-server": "6.0.0-canary.2616",
     "@types/aws-lambda": "8.10.162",
     "concurrently": "9.2.1",
     "publint": "0.3.21",