@boomerang-io/webapp-spa-server 1.0.0-beta.0 → 1.0.2-beta.0

package/cli.js

@@ -1,5 +1,7 @@
 #!/usr/bin/env node
 
+const boomerangLogger = require("@boomerang-io/logger-middleware")("webapp-spa-server/index.js");
+const logger = boomerangLogger.logger;
 /**
  * Import and execute app
  */
@@ -22,7 +24,6 @@ require("yargs") // eslint-disable-line
     describe: "CORS configuration using cors package. Accepts JSON string.",
     type: "string",
   })
-
   .option("disableInjectHTMLHeadData", {
     alias: "d",
     describe: "Enable injection of data and scripts into the head of the HTML file.",
@@ -36,5 +37,16 @@ require("yargs") // eslint-disable-line
     type: "string",
   })
   .coerce({
-    cors: JSON.parse,
+    cors: (arg) => {
+      if (arg) {
+        return JSON.parse(arg);
+      }
+    },
+  })
+  .fail(function (msg, err) {
+    logger.error(msg);
+    if (err) {
+      throw err;
+    }
+    process.exit(1);
   }).argv;

package/index.js

@@ -36,10 +36,9 @@ function createBoomerangServer({
     NEW_RELIC_LICENSE_KEY,
     HTML_HEAD_INJECTED_SCRIPTS,
     BUILD_DIR = "build",
-    BASE_LAUNCH_ENV_URL,
     GA_SITE_ID,
+    ENABLE_BEEHEARD_SURVEY,
   } = process.env;
-  logger.debug("PROCESS ENV: ", process.env);
 
   // Monitoring
   if (NEW_RELIC_APP_NAME && NEW_RELIC_LICENSE_KEY) {
@@ -61,9 +60,11 @@ function createBoomerangServer({
 
   // Security
   const helmet = require("helmet");
-  app.use(helmet({
-    contentSecurityPolicy: false,
-  }));
+  app.use(
+    helmet({
+      contentSecurityPolicy: false,
+    })
+  );
   app.disable("x-powered-by");
   app.use(cors(corsConfig));
 
@@ -85,9 +86,7 @@ function createBoomerangServer({
    * It will be returned on the second route
    * https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#serving-apps-with-client-side-routing
    */
-  logger.debug("0 - disableInjectHTMLHeadData: ", disableInjectHTMLHeadData);
   if (!disableInjectHTMLHeadData) {
-    logger.debug("1 - URL and ID: ",GA_SITE_ID,BASE_LAUNCH_ENV_URL);
     appRouter.use(
       "/",
       express.static(path.join(process.cwd(), BUILD_DIR), {
@@ -102,11 +101,11 @@ function createBoomerangServer({
         HTML_HEAD_INJECTED_SCRIPTS,
         APP_ROOT,
         GA_SITE_ID,
-        BASE_LAUNCH_ENV_URL
+        ENABLE_BEEHEARD_SURVEY
       )
     );
   } else {
-    logger.debug("1 - disableInjectHTMLHeadData: ",disableInjectHTMLHeadData);
+    logger.debug("1 - disableInjectHTMLHeadData: ", disableInjectHTMLHeadData);
     appRouter.use("/", express.static(path.join(process.cwd(), BUILD_DIR)));
   }
 
@@ -138,6 +137,7 @@ function createBoomerangServer({
  * @param {string} appRoot - root context off app. Used for script injection
  * @param {string} gaSiteId - siteID to be injected on scripts to support GA
  * @param {string} baseLaunchUrl - base url to determine GA primaryCategory
+ * @param {boolean} enableBeeheardSurvey - true/false value configured at helm to decide to insert survey script
  */
 function injectEnvDataAndScriptsIntoHTML(
   res,
@@ -146,13 +146,12 @@ function injectEnvDataAndScriptsIntoHTML(
   injectedScripts,
   appRoot,
   gaSiteId,
-  baseLaunchUrl
+  enableBeeheardSurvey
 ) {
   /**
    * Create objects to be injected into application via the HEAD tag
    */
   // Build script for GA integration
-  logger.debug("2 - GA Site ID: ",gaSiteId);
   const headScripstGA = Boolean(gaSiteId)
     ? `<script type="text/javascript">
       window.idaPageIsSPA = true;
@@ -182,6 +181,11 @@ function injectEnvDataAndScriptsIntoHTML(
     <script src="//1.www.s81c.com/common/stats/ibm-common.js" type="text/javascript"></script>
     `
     : "";
+
+  const headScriptBeeheardSurvey = Boolean(enableBeeheardSurvey)
+    ? '<script async src="https://beeheard.dal1a.cirrus.ibm.com/survey/preconfig/HHPxpQgN.js"></script>'
+    : "";
+
   // Build up object of external data to append
   const headInjectedData = injectedDataKeys.split(",").reduce((acc, key) => {
     acc[key] = process.env[key];
@@ -222,6 +226,7 @@ function injectEnvDataAndScriptsIntoHTML(
         })};
       </script>
       ${headScripstGA}
+      ${headScriptBeeheardSurvey}
       ${headScriptsTags}
       </head>`
     );

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@boomerang-io/webapp-spa-server",
   "description": "Webapp Server for React-based SPA w/ client-side routing",
-  "version": "1.0.0-beta.0",
+  "version": "1.0.2-beta.0",
   "author": {
     "name": "Tim Bula",
     "email": "timrbula@gmail.com"
@@ -25,7 +25,7 @@
     "start": "node tester.js"
   },
   "dependencies": {
-    "@boomerang-io/logger-middleware": "^0.0.2",
+    "@boomerang-io/logger-middleware": "1.0.0",
     "@cloudnative/health-connect": "^2.1.0",
     "body-parser": "^1.19.1",
     "compression": "^1.7.4",