@redhat-cloud-services/frontend-components-config-utilities 1.5.15 → 1.5.18

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@redhat-cloud-services/frontend-components-config-utilities",
-    "version": "1.5.15",
+    "version": "1.5.18",
     "description": "Utilities for shared config used in RedHat Cloud Services project.",
     "main": "index.js",
     "publishConfig": {
@@ -18,5 +18,8 @@
     "homepage": "https://github.com/RedHatInsights/frontend-components#readme",
     "peerDependencies": {
         "webpack": "^5.0.0"
+    },
+    "dependencies": {
+        "node-fetch": "2.6.7"
     }
 }

package/proxy.js

@@ -1,6 +1,8 @@
 /* eslint-disable no-console */
 // Webpack proxy and express config for `useProxy: true` or `standalone: true`
 const { execSync } = require('child_process');
+const fetch = require('node-fetch');
+var express = require('express');
 const path = require('path');
 const HttpsProxyAgent = require('https-proxy-agent');
 const cookieTransform = require('./cookieTransform');
@@ -34,6 +36,8 @@ module.exports = ({
   registry = [],
   isChrome = false,
   onBeforeSetupMiddleware = () => {},
+  bounceProd = false,
+  useAgent = true,
 }) => {
   const proxy = [];
   const majorEnv = env.split('-')[0];
@@ -53,12 +57,15 @@ module.exports = ({
 
   let agent;
 
-  if (env.startsWith('prod') || env.startsWith('stage')) {
-    // PROD and stage are deployed with Akamai which requires a corporate proxy
+  const isProd = env.startsWith('prod');
+  const isStage = env.startsWith('stage');
+
+  if (isStage || (isProd && useAgent)) {
+    // stage is deployed with Akamai which requires a corporate proxy
     agent = new HttpsProxyAgent(proxyURL);
   }
 
-  if (env.startsWith('stage')) {
+  if (isStage) {
     // stage-stable / stage-beta branches don't exist in build repos
     // Currently stage pulls from QA
     env = env.replace('stage', 'qa');
@@ -185,19 +192,37 @@ module.exports = ({
         return false;
       },
       target,
-      ...(isChrome && {
-        bypass: (req) => {
-          /**
-           * Bypass any HTML requests if using chrome
-           * Serves as a historyApiFallback when refreshing on any other URL than '/'
-           */
-          if (!req.url.match(/\/api\//) && !req.url.match(/\./) && req.headers.accept.includes('text/html')) {
-            return '/';
+      bypass: async (req, res) => {
+        /**
+         * Bypass any HTML requests if using chrome
+         * Serves as a historyApiFallback when refreshing on any other URL than '/'
+         */
+        if (isChrome && !req.url.match(/\/api\//) && !req.url.match(/\./) && req.headers.accept.includes('text/html')) {
+          return '/';
+        }
+
+        /**
+         * Use node-fetch to proxy all non-GET requests (this avoids all origin/host akamai policy)
+         * This enables using PROD proxy without VPN and agent
+         */
+        if (isProd && bounceProd && !useAgent && req.method !== 'GET') {
+          const result = await fetch((target + req.url).replace(/\/\//g, '/'), {
+            method: req.method,
+            body: JSON.stringify(req.body),
+            headers: { cookie: req.headers.cookie, 'Content-Type': 'application/json' },
+          });
+
+          const text = await result.text();
+          try {
+            const data = JSON.parse(text);
+            res.status(result.status).json(data);
+          } catch (err) {
+            res.status(result.status).send(text);
           }
+        }
 
-          return null;
-        },
-      }),
+        return null;
+      },
       router: router(target, useCloud),
       ...(agent && {
         agent,
@@ -235,6 +260,10 @@ module.exports = ({
     },
     onBeforeSetupMiddleware({ app, compiler, options }) {
       app.enable('strict routing'); // trailing slashes are mean
+
+      app.use(express.json());
+      app.use(express.urlencoded({ extended: true }));
+
       /**
        * Allow serving chrome assets
        * This will allow running chrome as a host application

package/serve-federated.js

@@ -3,11 +3,11 @@ const fs = require('fs');
 const concurrently = require('concurrently');
 
 function federate(argv, cwd) {
-  let configPath = argv.config;
+  let configPath = argv.config || './node_modules/@redhat-cloud-services/frontend-components-config/src/scripts/prod.webpack.config.js';
   const WEBPACK_PATH = path.resolve(cwd, './node_modules/.bin/webpack');
   const HTTP_SERVER_PATH = path.resolve(cwd, './node_modules/.bin/http-server');
   if (typeof configPath !== 'string') {
-    console.error('Missing webpack config path');
+    console.error('Invalid webpack config path!');
     process.exit(1);
   }
 

package/standalone/services/default/entitlements.js

@@ -19,17 +19,25 @@ module.exports = ({ env }) => ({
         'entitlements-config': `https://github.com/redhatinsights/entitlements-config#${getEntitlementsBranch(env)}`
     },
     register({ app, config }) {
-      app.get('/api/entitlements/v1/services', (_req, res) => {
-          const configPath = path.join(config.entitlements.assets['entitlements-config'], '/configs/bundles.yml');
-          // Use { json: true } in case of duplicate keys
-          const serviceSKUs = yaml.load(fs.readFileSync(configPath, 'utf8'), { json: true });
-          const services = serviceSKUs.map(serviceSKU => serviceSKU.name);
-          // Grant access to all services
-          const entitlements = services.reduce((acc, cur) => {
-              acc[cur] = { is_entitled: true, is_trial: false };
-              return acc;
-          }, {});
-          res.json(entitlements);
-      });
-    }
+        app.get('/api/entitlements/v1/services', (_req, res) => {
+            try {
+                const configPath = path.join(config.entitlements.assets['entitlements-config'], '/configs/stage/bundles.yml');
+
+                // Use { json: true } in case of duplicate keys
+                const outerYaml = yaml.load(fs.readFileSync(configPath, 'utf8'), { json: true });
+                const serviceSKUs = yaml.load(outerYaml.objects[0].data['bundles.yml'], { json: true });
+
+                const services = serviceSKUs.map(serviceSKU => serviceSKU.name);
+                // Grant access to all services
+                const entitlements = services.reduce((acc, cur) => {
+                    acc[cur] = { is_entitled: true, is_trial: false };
+                    return acc;
+                }, {});
+
+                res.json(entitlements);
+            } catch (error) {
+                res.status(500).json({ error });
+            }
+        });
+    },
 });