@lwrjs/dev-proxy-server 0.15.0-alpha.9 → 0.15.0

package/build/cjs/middleware.cjs

@@ -38,18 +38,23 @@ var ProxyLogLevels;
   ProxyLogLevels2["Error"] = "error";
   ProxyLogLevels2["Silent"] = "silent";
 })(ProxyLogLevels || (ProxyLogLevels = {}));
-function addLocalProxyMiddleware(app, defaultHost) {
+function getForwardedHeader(incomingRequest, remoteOrigin) {
+  const remoteHost = remoteOrigin?.replace(/^([a-z][a-z0-9+\-.]*):\/\//, "");
+  const hostHeader = remoteHost || incomingRequest.headers.host;
+  const hostProto = remoteHost ? "https" : incomingRequest.protocol;
+  return `host=${hostHeader};proto=${hostProto}`;
+}
+function addLocalProxyMiddleware(app, defaultHost, remoteOrigin) {
   const domainAndPort = defaultHost.replace(/^([a-z][a-z0-9+\-.]*):\/\//, "");
-  app.use("/", (0, import_http_proxy_middleware.default)({
+  app.use("/", (0, import_http_proxy_middleware.createProxyMiddleware)({
     target: defaultHost,
     changeOrigin: true,
     onProxyReq: (proxyRequest, incomingRequest) => {
-      const forwarded = incomingRequest.headers.forwarded;
       const hostHeader = incomingRequest.headers.host;
-      const hostProto = incomingRequest.protocol;
       if (hostHeader !== domainAndPort) {
         proxyRequest.setHeader(HOST, domainAndPort);
-        proxyRequest.setHeader("Forwarded", forwarded ? forwarded : `host=${hostHeader};proto=${hostProto}`);
+        const forwarded = incomingRequest.headers.forwarded;
+        proxyRequest.setHeader("Forwarded", forwarded ? forwarded : getForwardedHeader(incomingRequest, remoteOrigin));
       }
     }
   }));
@@ -61,7 +66,7 @@ function addRemoteProxyMiddleware(app, proxyConfig) {
     const [path, target] = entry;
     const targetHost = target.replace(/^([a-z][a-z0-9+\-.]*):\/\//, "");
     const pathRewrite = mobifyRules && (path.indexOf("/mobify/proxy") === 0 || path.indexOf("/mobify/caching") === 0) ? {[path]: ""} : void 0;
-    app.use(path, (0, import_http_proxy_middleware.default)({
+    app.use(path, (0, import_http_proxy_middleware.createProxyMiddleware)({
       target,
       pathRewrite,
       logLevel: resolveLogLevel(import_diagnostics.logger.getLogLevel()),
@@ -80,6 +85,23 @@ function addRemoteProxyMiddleware(app, proxyConfig) {
         proxyRequest.setHeader("Forwarded", `host=${hostHeader}`);
         const originalPath = incomingRequest.url;
         proxyRequest.path = originalPath;
+        if (process.env.AUTH_TOKEN) {
+          let cookies = proxyRequest.getHeader("cookie") || "";
+          const sidCookie = `__Secure-has-sid=1; sid=${process.env.AUTH_TOKEN};`;
+          if (cookies) {
+            cookies += `; ${sidCookie}`;
+          } else {
+            cookies = sidCookie;
+          }
+          proxyRequest.setHeader("cookie", cookies);
+          if (process.env.PROXY_AS_GUEST !== "true") {
+            const reqUrl = new URL(incomingRequest.url || "", `http://${incomingRequest.headers.host}`);
+            if (reqUrl.searchParams.get("asGuest") === "true") {
+              reqUrl.searchParams.set("asGuest", "false");
+              proxyRequest.path = reqUrl.pathname + reqUrl.search;
+            }
+          }
+        }
       }
     }));
   }

package/build/cjs/proxy-server.cjs

@@ -33,7 +33,7 @@ var LwrProxyServer = class {
     this.proxyServer = (0, import_express.default)();
     this.config = config;
     (0, import_middleware.addRemoteProxyMiddleware)(this.proxyServer, this.config);
-    (0, import_middleware.addLocalProxyMiddleware)(this.proxyServer, this.config.defaultHost);
+    (0, import_middleware.addLocalProxyMiddleware)(this.proxyServer, this.config.defaultHost, this.config.remoteOrigin);
   }
   async listen(callback) {
     const {proxyServer, config} = this;

package/build/es/middleware.d.ts

@@ -5,7 +5,7 @@ import type { LwrProxyConfiguration } from './proxy-server.js';
  * @param app
  * @param defaultHost
  */
-export declare function addLocalProxyMiddleware(app: ExpressApp, defaultHost: string): void;
+export declare function addLocalProxyMiddleware(app: ExpressApp, defaultHost: string, remoteOrigin?: string): void;
 /**
  * The Proxy middleware responsible for proxying requests to a configured remote origin.
  * @param app

package/build/es/middleware.js

@@ -1,4 +1,4 @@
-import proxy from 'http-proxy-middleware';
+import { createProxyMiddleware } from 'http-proxy-middleware';
 import { logger } from '@lwrjs/diagnostics';
 // Header constants
 const HOST = 'host';
@@ -11,26 +11,31 @@ var ProxyLogLevels;
     ProxyLogLevels["Error"] = "error";
     ProxyLogLevels["Silent"] = "silent";
 })(ProxyLogLevels || (ProxyLogLevels = {}));
+function getForwardedHeader(incomingRequest, remoteOrigin) {
+    // In prod, the Forwarded header is added by the CDN and is set to the Core org
+    const remoteHost = remoteOrigin?.replace(/^([a-z][a-z0-9+\-.]*):\/\//, '');
+    const hostHeader = remoteHost || incomingRequest.headers.host;
+    const hostProto = remoteHost ? 'https' : incomingRequest.protocol;
+    return `host=${hostHeader};proto=${hostProto}`;
+}
 /**
  * The Proxy middleware responsible for proxying all other requests not configured to external systems.
  * @param app
  * @param defaultHost
  */
-export function addLocalProxyMiddleware(app, defaultHost) {
+export function addLocalProxyMiddleware(app, defaultHost, remoteOrigin) {
     const domainAndPort = defaultHost.replace(/^([a-z][a-z0-9+\-.]*):\/\//, '');
-    app.use('/', proxy({
+    app.use('/', createProxyMiddleware({
         target: defaultHost,
         changeOrigin: true,
         onProxyReq: (proxyRequest, incomingRequest) => {
-            // If a forwarded header is passed it should take precedence
-            const forwarded = incomingRequest.headers.forwarded;
-            // Host: <host>:<port>
+            // Set the Host header to the target
             const hostHeader = incomingRequest.headers.host;
-            const hostProto = incomingRequest.protocol;
             if (hostHeader !== domainAndPort) {
                 proxyRequest.setHeader(HOST, domainAndPort);
-                // Add Forwarded header per https://git.soma.salesforce.com/pages/benjamin-fry/lwr-on-mrt-designs/request_path.html
-                proxyRequest.setHeader('Forwarded', forwarded ? forwarded : `host=${hostHeader};proto=${hostProto}`);
+                // Set the Forwarded header if it's not defined
+                const forwarded = incomingRequest.headers.forwarded;
+                proxyRequest.setHeader('Forwarded', forwarded ? forwarded : getForwardedHeader(incomingRequest, remoteOrigin));
             }
         },
     }));
@@ -53,7 +58,7 @@ export function addRemoteProxyMiddleware(app, proxyConfig) {
         const pathRewrite = mobifyRules && (path.indexOf('/mobify/proxy') === 0 || path.indexOf('/mobify/caching') === 0)
             ? { [path]: '' }
             : undefined;
-        app.use(path, proxy({
+        app.use(path, createProxyMiddleware({
             target,
             pathRewrite,
             logLevel: resolveLogLevel(logger.getLogLevel()),
@@ -77,6 +82,32 @@ export function addRemoteProxyMiddleware(app, proxyConfig) {
                 // Preserve the original path, including double slashes
                 const originalPath = incomingRequest.url;
                 proxyRequest.path = originalPath;
+                // Add auth token in cookies
+                // Retrieve the current cookie header
+                if (process.env.AUTH_TOKEN) {
+                    let cookies = proxyRequest.getHeader('cookie') || '';
+                    // Append the SID token to the cookies
+                    const sidCookie = `__Secure-has-sid=1; sid=${process.env.AUTH_TOKEN};`;
+                    if (cookies) {
+                        cookies += `; ${sidCookie}`;
+                    }
+                    else {
+                        cookies = sidCookie;
+                    }
+                    // Set our auth cookies on the proxied request
+                    proxyRequest.setHeader('cookie', cookies);
+                    // TODO once local-dev bundles are updated appropriately we can remove this
+                    // Remove asGuest from query parameters as that can cause issues with certain requests
+                    // Example Request for CMS image that fails with asGuest=true
+                    // /services/data/v62.0/connect/sites/0DMSB000000jBc24AE/cms/delivery/contents?includeContentBody=true&contentKeys=MCB6JD6GWNRVFYHN2CAP5WQNOXQE&language=en-US&asGuest=true&htmlEncode=false
+                    if (process.env.PROXY_AS_GUEST !== 'true') {
+                        const reqUrl = new URL(incomingRequest.url || '', `http://${incomingRequest.headers.host}`);
+                        if (reqUrl.searchParams.get('asGuest') === 'true') {
+                            reqUrl.searchParams.set('asGuest', 'false');
+                            proxyRequest.path = reqUrl.pathname + reqUrl.search;
+                        }
+                    }
+                }
             },
         }));
     }

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

@@ -1,6 +1,7 @@
 import { Application as ExpressApp } from 'express';
 export interface LwrProxyConfiguration {
     proxyConfigs: ProxyConfigDefinition[];
+    remoteOrigin?: string;
 }
 type ProxyConfigDefinition = Array<string>;
 export interface LwrProxyServerConfig extends LwrProxyConfiguration {

package/build/es/proxy-server.js

@@ -8,7 +8,7 @@ export class LwrProxyServer {
         this.proxyServer = express();
         this.config = config;
         addRemoteProxyMiddleware(this.proxyServer, this.config);
-        addLocalProxyMiddleware(this.proxyServer, this.config.defaultHost);
+        addLocalProxyMiddleware(this.proxyServer, this.config.defaultHost, this.config.remoteOrigin);
     }
     async listen(callback) {
         const { proxyServer, config } = this;

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.15.0-alpha.9",
+    "version": "0.15.0",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -33,13 +33,13 @@
         "build": "tsc -b"
     },
     "dependencies": {
-        "@lwrjs/diagnostics": "0.15.0-alpha.9",
-        "@lwrjs/shared-utils": "0.15.0-alpha.9",
-        "express": "^4.19.2",
-        "http-proxy-middleware": "0.21.0"
+        "@lwrjs/diagnostics": "0.15.0",
+        "@lwrjs/shared-utils": "0.15.0",
+        "express": "^4.20.0",
+        "http-proxy-middleware": "2.0.7"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.15.0-alpha.9"
+        "@lwrjs/types": "0.15.0"
     },
     "engines": {
         "node": ">=18.0.0"
@@ -47,5 +47,5 @@
     "volta": {
         "extends": "../../../package.json"
     },
-    "gitHead": "9783b817b11c29ca385457683fcb87e8179f7902"
+    "gitHead": "ee374df435d5342f63e4da126a09461e761837f3"
 }