@kineticdata/react 6.0.5 → 6.1.1

package/proxyhelper.js

@@ -1,176 +1,201 @@
-const { createProxyMiddleware: proxy } = require('http-proxy-middleware');
-const removeSecure = cookie => cookie.replace(/;\s*Secure/i, '');
-const removeSameSiteNone = cookie => cookie.replace(/;\s*SameSite=None/i, '');
-
-const getProxyData = request => ({
-  host: request.socket._host,
-  scheme: request.agent.protocol.replace(':', ''),
-  method: request.method,
-  path: request.path,
-});
-
-const getRequestData = request => ({
-  host: request.headers.host,
-  scheme: request.headers['x-forwarded-proto'],
-  method: request.method,
-  path: request.url,
-});
-
-const getResponseData = response => ({
-  statusCode: response.statusCode,
-  message: response.message,
-  host: response.socket.servername,
-});
-
-const defaultProxyLogger = ({
-  proxyRequest,
-  originalRequest,
-  proxyResponse,
-}) => {
-  try {
-    if (proxyRequest) {
-      const proxyData = getProxyData(proxyRequest);
-      const originalData = getRequestData(originalRequest);
-      console.log(
-        `[proxy] [original] -> ${originalData.method}\t${originalData.scheme}\t${originalData.host}\t${originalData.path}`,
-      );
-      console.log(
-        `[proxy] [proxied]  -> ${proxyData.method}\t${proxyData.scheme}\t${proxyData.host}\t${proxyData.path}`,
-      );
-    } else if (proxyResponse) {
-      const responseData = getResponseData(proxyResponse);
-      const requestData = getRequestData(originalRequest);
-      console.log(
-        `[proxy] [original] <- ${responseData.statusCode}\t${requestData.method}\t${requestData.scheme}\t${requestData.host} (${responseData.host})\t${requestData.path}`,
-      );
-    }
-  } catch (e) {
-    console.warn(
-      '[proxy] There was a problem logging proxy request/response information',
-      e,
-    );
-  }
-};
-
-const setupProxy = ({
-  target = process.env.REACT_APP_PROXY_HOST,
-  proxyLogger,
-  pathRewrite,
-} = {}) => {
-  return {
-    target,
-    secure: false,
-    pathRewrite,
-    changeOrigin: true,
-    onProxyReq: (proxyRequest, originalRequest) => {
-      // Browsers may send Origin headers even with same-origin
-      // requests. To prevent CORS issues, we have to change
-      // the Origin to match the target URL.
-      if (proxyRequest.getHeader('origin')) {
-        proxyRequest.setHeader('origin', target);
-      }
-
-      if (
-        process.env.REACT_APP_PROXY_SUBDOMAIN &&
-        !proxyRequest.path.endsWith('pack') &&
-        !proxyRequest.path.endsWith('favicon.ico')
-      ) {
-        proxyRequest.setHeader(
-          'X-Kinetic-Subdomain',
-          process.env.REACT_APP_PROXY_SUBDOMAIN,
-        );
-        proxyRequest.path =
-          '/' + process.env.REACT_APP_PROXY_SUBDOMAIN + proxyRequest.path;
-      }
-
-      if (process.env.PROXY_DEBUGGING)
-        (proxyLogger || defaultProxyLogger)({
-          proxyRequest,
-          originalRequest,
-        });
-    },
-    onProxyRes: (proxyResponse, originalRequest) => {
-      if (process.env.PROXY_DEBUGGING)
-        (proxyLogger || defaultProxyLogger)({
-          proxyResponse,
-          originalRequest,
-        });
-
-      const setCookie = proxyResponse.headers['set-cookie'];
-      if (setCookie && originalRequest.protocol === 'http') {
-        proxyResponse.headers['set-cookie'] = Array.isArray(setCookie)
-          ? setCookie.map(removeSecure).map(removeSameSiteNone)
-          : removeSameSiteNone(removeSecure(setCookie));
-      }
-    },
-  };
-};
-
-const getProxyConfig = (
-  app,
-  {
-    mainTarget = process.env.REACT_APP_PROXY_HOST,
-    loghubTarget = process.env.REACT_APP_LOGHUB_PROXY_HOST,
-    systemCoordinatorTarget = process.env.REACT_APP_SYS_COORDINATOR_PROXY_HOST,
-    proxyLogger,
-  } = {},
-) => {
-  const mainPaths = [
-    '**',
-    '!/',
-    '!/favicon.ico',
-    '!/index.html',
-    '!/images/**',
-    '!/static/**',
-    '!/sockjs-node',
-    '!/manifest.json',
-    '!/*.hot-update.js*',
-  ];
-
-  const finalConfigs = [
-    {
-      paths: mainPaths,
-      options: setupProxy({ target: mainTarget, proxyLogger }),
-    },
-  ];
-
-  if (loghubTarget) {
-    // If we're overriding the underlying Loghub host, bypass it in the main.
-    mainPaths.push('!/app/loghub/**');
-    const options = setupProxy({
-      target: loghubTarget,
-      proxyLogger,
-      pathRewrite: {
-        '^/app/loghub': '/app',
-      },
-    });
-    finalConfigs.push({ paths: ['/app/loghub/**'], options });
-  }
-
-  if (systemCoordinatorTarget) {
-    // If we're overriding the underlying Loghub host, bypass it in the main.
-    mainPaths.push('!/app/system-coordinator/**');
-    const options = setupProxy({
-      target: systemCoordinatorTarget,
-      proxyLogger,
-      pathRewrite: {
-        '^/app/system-coordinator': '/app',
-      },
-    });
-    finalConfigs.push({ paths: ['/app/system-coordinator/**'], options });
-  }
-
-  return finalConfigs.map(config => {
-    config.proxy = ({
-      paths = config.paths,
-      options = config.options,
-    } = {}) => {
-      app.use(proxy(paths, options));
-    };
-    return config;
-  });
-};
-
-setupProxy.getProxyConfig = getProxyConfig;
-
-module.exports = setupProxy;
+const { createProxyMiddleware: proxy } = require('http-proxy-middleware');
+const removeSecure = cookie => cookie.replace(/;\s*Secure/i, '');
+const removeSameSiteNone = cookie => cookie.replace(/;\s*SameSite=None/i, '');
+
+const getProxyData = request => ({
+  host: request.socket._host,
+  scheme: request.agent.protocol.replace(':', ''),
+  method: request.method,
+  path: request.path,
+});
+
+const getRequestData = request => ({
+  host: request.headers.host,
+  scheme: request.headers['x-forwarded-proto'],
+  method: request.method,
+  path: request.url,
+});
+
+const getResponseData = response => ({
+  statusCode: response.statusCode,
+  message: response.message,
+  host: response.socket.servername,
+});
+
+const defaultProxyLogger = ({
+  proxyRequest,
+  originalRequest,
+  proxyResponse,
+}) => {
+  try {
+    if (proxyRequest) {
+      const proxyData = getProxyData(proxyRequest);
+      const originalData = getRequestData(originalRequest);
+      console.log(
+        `[proxy] [original] -> ${originalData.method}\t${
+          originalData.scheme
+        }\t${originalData.host}\t${originalData.path}`,
+      );
+      console.log(
+        `[proxy] [proxied]  -> ${proxyData.method}\t${proxyData.scheme}\t${
+          proxyData.host
+        }\t${proxyData.path}`,
+      );
+    } else if (proxyResponse) {
+      const responseData = getResponseData(proxyResponse);
+      const requestData = getRequestData(originalRequest);
+      console.log(
+        `[proxy] [original] <- ${responseData.statusCode}\t${
+          requestData.method
+        }\t${requestData.scheme}\t${requestData.host} (${responseData.host})\t${
+          requestData.path
+        }`,
+      );
+    }
+  } catch (e) {
+    console.warn(
+      '[proxy] There was a problem logging proxy request/response information',
+      e,
+    );
+  }
+};
+
+const setupProxy = ({
+  target = process.env.REACT_APP_PROXY_HOST,
+  proxyLogger,
+  pathRewrite,
+  onlyTenant = false,
+} = {}) => {
+  return {
+    target,
+    secure: false,
+    pathRewrite,
+    changeOrigin: true,
+    onProxyReq: (proxyRequest, originalRequest) => {
+      // Browsers may send Origin headers even with same-origin
+      // requests. To prevent CORS issues, we have to change
+      // the Origin to match the target URL.
+      if (proxyRequest.getHeader('origin')) {
+        proxyRequest.setHeader('origin', target);
+      }
+
+      if (
+        !onlyTenant &&
+        process.env.REACT_APP_PROXY_SUBDOMAIN &&
+        !proxyRequest.path.endsWith('pack') &&
+        !proxyRequest.path.endsWith('favicon.ico')
+      ) {
+        proxyRequest.setHeader(
+          'X-Kinetic-Subdomain',
+          process.env.REACT_APP_PROXY_SUBDOMAIN,
+        );
+        proxyRequest.path =
+          '/' + process.env.REACT_APP_PROXY_SUBDOMAIN + proxyRequest.path;
+      }
+
+      if (process.env.PROXY_DEBUGGING)
+        (proxyLogger || defaultProxyLogger)({
+          proxyRequest,
+          originalRequest,
+        });
+    },
+    onProxyRes: (proxyResponse, originalRequest) => {
+      if (process.env.PROXY_DEBUGGING)
+        (proxyLogger || defaultProxyLogger)({
+          proxyResponse,
+          originalRequest,
+        });
+
+      const setCookie = proxyResponse.headers['set-cookie'];
+      if (setCookie && originalRequest.protocol === 'http') {
+        proxyResponse.headers['set-cookie'] = Array.isArray(setCookie)
+          ? setCookie.map(removeSecure).map(removeSameSiteNone)
+          : removeSameSiteNone(removeSecure(setCookie));
+      }
+    },
+  };
+};
+
+const getProxyConfig = (
+  app,
+  {
+    mainTarget = process.env.REACT_APP_PROXY_HOST,
+    loghubTarget = process.env.REACT_APP_LOGHUB_PROXY_HOST,
+    systemCoordinatorTarget = process.env.REACT_APP_SYS_COORDINATOR_PROXY_HOST,
+    integratorTarget = process.env.REACT_APP_INTEGRATOR_PROXY_HOST,
+    proxyLogger,
+  } = {},
+) => {
+  const mainPaths = [
+    '**',
+    '!/',
+    '!/favicon.ico',
+    '!/index.html',
+    '!/images/**',
+    '!/static/**',
+    '!/sockjs-node',
+    '!/manifest.json',
+    '!/*.hot-update.js*',
+  ];
+
+  const finalConfigs = [
+    {
+      paths: mainPaths,
+      options: setupProxy({ target: mainTarget, proxyLogger }),
+    },
+  ];
+
+  if (loghubTarget) {
+    // If we're overriding the underlying Loghub host, bypass it in the main.
+    mainPaths.push('!/app/loghub/**');
+    const options = setupProxy({
+      target: loghubTarget,
+      proxyLogger,
+      pathRewrite: {
+        '^/app/loghub': '/app',
+      },
+    });
+    finalConfigs.push({ paths: ['/app/loghub/**'], options });
+  }
+
+  if (systemCoordinatorTarget) {
+    // If we're overriding the underlying Loghub host, bypass it in the main.
+    mainPaths.push('!/app/system-coordinator/**');
+    const options = setupProxy({
+      target: systemCoordinatorTarget,
+      proxyLogger,
+      pathRewrite: {
+        '^/app/system-coordinator': '/app',
+      },
+    });
+    finalConfigs.push({ paths: ['/app/system-coordinator/**'], options });
+  }
+
+  if (integratorTarget) {
+    // If we're overriding the underlying Integrator host, bypass it in the main.
+    mainPaths.push('!/app/integrator/**');
+    const options = setupProxy({
+      target: integratorTarget,
+      proxyLogger,
+      pathRewrite: {
+        '^/app/integrator/': '/',
+      },
+      onlyTenant: true,
+    });
+    finalConfigs.push({ paths: ['/app/integrator/**'], options });
+  }
+
+  return finalConfigs.map(config => {
+    config.proxy = ({
+      paths = config.paths,
+      options = config.options,
+    } = {}) => {
+      app.use(proxy(paths, options));
+    };
+    return config;
+  });
+};
+
+setupProxy.getProxyConfig = getProxyConfig;
+
+module.exports = setupProxy;

package/CHANGELOG.md

@@ -1,94 +0,0 @@
-# Changelog for `@kineticdata/react`
-
-When upgrading `@kineticdata/react` to a newer version, remember that all `@kineticdata/*` libraries must be on the same exact version. This is because each `@kineticdata/bundle-*` library has `@kineticdata/react` as a dependency, and if two different versions of `@kineticdata/react` are installed in a bundle, the bundle will never load because authentication happens in a different version of `@kineticdata/react` than the one used during rendering the packages.
-
-Remember to always run `yarn install` after upgrading any dependency versions.
-
-## 6.0.4 (January 22, 2024)
-
-- Fixed bug with SAML logout options
-
-## 6.0.3 (December 11, 2023)
-
-_No relevant changes._
-
-## 6.0.2 (November 6, 2023)
-
-- Removed XSRF header setting from Request Interceptor
-- Added SAML logout options
-- Upgraded various `dependencies` to resolve vulnerabilities
-- Updated the `react` and `react-dom` `peerDependencies` to `>=17.0.2` to support the latest versions of React
-
-### Bundle Issues
-
-One of the `dependencies` that was updated is `axios` whose latest version causes some issues with the latest `react-scripts`. If the bundle has a `craco.config.js` file, the following steps must be taken when upgrading to this version.
-
-1.  In `craco.config.js`, add the following function to the very end of the file:
-
-```javascript
-function getFileLoaderRule(rules) {
-  for (const rule of rules) {
-    if ('oneOf' in rule) {
-      const found = getFileLoaderRule(rule.oneOf);
-      if (found) {
-        return found;
-      }
-    } else if (rule.test === undefined && rule.type === 'asset/resource') {
-      return rule;
-    }
-  }
-}
-```
-
-2.  In `craco.config.js`, add the following code inside the `configure` function of the `webpack` object:
-
-```javascript
-// Fix for CJS files not being treated as JavaScript files
-// https://github.com/facebook/create-react-app/issues/11889#issuecomment-1114928008
-const fileLoaderRule = getFileLoaderRule(webpackConfig.module.rules);
-if (!fileLoaderRule) {
-  throw new Error('File loader not found');
-}
-fileLoaderRule.exclude.push(/\.cjs$/);
-```
-
-## 6.0.1 (September 20, 2023)
-
-- Updated the `react` and `react-dom` `peerDependencies` to `^17.0.2` to support React v17
-
-### Bundle Issues
-
-It is recommended to upgrade the bundle's `react` and `react-dom` versions to `^17.0.2`. This upgrade should not have any breaking changes. To do so, update these two dependency versions in `bundle/packages/app/package.json` and the peer dependency versions in all of the `package.json` files of the other packages.
-
-If you do upgrade `react` to v17, the following steps must also be taken if the bundle has testing configured:
-
-1.  In `bundle/package.json`, remove the `enzyme-adapter-react-16` dependency, and add the following dependency:  
-    `"@wojtekmaj/enzyme-adapter-react-17": "^0.8.0"`
-2.  In `bundle/packages/app/src/setupTests.js`, change the `Adapter` import from `enzyme-adapter-react-16` to be from `@wojtekmaj/enzyme-adapter-react-17`.
-
-## 6.0.0 (February 22, 2023)
-
-- Removed all code related to Discussions
-- Removed most `devDependencies`, which were move to the project root
-
-### Bundle Issues
-
-Because all discussions code was removed from the library, any bundles that are upgraded to this version must have all of their discussions code removed as well, since the various imports from this library that bundles used no longer exist.
-
-We consolidated most of our `devDependencies` into the root of our project, of which `@kineticdata/react` is just one part. Any bundles upgrading to this version must add the following `devDependencies` to the `package.json` file in the root of their `bundle` folder:
-
-```
-"@babel/cli": "^7.23.0",
-"@babel/runtime": "^7.23.2",
-```
-
-If you get the following error when trying to run your bundle:  
-`Uncaught Error: Cannot find module '@babel/runtime/helpers/esm/regeneratorRuntime'`  
-You will need to run the following commands in your `bundle` directory:
-
-```
-npx yarn-deduplicate --packages @babel/runtime -- yarn.lock
-yarn install
-```
-
-The above step will always be required when first upgrading to a v6+ version of `@kineticdata/react`.