@lwrjs/auth-middleware 0.12.0-alpha.9 → 0.12.0

package/README.md

@@ -20,7 +20,7 @@ import { createServer } from 'lwr';
 import { platformWebServerAuthMiddleware } from '@lwrjs/auth-middleware';
 
 const lwrApp = createServer(lwrConfig);
-platformWebServerAuthMiddleware(lwrApp.getServer()); // Pass in the generic LWR server interface
+platformWebServerAuthMiddleware(lwrApp); // Pass in the generic LWR server
 ```
 
 > For more information on LWR middleware see [this recipe](https://github.com/salesforce-experience-platform-emu/lwr-recipes/tree/master/packages/custom-middleware).
@@ -75,7 +75,7 @@ The `platformWebServerAuthMiddleware` uses the [OAuth 2.0 Web Server Flow for We
 
 An app developer can attach the LWR authentication middleware when they create their LWR server. The middleware takes the following arguments:
 
--   _Required_ app server instance from `getServer()`; this is compatible with both the Express and Koa LWR server types. Do not use `getInternalServer()`, which returns **either** the underlying Express **or** Koa server.
+-   _Required_ LWR app instance from `createServer()`; this is compatible with both the Express and Koa LWR server types. Do not use `LwrApp.getInternalServer()`, which returns **either** the underlying Express **or** Koa server.
 -   _Optional_ bag of options: `{ proxyEndpoint?: string; }`:
     -   proxyEndpoint: The endpoint which proxies all its requests to the Salesforce org; it defaults to `/services/data`.
 
@@ -84,7 +84,7 @@ import { createServer } from 'lwr';
 import { platformWebServerAuthMiddleware } from '@lwrjs/auth-middleware';
 
 const lwrApp = createServer(lwrConfig);
-platformWebServerAuthMiddleware(lwrApp.getServer(), { proxyEndpoint: '/some/where' });
+platformWebServerAuthMiddleware(lwrApp, { proxyEndpoint: '/some/where' });
 ```
 
 ### Variables

package/build/cjs/web-server.cjs

@@ -27,6 +27,7 @@ __export(exports, {
   platformWebServerAuthMiddleware: () => platformWebServerAuthMiddleware,
   stateMap: () => stateMap
 });
+var import_core = __toModule(require("@lwrjs/core"));
 var import_diagnostics = __toModule(require("@lwrjs/diagnostics"));
 var import_utils = __toModule(require("./utils.cjs"));
 var stateMap = new Map();
@@ -76,7 +77,7 @@ function platformWebServerAuthMiddleware(server, {proxyEndpoint = import_utils.P
       res.status(response.status).send(errorMsg);
     }
   });
-  server.all(`${proxyEndpoint}/${server.getRegexWildcard()}`, async (req, res) => {
+  server.all(`${proxyEndpoint}/${server.serverType === "koa" ? "(.*)" : "*"}`, async (req, res) => {
     const oauthInfo = (0, import_utils.getOauthInfoFromCookie)(req);
     if (oauthInfo) {
       const {url, options} = (0, import_utils.buildProxyRequest)(req, oauthInfo, req.headers);

package/build/es/web-server.d.ts

@@ -1,5 +1,5 @@
-import type { PublicAppServer, ServerTypes } from '@lwrjs/types';
 import type { PlatformWebServerOptions, LoginState } from './types.js';
+import { LwrApp } from '@lwrjs/core';
 export declare const stateMap: Map<string, LoginState>;
 /**
  * Web Server OAuth middleware: https://help.salesforce.com/s/articleView?id=sf.remoteaccess_oauth_web_server_flow.htm&type=5
@@ -14,5 +14,5 @@ export declare const stateMap: Map<string, LoginState>;
  *      - login_server: an encoded string; the middleware attempts to login at this address; default is "https://login.salesforce.com"
  *      - redirect_uri: an encoded string; this is where the middleware redirects to after OAuth is done; default is calculated from the request source
  */
-export declare function platformWebServerAuthMiddleware<T extends ServerTypes>(server: PublicAppServer<T>, { proxyEndpoint }?: PlatformWebServerOptions): void;
+export declare function platformWebServerAuthMiddleware(server: LwrApp, { proxyEndpoint }?: PlatformWebServerOptions): void;
 //# sourceMappingURL=web-server.d.ts.map

package/build/es/web-server.js

@@ -1,3 +1,6 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore - LwrApp as a type is not working correctly
+import '@lwrjs/core';
 import { logger } from '@lwrjs/diagnostics';
 import { COOKIE_NAME, DEFAULT_LOGIN_SERVER, LOGIN_ENDPOINT, MESSAGE_PREFIX, PROXY_ENDPOINT, REDIRECT_ENDPOINT, REVOKE_ENDPOINT, buildProxyRequest, buildRedirectUrl, generateStateString, sanitizeAppPath, getOauthInfoFromCookie, getPlatformWebServerEnvVars, } from './utils.js';
 export const stateMap = new Map();
@@ -78,13 +81,15 @@ export function platformWebServerAuthMiddleware(server, { proxyEndpoint = PROXY_
     });
     // Now, proxy requests using the token to authorize them
     // e.g. /services/data/v52.0/ui-api/list-ui/Opportunity/AllOpportunities"
-    server.all(`${proxyEndpoint}/${server.getRegexWildcard()}`, async (req, res) => {
+    server.all(`${proxyEndpoint}/${server.serverType === 'koa' ? '(.*)' : '*'}`, async (req, res) => {
         const oauthInfo = getOauthInfoFromCookie(req);
         if (oauthInfo) {
             const { url, options } = buildProxyRequest(req, oauthInfo, req.headers);
             const proxyRes = await fetch(url, options);
             const contentType = proxyRes.headers.get('Content-Type') || ''; // parse as json or text
-            const data = await (contentType.includes('application/json') ? proxyRes.json() : proxyRes.text());
+            const data = await (contentType.includes('application/json')
+                ? proxyRes.json()
+                : proxyRes.text());
             res.status(proxyRes.status).send(data);
         }
         else {

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.12.0-alpha.9",
+    "version": "0.12.0",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -30,14 +30,15 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@lwrjs/diagnostics": "0.12.0-alpha.9"
+        "@lwrjs/core": "0.12.0",
+        "@lwrjs/diagnostics": "0.12.0"
     },
     "devDependencies": {
-        "@lwrjs/server": "0.12.0-alpha.9",
-        "@lwrjs/types": "0.12.0-alpha.9"
+        "@lwrjs/server": "0.12.0",
+        "@lwrjs/types": "0.12.0"
     },
     "engines": {
         "node": ">=18.0.0"
     },
-    "gitHead": "58b28fbc6300b704ac17f8878423120de0e376d7"
+    "gitHead": "90f93604b26003e1e1eb85bb0d1f34f4fc9e9ff9"
 }