@cedarjs/auth-dbauth-middleware 7.0.0 → 7.0.1-next.305

package/README.md

@@ -39,6 +39,27 @@ export const ServerEntry: React.FC<Props> = ({ css, meta }) => {
 }
 ```
 
+### OAuth routing
+
+Apps using [`@cedarjs/auth-dbauth-oauth`](../oauth) opt in by also passing an `oauthHandler`, built the same way `dbAuthHandler` is — by wrapping `OAuthHandler`'s `invoke()`:
+
+```tsx
+import { OAuthHandler } from '@cedarjs/auth-dbauth-oauth'
+
+import { handler as dbAuthHandler } from '$api/src/functions/auth'
+import { oauthOptions } from '$api/src/lib/auth'
+
+const authMw = initDbAuthMiddleware({
+  dbAuthHandler,
+  getCurrentUser,
+  oauthHandler: (req, context) =>
+    new OAuthHandler(req, context, oauthOptions).invoke(),
+  // oauthUrl? optional, defaults to '/auth/oauth' (OAuthHandlerOptions.basePath's default)
+})
+```
+
+Requests whose URL falls under `oauthUrl` (`authorize`/`callback`/`unlink`) are dispatched to `oauthHandler` instead of the normal dbAuth session-validation path; its 302 redirects, `Set-Cookie` headers (session, `auth-provider`, and the OAuth transaction cookie), and JSON bodies are carried over to the middleware response unchanged. Omitting `oauthHandler` entirely disables OAuth routing — requests under `oauthUrl` simply fall through to the normal dbAuth handling below.
+
 ### Roles handling
 
 By default the middleware assumes your roles will be in `currentUser.roles` - either as a string or an array of strings.

package/dist/index.d.ts

@@ -8,9 +8,31 @@ export interface DbAuthMiddlewareOptions {
     cookieName?: string;
     dbAuthUrl?: string;
     dbAuthHandler: (req: Request | APIGatewayProxyEvent, context?: Context) => DbAuthResponse;
-    getRoles?: (decoded: any) => string[];
+    /**
+     * Handler for dbAuth's OAuth routes (`/auth/oauth/...` by default),
+     * mirroring `dbAuthHandler`. Typically built by wrapping `OAuthHandler`
+     * from `@cedarjs/auth-dbauth-oauth`:
+     *
+     * ```ts
+     * oauthHandler: (req, context) =>
+     *   new OAuthHandler(req, context, oauthOptions).invoke()
+     * ```
+     *
+     * Omitting this option leaves OAuth routing disabled entirely — requests
+     * under `oauthUrl` simply fall through to the normal dbAuth handling
+     * below.
+     */
+    oauthHandler?: (req: Request | APIGatewayProxyEvent, context?: Context) => DbAuthResponse;
+    /**
+     * URL segment routed to `oauthHandler`. Defaults to `/auth/oauth`,
+     * matching `OAuthHandlerOptions.basePath`'s default in
+     * `@cedarjs/auth-dbauth-oauth`. Only takes effect when `oauthHandler` is
+     * set.
+     */
+    oauthUrl?: string;
+    getRoles?: (decoded: Parameters<GetCurrentUser>[0]) => string[];
     getCurrentUser: GetCurrentUser;
 }
-export declare const initDbAuthMiddleware: ({ dbAuthHandler, getCurrentUser, getRoles, cookieName, dbAuthUrl, }: DbAuthMiddlewareOptions) => [Middleware, "*"];
+export declare const initDbAuthMiddleware: ({ dbAuthHandler, oauthHandler, oauthUrl, getCurrentUser, getRoles, cookieName, dbAuthUrl, }: DbAuthMiddlewareOptions) => [Middleware, "*"];
 export default initDbAuthMiddleware;
 //# sourceMappingURL=index.d.ts.map

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,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;;;;;;;;;;;;;OAaG;IACH,YAAY,CAAC,EAAE,CACb,GAAG,EAAE,OAAO,GAAG,oBAAoB,EACnC,OAAO,CAAC,EAAE,OAAO,KACd,cAAc,CAAA;IACnB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAA;IAC/D,cAAc,EAAE,cAAc,CAAA;CAC/B;AA6BD,eAAO,MAAM,oBAAoB,GAAI,6FAQlC,uBAAuB,KAAG,CAAC,UAAU,EAAE,GAAG,CA+G5C,CAAA;AA8DD,eAAe,oBAAoB,CAAA"}

package/dist/index.js

@@ -1,7 +1,23 @@
 import { MiddlewareResponse } from "@cedarjs/web/middleware";
 import { defaultGetRoles } from "./defaultGetRoles.js";
+function toMiddlewareResponse(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 MiddlewareResponse(output.body, {
+    headers: finalHeaders,
+    status: output.statusCode
+  });
+}
 const initDbAuthMiddleware = ({
   dbAuthHandler,
+  oauthHandler,
+  oauthUrl = "/auth/oauth",
   getCurrentUser,
   getRoles = defaultGetRoles,
   cookieName,
@@ -10,6 +26,15 @@ const initDbAuthMiddleware = ({
   const mw = async (req, res = MiddlewareResponse.next()) => {
     console.log("dbAuthUrl", dbAuthUrl);
     console.log("req.url", req.url);
+    const pathname = new URL(req.url).pathname;
+    let oauthBasePath = oauthUrl;
+    while (oauthBasePath.length > 1 && oauthBasePath.endsWith("/")) {
+      oauthBasePath = oauthBasePath.slice(0, -1);
+    }
+    if (oauthHandler && (pathname === oauthBasePath || pathname.startsWith(`${oauthBasePath}/`))) {
+      const output = await oauthHandler(req);
+      return toMiddlewareResponse(output);
+    }
     if (req.url.includes(dbAuthUrl)) {
       if (req.url.includes(`${dbAuthUrl}/currentUser`)) {
         const validatedSession2 = await validateSession({
@@ -27,18 +52,7 @@ const initDbAuthMiddleware = ({
       } 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 MiddlewareResponse(output.body, {
-          headers: finalHeaders,
-          status: output.statusCode
-        });
+        return toMiddlewareResponse(output);
       }
     }
     const cookieHeader = req.headers.get("Cookie");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/auth-dbauth-middleware",
-  "version": "7.0.0",
+  "version": "7.0.1-next.305",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -32,13 +32,14 @@
     "test:watch": "vitest watch"
   },
   "dependencies": {
-    "@cedarjs/auth-dbauth-api": "7.0.0",
-    "@cedarjs/web": "7.0.0"
+    "@cedarjs/auth-dbauth-api": "7.0.1-next.305",
+    "@cedarjs/web": "7.0.1-next.305"
   },
   "devDependencies": {
-    "@cedarjs/api": "7.0.0",
-    "@cedarjs/framework-tools": "7.0.0",
-    "@cedarjs/graphql-server": "7.0.0",
+    "@cedarjs/api": "7.0.1-next.305",
+    "@cedarjs/auth-dbauth-oauth": "7.0.1-next.305",
+    "@cedarjs/framework-tools": "7.0.1-next.305",
+    "@cedarjs/graphql-server": "7.0.1-next.305",
     "@types/aws-lambda": "8.10.163",
     "concurrently": "9.2.4",
     "publint": "0.3.24",