@pega/custom-dx-components 2.0.23 → 2.0.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pega/custom-dx-components",
-  "version": "2.0.23",
+  "version": "2.0.24",
   "description": "Utility for building custom UI components",
   "bin": "./bin/index.js",
   "scripts": {
@@ -31,7 +31,6 @@
     "file-loader": "6.2.0",
     "fs-extra": "^10.1.0",
     "gitignore": "^0.7.0",
-    "http": "^0.0.1-security",
     "inquirer": "^9.1.1",
     "listr": "^0.14.3",
     "mini-css-extract-plugin": "2.6.1",

package/src/auth.js

@@ -3,8 +3,10 @@
 
 import fetch from 'node-fetch';
 import open from 'open';
-import crypto from 'crypto';
-import http from 'http';
+import crypto from 'node:crypto';
+import https from 'node:https';
+import http from 'node:http';
+import fs from 'node:fs';
 
 
 class PegaAuth {
@@ -277,12 +279,17 @@ class PegaAuth {
                 } else {
                     if (this.isNode) {
                         // Determine port to listen to by extracting it from redirect uri
-                        const { redirectUri } = this.config;
+                        const { redirectUri, cert, key } = this.config;
+                        const isHttp = redirectUri.startsWith('http:');
                         const nLocalhost = redirectUri.indexOf("localhost:");
                         const nSlash = redirectUri.indexOf('/', nLocalhost + 10);
                         const nPort = parseInt(redirectUri.substring(nLocalhost + 10, nSlash));
                         if (-1 !== nLocalhost) {
-                            const server = http.createServer((req, res) => {
+                            const options = isHttp ? {} : {
+                                key: fs.readFileSync(key),
+                                cert: fs.readFileSync(cert)
+                            };
+                            const server = (isHttp ? http : https).createServer(options, (req, res) => {
                                 const { method, url } = req;
                                 const { winTitle, winBodyHtml } = this.config;
                                 // console.log(`HTTP request received: ${url}`);
@@ -331,7 +338,7 @@ class PegaAuth {
         this.#reloadConfig();
 
         const { serverType, isolationId, clientId, clientSecret, redirectUri, tokenUri, codeVerifier, grantType,
-            sessionIndex, customTokenParams, userIdentifier, password, noPKCE } = this.config;
+            sessionIndex, customTokenParams, userIdentifier, password, noPKCE, ignoreInvalidCerts } = this.config;
 
         const bAuthCode = !grantType || grantType === 'authCode';
         if (bAuthCode && !authCode && !this.isNode) {
@@ -378,6 +385,7 @@ class PegaAuth {
         // console.log(`getToken form data: ${formData.toString()}`);
 
         return fetch(tokenUri, {
+            agent: this.isNode && ignoreInvalidCerts ? new https.Agent({ rejectUnauthorized: false }) : undefined,
             method: 'POST',
             headers: new Headers({
                 'content-type': 'application/x-www-form-urlencoded'
@@ -418,7 +426,7 @@ class PegaAuth {
 
     /* eslint-disable camelcase */
     async refreshToken(refresh_token) {
-        const { clientId, clientSecret, tokenUri } = this.config;
+        const { clientId, clientSecret, tokenUri, ignoreInvalidCerts } = this.config;
 
         const formData = new URLSearchParams();
         formData.append('client_id', clientId);
@@ -429,6 +437,7 @@ class PegaAuth {
         formData.append('refresh_token', refresh_token);
 
         return fetch(tokenUri, {
+            agent: this.isNode && ignoreInvalidCerts ? new https.Agent({ rejectUnauthorized: false }) : undefined,
             method: 'POST',
             headers: new Headers({
                 'content-type': 'application/x-www-form-urlencoded'
@@ -460,7 +469,7 @@ class PegaAuth {
             // Must have a config structure to proceed
             return;
         }
-        const { clientId, clientSecret, revokeUri } = this.config;
+        const { clientId, clientSecret, revokeUri, ignoreInvalidCerts } = this.config;
 
         let hdrs = { 'content-type': 'application/x-www-form-urlencoded' };
         if (clientSecret) {
@@ -478,6 +487,7 @@ class PegaAuth {
             formData.append('token', prop === 'access_token' ? access_token : refresh_token);
             formData.append('token_type_hint', prop);
             fetch(revokeUri, {
+                agent: this.isNode && ignoreInvalidCerts ? new https.Agent({ rejectUnauthorized: false }) : undefined,
                 method: 'POST',
                 headers: new Headers(hdrs),
                 body: formData.toString()

package/src/tasks/authenticate/helper.js

@@ -3,8 +3,29 @@ import { getPegaServerConfig } from '../../util.js';
 
 import { AUTHENTICATE_SCHEMA } from '../../constants.js';
 
-export const getAuthQuestions = async () => {
-  const defaultPegaConfig = await getPegaServerConfig();
+export const getAuthQuestions = async (dxcbConfig) => {
+  const defaultPegaConfig = dxcbConfig;
+  const aMustAsk = dxcbConfig['questions_askAlways'] ? dxcbConfig['questions_askAlways'].split(',') : [];
+  const aNeverAsk = dxcbConfig['questions_askNever'] ? dxcbConfig['questions_askNever'].split(',') : [];
+
+  const initAnswers = (answers) => {
+    // Setup default answers (if they are present and non-empty)
+    answers.serverType = defaultPegaConfig.serverType || "infinity";
+    answers.server = defaultPegaConfig.server || undefined;
+    answers.isolationId = defaultPegaConfig.isolationId || undefined;
+    answers.clientId = defaultPegaConfig.clientId || undefined;
+    answers.grantType = defaultPegaConfig.grantType || "authCode";
+    answers.clientSecret = defaultPegaConfig.clientSecret || undefined;
+    answers.user = defaultPegaConfig.user || undefined;
+    answers.password = defaultPegaConfig.password || undefined;
+  };
+
+  const fnStandardWhen = (prop, answers) => {
+    if (aNeverAsk.includes(prop)) {
+      return false;
+    }
+    return aMustAsk.includes(prop) || !answers[prop];
+  };
 
   return [
     {
@@ -22,26 +43,24 @@ export const getAuthQuestions = async () => {
         return 'Pega server type cannot be empty';
       },
       when: answers => {
-        if (!defaultPegaConfig.serverType) {
-          answers.serverType = "infinity";
-        }
-        else if (!defaultPegaConfig.askServerType) {
-          answers.serverType = defaultPegaConfig.serverType;
-        }
-        return (defaultPegaConfig.askServerType ? true : false);
+        initAnswers(answers);
+        return fnStandardWhen('serverType', answers);
       }
     },
     {
       name: 'server',
       message: 'Enter pega server url',
-      default: defaultPegaConfig.server
+      default: defaultPegaConfig.server,
+      when: answers => {
+        return fnStandardWhen('server', answers);
+      }
     },
     {
       name: 'isolationId',
       message: 'Enter isolation id',
       default: defaultPegaConfig.isolationId,
       when: answers => {
-        return answers.serverType === "launchpad";
+        return answers.serverType === "launchpad" && fnStandardWhen('isolationId', answers);
       }
     },
     {
@@ -57,6 +76,9 @@ export const getAuthQuestions = async () => {
           return true;
         }
         return 'Grant type cannot be empty';
+      },
+      when: answers => {
+        return fnStandardWhen('grantType', answers);
       }
     },
     {
@@ -70,7 +92,7 @@ export const getAuthQuestions = async () => {
         return 'Username cannot be empty';
       },
       when: answers => {
-        return (answers.serverType === "infinity" && answers.grantType !== "clientCreds");
+        return (answers.serverType === "infinity" && answers.grantType === "passwordCreds") && fnStandardWhen('user', answers);
       }
     },
     {
@@ -85,7 +107,7 @@ export const getAuthQuestions = async () => {
         return 'Password cannot be empty';
       },
       when: answers => {
-        return (answers.user && (answers.serverType === "infinity" && answers.grantType !== "clientCreds"));
+        return (answers.user && (answers.serverType === "infinity" && answers.grantType === "passwordCreds") && fnStandardWhen('password', answers));
       }
     },
     {
@@ -97,6 +119,9 @@ export const getAuthQuestions = async () => {
           return true;
         }
         return 'clientId cannot be empty';
+      },
+      when: answers => {
+        return fnStandardWhen('clientId', answers);
       }
     },
     {
@@ -111,7 +136,7 @@ export const getAuthQuestions = async () => {
         return 'clientSecret cannot be empty';
       },
       when: answers => {
-        return (answers.grantType !== "authCode");
+        return (answers.grantType !== "authCode" && fnStandardWhen('clientSecret', answers));
       }
     }
   ];

package/src/tasks/authenticate/index.js

@@ -26,16 +26,24 @@ const generateAccessToken = async config => {
     const sAuthorizeUri = `${server}${serverType === 'infinity' ? INF_AUTHORIZE_URL_V1 : LP_AUTHORIZE_URL}`;
     // console.log(`grantType: ${config.grantType}`);
 
+    const authCodeConfig = grantType === 'authCode' ? {
+      authorizeUri: sAuthorizeUri,
+      redirectUri: config.redirectUri.endsWith('/') ? config.redirectUri : `${config.redirectUri}/`,
+      cert: config.cert,
+      key: config.key,
+      winTitle: 'DX Component Dev',
+      winBodyHtml: `Authentication is complete.  This browser window may be closed.`
+    } : {};
+
     // Build auth config structure
     const authConfig = {
       serverType: serverType,
       grantType: grantType,
-      authorizeUri: sAuthorizeUri,
       tokenUri: sTokenUri,
       clientId: clientId,
       clientSecret: clientSecret,
-      winTitle: 'DXCB',
-      winBodyHtml: `Authentication is complete.  This browser window may be closed.`
+      ignoreInvalidCerts: true,
+      ...authCodeConfig
     };
     if (serverType === 'infinity') {
       authConfig.authService = 'pega';
@@ -48,11 +56,8 @@ const generateAccessToken = async config => {
       authConfig.isolationId = isolationId;
       // authConfig.noPKCE = true;
     }
-    if (grantType === 'authCode') {
-      authConfig.redirectUri = 'http://localhost:4010/';
-    }
     const auth = new PegaAuth(authConfig);
-    // console.log(`...about to infoke auth.login\n${JSON.stringify(authConfig)}`);
+    // console.log(`...about to invoke auth.login\n${JSON.stringify(authConfig)}`);
 
     auth.login()
       .then((token) => {
@@ -98,30 +103,37 @@ export default async options => {
   }
 
   const serverConfig = data['server-config'];
-  const params = options.params;
+  const isPwdNonEmpty = serverConfig['password'] ? true : false;
 
-  const questions = await getAuthQuestions(params);
+  // console.log(`serverConfig: ${JSON.stringify(serverConfig)}`);
+  const questions = await getAuthQuestions(serverConfig);
+  // console.log(`questions: ${JSON.stringify(questions)}`);
   const answers = await inquirer.prompt(questions);
-  serverConfig.serverType = answers.serverType;
-  serverConfig.server = answers.server;
-  // Isolation id only needed for launchpad
-  if (answers.serverType === 'launchpad') {
-    serverConfig.isolationId = answers.isolationId;
-  }
-  serverConfig.grantType = answers.grantType;
-  if (answers.serverType === 'infinity' && answers.user && answers.password) {
-    serverConfig.user = answers.user;
-    serverConfig.password = answers.password;
+  const aProps = ['serverType', 'server', 'isolationId', 'clientId', 'grantType', 'clientSecret', 'user', 'password'];
+  const isLaunchPad = answers.serverType === "launchpad";
+  let bWriteUpdate = false;
+  for (let i = 0; i < aProps.length; i += 1) {
+    const prop = aProps[i];
+    if (serverConfig[prop] !== answers[prop]) {
+      // console.log(`property ${prop} changed from ${serverConfig[prop]} to ${answers[prop]}`);
+      serverConfig[prop] = answers[prop];
+      if (prop !== 'password' || isPwdNonEmpty) {
+        bWriteUpdate = true;
+      }
+    }
   }
-  serverConfig.clientId = answers.clientId;
-  serverConfig.clientSecret = answers.clientSecret;
 
   try {
+    // console.log(`serverConfig: ${JSON.stringify(serverConfig)}`);
     authOK = await generateAccessToken(serverConfig);
   } catch (e) {
   }
 
-  if (authOK) {
+  if (authOK & bWriteUpdate) {
+    // Don't write password value (unless it already had a value)
+    if (!isPwdNonEmpty) {
+      serverConfig['password'] = '';
+    }
     console.log(`${chalk.green('Writing updated config...')}`);
     let updCfg = null;
     try {

package/src/tasks/init/template/package.json.mustache

@@ -54,7 +54,7 @@
   },
   "devDependencies": {
     "@pega/configs": "^0.3.4",
-    "@pega/custom-dx-components": "^2.0.23",
+    "@pega/custom-dx-components": "^2.0.24",
     "@pega/eslint-config": "^0.3.2",
     "@storybook/addon-actions": "^6.5.12",
     "@storybook/addon-essentials": "^6.5.12",

package/src/tasks/init/template/tasks.config.json

@@ -1,17 +1,26 @@
 {
   "components-directory-path": "src/components",
   "server-config": {
-    "serverType": "infinity",
-    "server": "https://localhost:38764/prweb",
-    "grantType": "authCode",
-    "user": "",
-    "password": "",
     "rulesetName": "rulesetName",
     "rulesetVersion": "rulesetVersion",
     "sourceOfComponents": "Server",
     "devBuild": false,
+    "serverType": "infinity",
+    "server": "https://localhost:38764/prweb",
     "clientId": "",
-    "clientSecret": ""
+    "clientSecret_comment": "Needed only when using 'passwordCreds' or 'clientCreds' grantType",
+    "clientSecret": "",
+    "grantType": "authCode",
+    "redirectUri": "https://localhost:4010/",
+    "cert_and_key_comment": "Path to SSL certificate file and SSL key file to use when starting local HTTPS server",
+    "cert_and_key_comment2": "Needed only when using 'authCode' grantType and redirectUri begins with 'https://localhost'",
+    "cert": "",
+    "key": "",
+    "user_and_password_comment": "useful primarily when grantType is set to 'passwordCreds'",
+    "user": "",
+    "password": "",
+    "questions_askAlways": "",
+    "questions_askNever": ""
   },
   "component": {
     "library": "",