@lwrjs/auth-middleware 0.7.0-alpha.2 → 0.7.0-alpha.5

package/build/cjs/utils.cjs

@@ -55,10 +55,14 @@ function getOauthInfoFromCookie(req) {
   const oauthInfoStr = req.cookie(COOKIE_NAME);
   return oauthInfoStr ? JSON.parse(oauthInfoStr) : void 0;
 }
-function buildProxyRequest(req, {access_token, instance_url}) {
+function buildProxyRequest(req, {access_token, instance_url}, existingHeader) {
   const headers = {
+    ...existingHeader,
     Authorization: `Bearer ${access_token}`
   };
+  delete headers.host;
+  delete headers.origin;
+  delete headers.referer;
   let body;
   if (req.method !== "GET" && req.body) {
     body = JSON.stringify(req.body);

package/build/cjs/web-server.cjs

@@ -47,7 +47,8 @@ function platformWebServerAuthMiddleware(server, {proxyEndpoint = import_utils.P
       headers: {"Content-Type": "application/x-www-form-urlencoded", Accept: "application/json"},
       body: `grant_type=authorization_code&code=${code}&client_id=${clientKey}&client_secret=${clientSecret}&redirect_uri=${redirectUri}`
     });
-    const data = await response.json();
+    const contentType = response.headers.get("Content-Type") || "";
+    const data = await (contentType.includes("application/json") ? response.json() : response.text());
     if (response.ok) {
       const {access_token, instance_url} = data;
       res.cookie(import_utils.COOKIE_NAME, JSON.stringify({access_token, instance_url}), {httpOnly: true});
@@ -62,7 +63,7 @@ function platformWebServerAuthMiddleware(server, {proxyEndpoint = import_utils.P
   server.all(`${proxyEndpoint}/${server.getRegexWildcard()}`, async (req, res) => {
     const oauthInfo = (0, import_utils.getOauthInfoFromCookie)(req);
     if (oauthInfo) {
-      const {url, options} = (0, import_utils.buildProxyRequest)(req, oauthInfo);
+      const {url, options} = (0, import_utils.buildProxyRequest)(req, oauthInfo, req.headers);
       const proxyRes = await (0, import_node_fetch.default)(url, options);
       const contentType = proxyRes.headers.get("Content-Type") || "";
       const data = await (contentType.includes("application/json") ? proxyRes.json() : proxyRes.text());

package/build/es/types.d.ts

@@ -1,3 +1,4 @@
+import type { RequestInit } from 'node-fetch';
 export interface PlatformWebServerInput {
     /** base URL to the Connected App, e.g. "https://lwr.lightning.force.com" (no trailing slash) */
     myDomain: string;
@@ -18,10 +19,6 @@ export interface OAuthInfo {
 }
 export interface RequestOptions {
     url: string;
-    options: {
-        method: string;
-        headers?: Record<string, string>;
-        body?: string;
-    };
+    options: RequestInit;
 }
 //# sourceMappingURL=types.d.ts.map

package/build/es/utils.d.ts

@@ -1,4 +1,4 @@
-import type { MiddlewareRequest } from '@lwrjs/types';
+import type { MiddlewareRequest, Headers } from '@lwrjs/types';
 import type { OAuthInfo, RequestOptions, PlatformWebServerInput } from './types.js';
 export declare const LOGIN_ENDPOINT = "/login";
 export declare const REDIRECT_ENDPOINT = "/oauth";
@@ -8,5 +8,5 @@ export declare function buildRedirectUrl(req: MiddlewareRequest): string;
 export declare function getPlatformWebServerEnvVars(): PlatformWebServerInput;
 export declare function getAppPathAsState(req: MiddlewareRequest): string;
 export declare function getOauthInfoFromCookie(req: MiddlewareRequest): OAuthInfo | undefined;
-export declare function buildProxyRequest(req: MiddlewareRequest, { access_token, instance_url }: OAuthInfo): RequestOptions;
+export declare function buildProxyRequest(req: MiddlewareRequest, { access_token, instance_url }: OAuthInfo, existingHeader: Headers): RequestOptions;
 //# sourceMappingURL=utils.d.ts.map

package/build/es/utils.js

@@ -42,11 +42,16 @@ export function getOauthInfoFromCookie(req) {
     return oauthInfoStr ? JSON.parse(oauthInfoStr) : undefined;
 }
 // Build an authenticated request based on a request to the proxy endpoint
-export function buildProxyRequest(req, { access_token, instance_url }) {
-    // Add the oauth header, future: forward any headers from the client?
+export function buildProxyRequest(req, { access_token, instance_url }, existingHeader) {
+    // Add the oauth header to existing headers
     const headers = {
+        ...existingHeader,
         Authorization: `Bearer ${access_token}`, // add the oauth header
     };
+    // must delete certain headers to satisfy CORS
+    delete headers.host;
+    delete headers.origin;
+    delete headers.referer;
     // Pull the body from non-GET requests
     let body;
     if (req.method !== 'GET' && req.body) {

package/build/es/web-server.js

@@ -37,7 +37,10 @@ export function platformWebServerAuthMiddleware(server, { proxyEndpoint = PROXY_
             body: `grant_type=authorization_code&code=${code}&client_id=${clientKey}&client_secret=${clientSecret}&redirect_uri=${redirectUri}`,
         });
         // Response handling
-        const data = await response.json();
+        const contentType = response.headers.get('Content-Type') || ''; // parse as json or text
+        const data = await (contentType.includes('application/json')
+            ? response.json()
+            : response.text());
         if (response.ok) {
             // Store the OAuth info in a cookie and redirect to the app
             const { access_token, instance_url } = data;
@@ -57,7 +60,7 @@ export function platformWebServerAuthMiddleware(server, { proxyEndpoint = PROXY_
     server.all(`${proxyEndpoint}/${server.getRegexWildcard()}`, async (req, res) => {
         const oauthInfo = getOauthInfoFromCookie(req);
         if (oauthInfo) {
-            const { url, options } = buildProxyRequest(req, 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());

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.7.0-alpha.2",
+    "version": "0.7.0-alpha.5",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -29,14 +29,16 @@
         "build/**/*.cjs",
         "build/**/*.d.ts"
     ],
-    "devDependencies": {
-        "@lwrjs/server": "0.7.0-alpha.2",
-        "@lwrjs/types": "0.7.0-alpha.2",
-        "@types/node-fetch": "^2.5.12",
+    "dependencies": {
         "node-fetch": "^2.6.1"
     },
+    "devDependencies": {
+        "@lwrjs/server": "0.7.0-alpha.5",
+        "@lwrjs/types": "0.7.0-alpha.5",
+        "@types/node-fetch": "^2.5.12"
+    },
     "engines": {
         "node": ">=14.15.4 <17"
     },
-    "gitHead": "fc3a13d1c5440833eb2ec17fbf0e294554bafa08"
+    "gitHead": "4be785ee5e0da8fbbf29bf18993bbd77febf5a2c"
 }