@cedarjs/auth-dbauth-middleware 5.0.7-next.338 → 5.0.7-rc.3

package/dist/cjs/defaultGetRoles.d.ts

@@ -0,0 +1,2 @@
+export declare const defaultGetRoles: (decoded: Record<string, any> | undefined | null) => string[];
+//# sourceMappingURL=defaultGetRoles.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"defaultGetRoles.d.ts","sourceRoot":"","sources":["../../src/defaultGetRoles.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe,GAC1B,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,GAAG,IAAI,KAC9C,MAAM,EAYR,CAAA"}

package/dist/cjs/defaultGetRoles.js

@@ -0,0 +1,39 @@
+"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?.currentUser?.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

@@ -0,0 +1,14 @@
+import type { APIGatewayProxyEvent, Context } from 'aws-lambda';
+import type { DbAuthResponse } from '@cedarjs/auth-dbauth-api';
+import type { GetCurrentUser } from '@cedarjs/graphql-server';
+import type { Middleware } from '@cedarjs/web/middleware';
+export interface DbAuthMiddlewareOptions {
+    cookieName?: string;
+    dbAuthUrl?: string;
+    dbAuthHandler: (req: Request | APIGatewayProxyEvent, context?: Context) => DbAuthResponse;
+    getRoles?: (decoded: any) => string[];
+    getCurrentUser: GetCurrentUser;
+}
+export declare const initDbAuthMiddleware: ({ dbAuthHandler, getCurrentUser, getRoles, cookieName, dbAuthUrl, }: DbAuthMiddlewareOptions) => [Middleware, "*"];
+export default initDbAuthMiddleware;
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAE/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAG9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAE7D,OAAO,KAAK,EAAE,UAAU,EAAqB,MAAM,yBAAyB,CAAA;AAK5E,MAAM,WAAW,uBAAuB;IACtC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAGlB,aAAa,EAAE,CACb,GAAG,EAAE,OAAO,GAAG,oBAAoB,EACnC,OAAO,CAAC,EAAE,OAAO,KACd,cAAc,CAAA;IACnB,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,MAAM,EAAE,CAAA;IACrC,cAAc,EAAE,cAAc,CAAA;CAC/B;AAED,eAAO,MAAM,oBAAoB,GAAI,qEAMlC,uBAAuB,KAAG,CAAC,UAAU,EAAE,GAAG,CAkG5C,CAAA;AA2DD,eAAe,oBAAoB,CAAA"}

package/dist/cjs/index.js

@@ -0,0 +1,155 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var index_exports = {};
+__export(index_exports, {
+  default: () => index_default,
+  initDbAuthMiddleware: () => initDbAuthMiddleware
+});
+module.exports = __toCommonJS(index_exports);
+var import_auth_dbauth_api = __toESM(require("@cedarjs/auth-dbauth-api"), 1);
+var import_middleware = require("@cedarjs/web/middleware");
+var import_defaultGetRoles = require("./defaultGetRoles.js");
+const { dbAuthSession, generateCookieName } = import_auth_dbauth_api.default;
+const initDbAuthMiddleware = ({
+  dbAuthHandler,
+  getCurrentUser,
+  getRoles = import_defaultGetRoles.defaultGetRoles,
+  cookieName,
+  dbAuthUrl = "/middleware/dbauth"
+}) => {
+  const mw = async (req, res = import_middleware.MiddlewareResponse.next()) => {
+    console.log("dbAuthUrl", dbAuthUrl);
+    console.log("req.url", req.url);
+    if (req.url.includes(dbAuthUrl)) {
+      if (req.url.includes(`${dbAuthUrl}/currentUser`)) {
+        const validatedSession2 = await validateSession({
+          req,
+          cookieName,
+          getCurrentUser
+        });
+        if (validatedSession2) {
+          return new import_middleware.MiddlewareResponse(
+            JSON.stringify({ currentUser: validatedSession2.currentUser })
+          );
+        } else {
+          return new import_middleware.MiddlewareResponse(JSON.stringify({ currentUser: null }));
+        }
+      } else {
+        const output = await dbAuthHandler(req);
+        console.log("output", output);
+        const finalHeaders = new Headers();
+        Object.entries(output.headers).forEach(([key, value]) => {
+          if (Array.isArray(value)) {
+            value.forEach((mvhHeader) => finalHeaders.append(key, mvhHeader));
+          } else {
+            finalHeaders.append(key, value);
+          }
+        });
+        return new import_middleware.MiddlewareResponse(output.body, {
+          headers: finalHeaders,
+          status: output.statusCode
+        });
+      }
+    }
+    const cookieHeader = req.headers.get("Cookie");
+    if (!cookieHeader?.includes("auth-provider")) {
+      return res;
+    }
+    const validatedSession = await validateSession({
+      req,
+      cookieName,
+      getCurrentUser
+    });
+    if (validatedSession) {
+      const { currentUser, decryptedSession } = validatedSession;
+      req.serverAuthState.set({
+        currentUser,
+        loading: false,
+        isAuthenticated: !!currentUser,
+        hasError: false,
+        userMetadata: currentUser,
+        // dbAuth doesn't have userMetadata
+        cookieHeader,
+        roles: getRoles(decryptedSession)
+      });
+    } else {
+      req.serverAuthState.clear();
+      res.cookies.unset(generateCookieName(cookieName));
+      res.cookies.unset("auth-provider");
+    }
+    return res;
+  };
+  return [mw, "*"];
+};
+async function validateSession({
+  req,
+  cookieName,
+  getCurrentUser
+}) {
+  let decryptedSession;
+  try {
+    decryptedSession = dbAuthSession(req, generateCookieName(cookieName));
+  } catch (e) {
+    if (process.env.NODE_ENV === "development") {
+      console.debug("Could not decrypt dbAuth session", e);
+    }
+    return void 0;
+  }
+  if (!decryptedSession) {
+    if (process.env.NODE_ENV === "development") {
+      console.debug(
+        "No dbAuth session cookie found. Looking for a cookie named:",
+        cookieName
+      );
+    }
+    return void 0;
+  }
+  const currentUser = await getCurrentUser(
+    decryptedSession,
+    {
+      type: "dbAuth",
+      schema: "cookie",
+      // @MARK: We pass the entire cookie header as a token. This isn't
+      // actually the token!
+      // At this point the Cookie header is guaranteed, because otherwise a
+      // decryptionError would have been thrown
+      token: req.headers.get("Cookie")
+    },
+    {
+      event: req,
+      request: req
+    }
+  );
+  return { currentUser, decryptedSession };
+}
+var index_default = initDbAuthMiddleware;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  initDbAuthMiddleware
+});

package/dist/cjs/package.json

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

package/dist/index.d.ts

@@ -1,7 +1,5 @@
 import type { APIGatewayProxyEvent, Context } from 'aws-lambda';
-import type { DbAuthResponse } from '@cedarjs/auth-dbauth-api' with {
-    'resolution-mode': 'import'
-};
+import type { DbAuthResponse } from '@cedarjs/auth-dbauth-api';
 import type { GetCurrentUser } from '@cedarjs/graphql-server';
 import type { Middleware } from '@cedarjs/web/middleware';
 export interface DbAuthMiddlewareOptions {

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAE/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;IAC7D,iBAAiB,EAAE,QAAQ;CAC5B,CAAA;AACD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAE7D,OAAO,KAAK,EAAE,UAAU,EAAqB,MAAM,yBAAyB,CAAA;AAI5E,MAAM,WAAW,uBAAuB;IACtC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAGlB,aAAa,EAAE,CACb,GAAG,EAAE,OAAO,GAAG,oBAAoB,EACnC,OAAO,CAAC,EAAE,OAAO,KACd,cAAc,CAAA;IACnB,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,MAAM,EAAE,CAAA;IACrC,cAAc,EAAE,cAAc,CAAA;CAC/B;AAED,eAAO,MAAM,oBAAoB,GAAI,qEAMlC,uBAAuB,KAAG,CAAC,UAAU,EAAE,GAAG,CAmG5C,CAAA;AA8DD,eAAe,oBAAoB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAE/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAG9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAE7D,OAAO,KAAK,EAAE,UAAU,EAAqB,MAAM,yBAAyB,CAAA;AAK5E,MAAM,WAAW,uBAAuB;IACtC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAGlB,aAAa,EAAE,CACb,GAAG,EAAE,OAAO,GAAG,oBAAoB,EACnC,OAAO,CAAC,EAAE,OAAO,KACd,cAAc,CAAA;IACnB,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,MAAM,EAAE,CAAA;IACrC,cAAc,EAAE,cAAc,CAAA;CAC/B;AAED,eAAO,MAAM,oBAAoB,GAAI,qEAMlC,uBAAuB,KAAG,CAAC,UAAU,EAAE,GAAG,CAkG5C,CAAA;AA2DD,eAAe,oBAAoB,CAAA"}

package/dist/index.js

@@ -1,4 +1,6 @@
+import dbAuthApi from "@cedarjs/auth-dbauth-api";
 import { MiddlewareResponse } from "@cedarjs/web/middleware";
+const { dbAuthSession, generateCookieName } = dbAuthApi;
 import { defaultGetRoles } from "./defaultGetRoles.js";
 const initDbAuthMiddleware = ({
   dbAuthHandler,
@@ -64,7 +66,6 @@ const initDbAuthMiddleware = ({
       });
     } else {
       req.serverAuthState.clear();
-      const { generateCookieName } = await import("@cedarjs/auth-dbauth-api");
       res.cookies.unset(generateCookieName(cookieName));
       res.cookies.unset("auth-provider");
     }
@@ -78,7 +79,6 @@ async function validateSession({
   getCurrentUser
 }) {
   let decryptedSession;
-  const { dbAuthSession, generateCookieName } = await import("@cedarjs/auth-dbauth-api");
   try {
     decryptedSession = dbAuthSession(req, generateCookieName(cookieName));
   } catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/auth-dbauth-middleware",
-  "version": "5.0.7-next.338",
+  "version": "5.0.7-rc.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -10,9 +10,13 @@
   "type": "module",
   "exports": {
     ".": {
-      "default": {
+      "import": {
         "types": "./dist/index.d.ts",
         "default": "./dist/index.js"
+      },
+      "require": {
+        "types": "./dist/cjs/index.d.ts",
+        "default": "./dist/cjs/index.js"
       }
     }
   },
@@ -25,6 +29,7 @@
     "build": "node ./build.mts",
     "build:pack": "yarn pack -o cedarjs-auth-dbauth-middleware.tgz",
     "build:types": "tsc --build --verbose ./tsconfig.build.json",
+    "build:types-cjs": "tsc --build --verbose tsconfig.cjs.json",
     "check:attw": "yarn cedar-fwtools-attw",
     "check:package": "concurrently npm:check:attw yarn:publint",
     "prepublishOnly": "NODE_ENV=production yarn build",
@@ -32,19 +37,20 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/auth-dbauth-api": "5.0.7-next.338",
-    "@cedarjs/web": "5.0.7-next.338"
+    "@cedarjs/auth-dbauth-api": "5.0.7-rc.3",
+    "@cedarjs/web": "5.0.7-rc.3"
   },
   "devDependencies": {
-    "@cedarjs/api": "5.0.7-next.338",
-    "@cedarjs/framework-tools": "5.0.7-next.338",
-    "@cedarjs/graphql-server": "5.0.7-next.338",
+    "@arethetypeswrong/cli": "0.18.4",
+    "@cedarjs/api": "5.0.7-rc.3",
+    "@cedarjs/framework-tools": "5.0.7-rc.3",
+    "@cedarjs/graphql-server": "5.0.7-rc.3",
     "@types/aws-lambda": "8.10.162",
     "concurrently": "9.2.4",
-    "publint": "0.3.23",
+    "publint": "0.3.21",
     "ts-toolbelt": "9.6.0",
     "typescript": "5.9.3",
-    "vitest": "4.1.10"
+    "vitest": "3.2.6"
   },
   "engines": {
     "node": ">=24"