@cedarjs/auth-supabase-middleware 9.0.0-canary.1784 → 9.0.0-canary.3124

package/dist/index.js

@@ -22,7 +22,7 @@ const initSupabaseAuthMiddleware = ({
       const currentUser = await getCurrentUser(
         decoded,
         { type, token: cookieHeader, schema: "cookie" },
-        { event: req }
+        { event: req, request: req }
       );
       if (req.url.includes(`/middleware/supabase/currentUser`)) {
         res.body = // Not sure how currentUser can be string.... but types say so
@@ -48,7 +48,7 @@ const initSupabaseAuthMiddleware = ({
   };
   return [middleware, "*"];
 };
-var src_default = initSupabaseAuthMiddleware;
+var index_default = initSupabaseAuthMiddleware;
 export {
-  src_default as default
+  index_default as default
 };

package/dist/util.d.ts

@@ -1,12 +1,4 @@
 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":"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"}
+{"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"}

package/dist/util.js

@@ -1,47 +1,18 @@
-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 { cookieName } = createSupabaseServerClient(req, res);
-  if (cookieName) {
-    res.cookies.unset(cookieName);
+  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);
+    }
   }
   res.cookies.unset(AUTH_PROVIDER_HEADER);
 };
 export {
-  clearAuthState,
-  createSupabaseServerClient
+  clearAuthState
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/auth-supabase-middleware",
-  "version": "9.0.0-canary.1784+baa47810a",
+  "version": "9.0.0-canary.3124",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -10,54 +10,46 @@
   "type": "module",
   "exports": {
     ".": {
-      "import": {
+      "default": {
         "types": "./dist/index.d.ts",
         "default": "./dist/index.js"
-      },
-      "require": {
-        "types": "./dist/cjs/index.d.ts",
-        "default": "./dist/cjs/index.js"
       }
     }
   },
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "files": [
-    "dist",
-    "cjsWrappers"
+    "dist"
   ],
   "scripts": {
-    "build": "tsx ./build.mts",
+    "build": "node ./build.mts",
     "build:pack": "yarn pack -o cedarjs-auth-supabase-middleware.tgz",
     "build:types": "tsc --build --verbose ./tsconfig.build.json",
-    "build:types-cjs": "tsc --build --verbose ./tsconfig.cjs.json",
-    "check:attw": "yarn attw -P",
+    "check:attw": "yarn cedar-fwtools-attw",
     "check:package": "concurrently npm:check:attw yarn:publint",
     "prepublishOnly": "NODE_ENV=production yarn build",
     "test": "vitest run",
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/auth-supabase-api": "9.0.0-canary.1784",
-    "@cedarjs/web": "9.0.0-canary.1784",
-    "@supabase/ssr": "0.8.0"
+    "@cedarjs/auth-supabase-api": "9.0.0-canary.3124",
+    "@cedarjs/web": "9.0.0-canary.3124"
   },
   "devDependencies": {
-    "@arethetypeswrong/cli": "0.18.2",
-    "@cedarjs/api": "9.0.0-canary.1784",
-    "@cedarjs/auth": "9.0.0-canary.1784",
-    "@cedarjs/framework-tools": "9.0.0-canary.1784",
-    "@cedarjs/graphql-server": "9.0.0-canary.1784",
-    "@types/aws-lambda": "8.10.160",
-    "concurrently": "9.2.1",
-    "publint": "0.3.17",
-    "ts-toolbelt": "9.6.0",
-    "tsx": "4.21.0",
+    "@cedarjs/api": "9.0.0-canary.3124",
+    "@cedarjs/auth": "9.0.0-canary.3124",
+    "@cedarjs/framework-tools": "9.0.0-canary.3124",
+    "@cedarjs/graphql-server": "9.0.0-canary.3124",
+    "concurrently": "9.2.4",
+    "publint": "0.3.24",
     "typescript": "5.9.3",
-    "vitest": "3.2.4"
+    "vitest": "4.1.11"
+  },
+  "engines": {
+    "node": ">=24"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "baa47810a7defb73de27fdf513b815d679509b5e"
+  "gitHead": "3905ed045508b861b495f8d5630d76c7a157d8f1"
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2025 Cedar
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/dist/cjs/defaultGetRoles.d.ts

@@ -1,41 +0,0 @@
-/**
- * Currently the supabase auth decoder returns something like this:
-{
-  "aud": "authenticated",
-  "exp": 1716806712,
-  "iat": 1716803112,
-  "iss": "https://bubnfbrfzfdryapcuybr.supabase.co/auth/v1",
-  "sub": "75fd8091-e0a7-4e7d-8a8d-138d0eb3ca5a",
-  "email": "dannychoudhury+1@gmail.com",
-  "phone": "",
-  "app_metadata": {
-    "provider": "email",
-    "providers": [
-      "email"
-    ],
-    "roles": "admin" <-- this the role we're looking for
-  },
-  "user_metadata": {
-    "full-name": "Danny Choudhury 1"
-  },
-  "role": "authenticated", <-- this is the role supabase sets
-  "aal": "aal1",
-  "amr": [
-    {
-      "method": "password",
-      "timestamp": 1716803107
-    }
-  ],
-  "session_id": "39b4ae31-c57a-4ac1-8f01-e9d6ccbd9365",
-  "is_anonymous": false
-}
- */
-interface PartialSupabaseDecoded {
-    app_metadata: {
-        [key: string]: unknown;
-        roles?: string | undefined;
-    };
-}
-export declare const defaultGetRoles: (decoded: PartialSupabaseDecoded) => string[];
-export {};
-//# sourceMappingURL=defaultGetRoles.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"defaultGetRoles.d.ts","sourceRoot":"","sources":["../../src/defaultGetRoles.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,UAAU,sBAAsB;IAC9B,YAAY,EAAE;QACZ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;QACtB,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAC3B,CAAA;CACF;AAED,eAAO,MAAM,eAAe,GAAI,SAAS,sBAAsB,KAAG,MAAM,EAYvE,CAAA"}

package/dist/cjs/defaultGetRoles.js

@@ -1,39 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var defaultGetRoles_exports = {};
-__export(defaultGetRoles_exports, {
-  defaultGetRoles: () => defaultGetRoles
-});
-module.exports = __toCommonJS(defaultGetRoles_exports);
-const defaultGetRoles = (decoded) => {
-  try {
-    const roles = decoded?.app_metadata?.roles;
-    if (Array.isArray(roles)) {
-      return roles;
-    } else {
-      return roles ? [roles] : [];
-    }
-  } catch {
-    return [];
-  }
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  defaultGetRoles
-});

package/dist/cjs/index.d.ts

@@ -1,12 +0,0 @@
-import type { GetCurrentUser } from '@cedarjs/graphql-server';
-import type { Middleware } from '@cedarjs/web/middleware';
-export interface SupabaseAuthMiddlewareOptions {
-    getCurrentUser: GetCurrentUser;
-    getRoles?: (decoded: any) => string[];
-}
-/**
- * Create Supabase Auth Middleware that sets the `serverAuthState` based on the Supabase cookie.
- */
-declare const initSupabaseAuthMiddleware: ({ getCurrentUser, getRoles, }: SupabaseAuthMiddlewareOptions) => [Middleware, "*"];
-export default initSupabaseAuthMiddleware;
-//# sourceMappingURL=index.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,EACV,UAAU,EAGX,MAAM,yBAAyB,CAAA;AAIhC,MAAM,WAAW,6BAA6B;IAC5C,cAAc,EAAE,cAAc,CAAA;IAC9B,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,MAAM,EAAE,CAAA;CACtC;AAED;;GAEG;AACH,QAAA,MAAM,0BAA0B,GAAI,+BAGjC,6BAA6B,KAAG,CAAC,UAAU,EAAE,GAAG,CAmElD,CAAA;AACD,eAAe,0BAA0B,CAAA"}

package/dist/cjs/index.js

@@ -1,74 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var src_exports = {};
-__export(src_exports, {
-  default: () => src_default
-});
-module.exports = __toCommonJS(src_exports);
-var import_api = require("@cedarjs/api");
-var import_auth_supabase_api = require("@cedarjs/auth-supabase-api");
-var import_util = require("./util.js");
-const initSupabaseAuthMiddleware = ({
-  getCurrentUser,
-  getRoles
-}) => {
-  const middleware = async (req, res) => {
-    const type = "supabase";
-    const cookieHeader = req.headers.get("cookie");
-    if (!cookieHeader) {
-      return res;
-    }
-    try {
-      const authProviderCookie = req.cookies.get(import_api.AUTH_PROVIDER_HEADER);
-      if (!authProviderCookie || authProviderCookie !== type) {
-        return res;
-      }
-      const decoded = await (0, import_auth_supabase_api.authDecoder)(cookieHeader, type, {
-        event: req
-      });
-      const currentUser = await getCurrentUser(
-        decoded,
-        { type, token: cookieHeader, schema: "cookie" },
-        { event: req }
-      );
-      if (req.url.includes(`/middleware/supabase/currentUser`)) {
-        res.body = // Not sure how currentUser can be string.... but types say so
-        typeof currentUser === "string" ? currentUser : JSON.stringify({ currentUser });
-        return res;
-      }
-      const userMetadata = typeof currentUser === "string" ? null : currentUser?.["user_metadata"];
-      req.serverAuthState.set({
-        currentUser,
-        loading: false,
-        isAuthenticated: !!currentUser,
-        hasError: false,
-        userMetadata: userMetadata || currentUser,
-        cookieHeader,
-        roles: getRoles ? getRoles(decoded) : []
-      });
-    } catch (e) {
-      console.error("Error in Supabase Auth Middleware", e);
-      (0, import_util.clearAuthState)(req, res);
-      return res;
-    }
-    return res;
-  };
-  return [middleware, "*"];
-};
-var src_default = initSupabaseAuthMiddleware;

package/dist/cjs/package.json

@@ -1 +0,0 @@
-{"type":"commonjs"}

package/dist/cjs/util.d.ts

@@ -1,15 +0,0 @@
-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
- */
-export declare const clearAuthState: (req: MiddlewareRequest, res: MiddlewareResponse) => void;
-//# sourceMappingURL=util.d.ts.map

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

@@ -1 +0,0 @@
-{"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

@@ -1,72 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var util_exports = {};
-__export(util_exports, {
-  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 { 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,
-  createSupabaseServerClient
-});