@sassoftware/viya-serverjs 0.3.0 → 0.5.0

package/src/index.js

@@ -1,249 +1,247 @@
-/*
- *  ------------------------------------------------------------------------------------
- *  * Copyright (c) SAS Institute Inc.
- *  *  Licensed under the Apache License, Version 2.0 (the 'License');
- *  * you may not use this file except in compliance with the License.
- *  * You may obtain a copy of the License at
- *  *
- *  * http://www.apache.org/licenses/LICENSE-2.0
- *  *
- *  *  Unless required by applicable law or agreed to in writing, software
- *  * distributed under the License is distributed on an 'AS IS' BASIS,
- *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  * See the License for the specific language governing permissions and
- *  limitations under the License.
- * ----------------------------------------------------------------------------------------
- *
- */
-
-import "core-js/stable";
-import "regenerator-runtime/runtime";
-import fs from "fs";
-import iService from "./iService";
-import config from "./config";
-let debug = require("debug")("startup");
-
-module.exports = function core(
-  uTable,
-  useDefault,
-  serverMode,
-  customize,
-  swaggerfcn
-) {
-  let argv = require("yargs").argv;
-  let env = argv.env == null ? null : argv.env;
-  let appenv = argv.appenv == null ? null : argv.appenv;
-  let docker = argv.docker == null ? null : argv.docker;
-  //process.env.SERVERMODE = serverMode !== null ? "api" : "app";
-
-
-  if (useDefault == null) {
-    useDefault = true;
-  }
-  console.log(
-    "Initialization started ============================================================"
-  );
-  console.log(`version: 2, Build Date: `, Date());
-  console.log(
-    `\nCommand Line Configuration:
-          Dockerfile: ${docker}
-          env file  : ${env}
-          appenv    : ${appenv}
-          customize : ${customize != null}
-          `
-  );
-
-  iapp(null, env, docker, uTable, useDefault, serverMode, customize);
-};
-
-function iapp(
-  appSrc,
-  rafEnv,
-  dockerFile,
-  uTable,
-  useDefault,
-  serverMode,
-  customize
-) {
-  let asset = setup(rafEnv, dockerFile);
-  if (appSrc == null) {
-    appSrc = process.env.APPENV == null ? null : process.env.APPENV;
-  }
-  if (appSrc != null) {
-    console.log("appSrc", `+${appSrc}+`);
-    createPayload(appSrc, (err, r) => {
-      if (err) {
-        console.log(err);
-        console.log("createPayload failed");
-        process.exit(1);
-      } else {
-        iService(uTable, useDefault, asset, r, serverMode, customize);
-      }
-    });
-  } else {
-    let appEnv = getAllEnv({});
-    iService(uTable, useDefault, asset, appEnv, serverMode, customize);
-  }
-}
-
-function setup(rafEnv, dockerFile) {
-  config(rafEnv, dockerFile);
-  let asset = process.env.APPLOC === "." ? process.cwd() : process.env.APPLOC;
-  process.env.APPASSET = asset;
-  return asset;
-}
-
-function createPayload(srcName, cb) {
-  let src = fs.readFileSync(srcName, "utf8");
-  if (src === null) {
-    cb(`Error: ${srcName} was not found. `);
-  }
-  try {
-    // console.log(src);
-    let f = new Function(src);
-    console.log(`${srcName} compile completed`);
-    let r = f();
-    f = null;
-
-    let ar = getAllEnv(r);
-    cb(null, ar);
-  } catch (err) {
-    console.log(`${srcName} compile failed`);
-    cb(err);
-  }
-}
-
-function getAllEnv(userData) {
-  let env;
-  let l = null;
-  let host = trimit("VIYA_SERVER");
-  if (host === 'none' || host == null) {
-    console.log('Note: setting host to null');
-    host = null;
-  }
-
-  /*
-  if (process.env.AUTHTYPE != null) {
-    process.env.AUTHFLOW = process.env.AUTHTYPE;
-  }
-    */ 
-
-  let authflow = trimit("AUTHFLOW");
-  if (authflow === "authorization_code" || authflow === "code") {
-    authflow = "server";
-  } 
-
-  if (authflow === null) {
-    host = null;
-  }
-
-  if (host === null) {
-    authflow = null;
-    console.log('Note: setting authflow to null');
-  }
-
-  process.env.AUTHFLOW = authflow;
-  // let redirect = (process.env.REDIRECT != null) ? process.env.REDIRECT : null;
-  let redirect = trimit("REDIRECT");
-
-  let clientID = trimit("CLIENTID");
-
-  // eslint-disable-next-line no-unused-vars
-  let clientSecret = trimit("CLIENTSECRET");
-  let keepAlive = trimit("KEEPALIVE");
-  let appName = trimit("APPNAME");
-  let ns = trimit("NAMESPACE");
-  let nsHost = trimit("NSHOST");
-
-  l = {
-    authflow: authflow,
-    redirect: redirect,
-
-    host: host,
-    clientID: clientID,
-    appName: appName,
-
-    keepAlive: null,
-    useToken: process.env.USETOKEN,
-
-    ns: ns,
-    nsHost: nsHost,
-  };
-  if (authflow === "server" || authflow === "implicit") {
-    if (authflow === "implicit") {
-      if (redirect === null) {
-        redirect = `${appName}/callback`;
-        process.env.REDIRECT = "callback";
-      } else {
-        if (redirect !== null && redirect.indexOf("/") !== 0) {
-          redirect =
-            redirect.indexOf("http") != -1
-              ? redirect
-              : `${process.env.APPNAME}/${redirect}`;
-        }
-      }
-      l.redirect = redirect;
-    }
-    
-    if (authflow === "server" && keepAlive === "YES") {
-      let protocol = process.env.HTTPS === "true" ? "https://" : "http://";
-      l.keepAlive = `${protocol}${process.env.APPHOST}:${process.env.APPPORT}/${appName}/keepAlive`;
-      l.keepAlive = l.keepAlive.replace(/0.0.0.0/, "localhost");
-    }
-    if (process.env.TIMERS != null) {
-      l.timers = process.env.TIMERS;
-    }
-  }
-  // allow for no authtype
-  l = {
-    authType: authflow,
-    redirect: redirect,
-
-    host: host,
-    clientID: clientID,
-    appName: appName,
-
-    keepAlive: null,
-    useToken: process.env.USETOKEN,
-
-    ns: ns,
-    nsHost: nsHost,
-  };
-
-// pick up the app env's - replacement for appenv.js
-// appenv.js still supported for backward compatibility
-for (let key in process.env) {
-  debug(key);
-  if (key.indexOf("APPENV_") === 0) {
-    let k = key.substring(7);
-    let v = process.env[key];
-    if (v != null && v.trim().length > 0) {
-      if (v.startsWith('$')) {
-        v = process.env[v.substring(1)];
-      }
-      userData[k] = (v != null) ? v.trim() : null;
-    } else {
-      userData[k] = null;
-
-    }
-  }
-}
-
-env = {
-  LOGONPAYLOAD: l,
-  APPENV: userData,
-};
-console.log("Final APPENV configuration for the server");
-console.log(JSON.stringify(env, null, 4));
-console.log(Date());
-return env;
-}
-
-function trimit(e) {
-  let a = process.env[e];
-  if (a == null) {
-    return null;
-  }
-  a = a.trim();
-  return a.length === 0 ? null : a;
-}
+/*
+ *  ------------------------------------------------------------------------------------
+ *  * Copyright (c) SAS Institute Inc.
+ *  *  Licensed under the Apache License, Version 2.0 (the 'License');
+ *  * you may not use this file except in compliance with the License.
+ *  * You may obtain a copy of the License at
+ *  *
+ *  * http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  *  Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the License is distributed on an 'AS IS' BASIS,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the License for the specific language governing permissions and
+ *  limitations under the License.
+ * ----------------------------------------------------------------------------------------
+ *
+ */
+
+import "core-js/stable";
+import "regenerator-runtime/runtime";
+import fs from "fs";
+import iService from "./iService";
+import config from "./config";
+import yargs from "yargs";
+import { hideBin } from 'yargs/helpers';
+let debug = require("debug")("startup");
+
+module.exports = function core(
+  uTable,
+  useDefault,
+  serverMode,
+  customize,
+  swaggerfcn
+) {
+  let argv = yargs(hideBin(process.argv)).argv;
+  let env = argv.env == null ? '.env' : argv.env;
+  let appenv = argv.appenv == null ? null : argv.appenv;
+  let docker = argv.docker == null ? null : argv.docker;
+  //process.env.SERVERMODE = serverMode !== null ? "api" : "app";
+
+
+  if (useDefault == null) {
+    useDefault = true;
+  }
+  console.log(
+    "Initialization started ============================================================"
+  );
+  console.log(`version: 2, Build Date: `, Date());
+  console.log(
+    `\nCommand Line Configuration:
+          Dockerfile: ${docker}
+          env file  : ${env}
+          appenv    : ${appenv}
+          customize : ${customize != null}
+          `
+  );
+
+  iapp(null, env, docker, uTable, useDefault, serverMode, customize);
+};
+
+function iapp(
+  appSrc,
+  rafEnv,
+  dockerFile,
+  uTable,
+  useDefault,
+  serverMode,
+  customize
+) {
+  let asset = setup(rafEnv, dockerFile);
+  if (appSrc == null) {
+    appSrc = process.env.APPENV == null ? null : process.env.APPENV;
+  }
+  if (appSrc != null) {
+    console.log("appSrc", `+${appSrc}+`);
+    createPayload(appSrc, (err, r) => {
+      if (err) {
+        console.log(err);
+        console.log("createPayload failed");
+        process.exit(1);
+      } else {
+        iService(uTable, useDefault, asset, r, serverMode, customize);
+      }
+    });
+  } else {
+    let appEnv = getAllEnv({});
+    iService(uTable, useDefault, asset, appEnv, serverMode, customize);
+  }
+}
+
+function setup(rafEnv, dockerFile) {
+  config(rafEnv, dockerFile);
+  let asset = process.env.APPLOC === "." ? process.cwd() : process.env.APPLOC;
+  process.env.APPASSET = asset;
+  return asset;
+}
+
+function createPayload(srcName, cb) {
+  let src = fs.readFileSync(srcName, "utf8");
+  if (src === null) {
+    cb(`Error: ${srcName} was not found. `);
+  }
+  try {
+    // console.log(src);
+    let f = new Function(src);
+    console.log(`${srcName} compile completed`);
+    let r = f();
+    f = null;
+
+    let ar = getAllEnv(r);
+    cb(null, ar);
+  } catch (err) {
+    console.log(`${srcName} compile failed`);
+    cb(err);
+  }
+}
+
+function getAllEnv(userData) {
+  let env;
+  let l = null;
+  let host = trimit("VIYA_SERVER");
+  if (host === 'none' || host == null) {
+    console.log('Note: setting host to null');
+    host = null;
+  }
+
+
+  let authflow = trimit("AUTHFLOW");
+  let pkce = (authflow === "pkce") ? true : false;
+  if (authflow === "authorization_code" || authflow === "code" || authflow === "server" ||
+      authflow === "null" || authflow === "pkce") { 
+    authflow = "server";
+    
+  } 
+
+
+  if (host === null) {
+    authflow = null;
+    console.log('Note: setting authflow to null');
+  }
+
+  process.env.AUTHFLOW = authflow;
+  // let redirect = (process.env.REDIRECT != null) ? process.env.REDIRECT : null;
+  let redirect = trimit("REDIRECT");
+
+  let clientID = trimit("CLIENTID");
+
+  // eslint-disable-next-line no-unused-vars
+  //let clientSecret = trimit("CLIENTSECRET");
+  let keepAlive = trimit("KEEPALIVE");
+  let appName = trimit("APPNAME");
+  let ns = trimit("NAMESPACE");
+  let nsHost = trimit("NSHOST");
+
+  l = {
+    authflow: authflow,
+    redirect: redirect,
+
+    host: host,
+    clientID: clientID,
+    appName: appName,
+    pkce: pkce,
+
+    keepAlive: null,
+    useToken: process.env.USETOKEN,
+
+    ns: ns,
+    nsHost: nsHost,
+  };
+  if (authflow === "server" || authflow === "implicit") {
+    if (authflow === "implicit") {
+      if (redirect === null) {
+        redirect = `${appName}/callback`;
+        process.env.REDIRECT = "callback";
+      } else {
+        if (redirect !== null && redirect.indexOf("/") !== 0) {
+          redirect =
+            redirect.indexOf("http") != -1
+              ? redirect
+              : `${process.env.APPNAME}/${redirect}`;
+        }
+      }
+      l.redirect = redirect;
+    }
+    
+    if (authflow === "server" && keepAlive === "YES") {
+      let protocol = process.env.HTTPS === "true" ? "https://" : "http://";
+      l.keepAlive = `${protocol}${process.env.APPHOST}:${process.env.APPPORT}/${appName}/keepAlive`;
+      l.keepAlive = l.keepAlive.replace(/0.0.0.0/, "localhost");
+    }
+    if (process.env.TIMERS != null) {
+      l.timers = process.env.TIMERS;
+    }
+  }
+  // allow for no authtype
+  l = {
+    authType: authflow,
+    redirect: redirect,
+
+    host: host,
+    clientID: clientID,
+    appName: appName,
+
+    keepAlive: null,
+    useToken: process.env.USETOKEN,
+
+    ns: ns,
+    nsHost: nsHost,
+  };
+
+// pick up the app env's - replacement for appenv.js
+// appenv.js still supported for backward compatibility
+for (let key in process.env) {
+  debug(key);
+  if (key.indexOf("APPENV_") === 0) {
+    let k = key.substring(7);
+    let v = process.env[key];
+    if (v != null && v.trim().length > 0) {
+      if (v.startsWith('$')) {
+        v = process.env[v.substring(1)];
+      }
+      userData[k] = (v != null) ? v.trim() : null;
+    } else {
+      userData[k] = null;
+
+    }
+  }
+}
+userData.APPNAME = l.appName;
+env = {
+  LOGONPAYLOAD: l,
+  APPENV: userData,
+};
+console.log("Final APPENV configuration for the server");
+console.log(JSON.stringify(env, null, 4));
+console.log(Date());
+return env;
+}
+
+function trimit(e) {
+  let a = process.env[e];
+  if (a == null) {
+    return null;
+  }
+  a = a.trim();
+  return a.length === 0 ? null : a;
+}

package/src/parseDocker.js

@@ -1,32 +1,32 @@
-/*
- * Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-'use strict';
-let parser = require('docker-file-parser');
-let fs = require('fs');
-
-function parseDocker (dockerFile) {
-	;
-	let d = fs.readFileSync(dockerFile, 'utf8');
-	let data = parser.parse(d);
-	data.forEach(d => {
-		if (d.name === 'EXPOSE') {
-			process.env.EXPOSEDPORT = d.args[0];
-			console.log(`Exposed port: ${process.env.EXPOSEDPORT}`);
-		} else if (d.name === 'ENV') {
-			for (let key in d.args) {
-				let v = d.args[key];
-				if (v.length === 0) {
-					console.log(
-						`Value for ${key} inherited as ${process.env[key]}`
-					);
-				} else {
-					process.env[key] = v;
-				}
-			}
-		}
-	});
-}
-
-export default parseDocker;
+/*
+ * Copyright © 2019, SAS Institute Inc., Cary, NC, USA.  All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+'use strict';
+let parser = require('docker-file-parser');
+let fs = require('fs');
+
+function parseDocker (dockerFile) {
+	;
+	let d = fs.readFileSync(dockerFile, 'utf8');
+	let data = parser.parse(d);
+	data.forEach(d => {
+		if (d.name === 'EXPOSE') {
+			process.env.EXPOSEDPORT = d.args[0];
+			console.log(`Exposed port: ${process.env.EXPOSEDPORT}`);
+		} else if (d.name === 'ENV') {
+			for (let key in d.args) {
+				let v = d.args[key];
+				if (v.length === 0) {
+					console.log(
+						`Value for ${key} inherited as ${process.env[key]}`
+					);
+				} else {
+					process.env[key] = v;
+				}
+			}
+		}
+	});
+}
+
+export default parseDocker;