@pega/custom-dx-components 2.0.24 → 2.0.25

package/README.md

@@ -8,7 +8,7 @@ This project provides you with an environment to extend Constellation by giving
 
 Ensure you have access to the following in your system:
 
-- Pega Infinity Server version 8.7 or later
+- Pega Infinity Server version 8.8 or later
 
 - Git version 2.30 or later
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pega/custom-dx-components",
-  "version": "2.0.24",
+  "version": "2.0.25",
   "description": "Utility for building custom UI components",
   "bin": "./bin/index.js",
   "scripts": {
@@ -23,10 +23,8 @@
     "babel-loader": "^8.2.5",
     "chalk": "^5.0.1",
     "compression-webpack-plugin": "^10.0.0",
-    "crypto": "^1.0.1",
     "css-loader": "6.7.1",
     "css-minimizer-webpack-plugin": "^4.1.0",
-    "eslint": "^8.4.1",
     "execa": "^6.1.0",
     "file-loader": "6.2.0",
     "fs-extra": "^10.1.0",
@@ -37,7 +35,6 @@
     "mustache": "^4.2.0",
     "ncp": "^2.0.0",
     "node-fetch": "^3.2.10",
-    "open": "^8.4.2",
     "ora": "^6.1.2",
     "pascalcase": "^2.0.0",
     "postcss": "^8.4.16",
@@ -53,7 +50,7 @@
     "ts-loader": "^9.3.1",
     "typescript": "^4.8.3",
     "url-loader": "4.1.1",
-    "webpack": "5.76.1"
+    "webpack": "^5.81.0"
   },
   "author": "Custom component dev",
   "license": "SEE LICENSE IN LICENSE",
@@ -64,6 +61,7 @@
   "devDependencies": {
     "@pega/configs": "^0.3.3",
     "cspell": "^6.9.0",
+    "eslint": "^8.23.1",
     "prettier": "2.7.1"
   }
 }

package/src/cli.js

@@ -3,14 +3,11 @@ import chalk from 'chalk';
 
 import {
   authenticate,
-  buildComponent,
   createComponent,
   deleteComponent,
-  deleteAllComponents,
   initProject,
   listComponents,
   publishComponent,
-  publishAllComponents,
   updateComponent,
   validate,
   upgrade
@@ -19,14 +16,11 @@ import {
 const TASKS = {
   INIT: 'init',
   CREATE: 'create',
-  BUILD: 'buildComponent',
   PUBLISH: 'publish',
-  PUBLISH_All: 'publishAll',
   LIST: 'list',
   VALIDATE_SCHEMA: 'validateSchema',
   UPDATE: 'update',
   DELETE: 'delete',
-  DELETE_ALL: "deleteAll",
   AUTHENTICATE: 'authenticate',
   UPGRADE: 'upgrade'
 };
@@ -66,14 +60,6 @@ export default async (args = []) => {
       publishComponent(options);
       break;
     }
-    case TASKS.PUBLISH_All: {
-      publishAllComponents(options);
-      break;
-    }
-    case TASKS.BUILD: {
-      buildComponent(options);
-      break;
-    }
     case TASKS.LIST: {
       listComponents(options);
       break;
@@ -90,10 +76,6 @@ export default async (args = []) => {
       deleteComponent(options);
       break;
     }
-    case TASKS.DELETE_ALL: {
-      deleteAllComponents(options);
-      break;
-    }
     case TASKS.AUTHENTICATE: {
       authenticate(options);
       break;

package/src/constants.js

@@ -10,37 +10,7 @@ export const PUBLISH_COMPONENT_SERVICE_REST_ENDPOINT = 'PRRestService/dev/v1/pub
 export const LIST_COMPONENT_SERVICE_REST_ENDPOINT = 'PRRestService/dev/v1/list_component';
 export const OOTB_COMPONENT_SERVICE_REST_ENDPOINT = 'PRRestService/dev/v1/ootb_component';
 export const DELETE_COMPONENT_SERVICE_REST_ENDPOINT = 'PRRestService/dev/v1/delete_component';
-export const INF_TOKEN_URL_V1 = 'PRRestService/oauth2/v1/token';
-export const INF_AUTHORIZE_URL_V1 = 'PRRestService/oauth2/v1/authorize';
-export const LP_TOKEN_URL = 'uas/oauth/token';
-export const LP_AUTHORIZE_URL = 'uas/oauth/authorize';
-
-export const AUTHENTICATE_SCHEMA = {
-  serverType: [
-    {
-      name: 'Infinity',
-      value: 'infinity'
-    },
-    {
-      name: 'Launchpad',
-      value: 'launchpad'
-    }
-  ],
-  grantType: [
-    {
-      name: 'Authorization code',
-      value: 'authCode'
-    },
-    {
-      name: 'Password credentials',
-      value: 'passwordCreds'
-    },
-    {
-      name: 'Client credentials',
-      value: 'clientCreds'
-    }
-  ]
-};
+export const TOKEN_URL_V1 = 'PRRestService/oauth2/v1/token';
 
 export const COMPONENT_SCHEMA = {
   framework: [
@@ -138,7 +108,7 @@ export const COMPONENT_SCHEMA = {
         value: 'Picklist'
       }
     ],
-    template: ['DETAILS', 'DETAILS-region', 'FORM', 'FORM-region', 'PAGE'],
+    template: ['DETAILS', 'DETAILS-region', 'FORM', 'FORM-region', 'PAGE' ],
     widget: [
       {
         name: 'CASE',

package/src/tasks/authenticate/helper.js

@@ -1,98 +1,24 @@
 /* eslint-disable import/prefer-default-export */
 import { getPegaServerConfig } from '../../util.js';
 
-import { AUTHENTICATE_SCHEMA } from '../../constants.js';
-
-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];
-  };
+export const getAuthQuestions = async () => {
+  const defaultPegaConfig = await getPegaServerConfig();
 
   return [
-    {
-      name: 'serverType',
-      type: 'rawlist',
-      message: 'Enter Pega server type',
-      default: answers => {
-        return defaultPegaConfig.serverType;
-      },
-      choices: AUTHENTICATE_SCHEMA.serverType,
-      validate: value => {
-        if (value.trim()) {
-          return true;
-        }
-        return 'Pega server type cannot be empty';
-      },
-      when: answers => {
-        initAnswers(answers);
-        return fnStandardWhen('serverType', answers);
-      }
-    },
     {
       name: 'server',
       message: 'Enter pega server url',
-      default: defaultPegaConfig.server,
-      when: answers => {
-        return fnStandardWhen('server', answers);
-      }
-    },
-    {
-      name: 'isolationId',
-      message: 'Enter isolation id',
-      default: defaultPegaConfig.isolationId,
-      when: answers => {
-        return answers.serverType === "launchpad" && fnStandardWhen('isolationId', answers);
-      }
-    },
-    {
-      name: 'grantType',
-      type: 'rawlist',
-      message: 'Enter OAuth 2.0 grant type',
-      default: defaultPegaConfig.grantType,
-      choices: answers => {
-        return AUTHENTICATE_SCHEMA.grantType.filter(gt => !(answers.serverType === "launchpad" && gt.value === "passwordCreds"));
-      },
-      validate: value => {
-        if (value.trim()) {
-          return true;
-        }
-        return 'Grant type cannot be empty';
-      },
-      when: answers => {
-        return fnStandardWhen('grantType', answers);
-      }
+      default: defaultPegaConfig.server
     },
     {
       name: 'user',
       message: 'Enter user id',
       default: defaultPegaConfig.user,
-      validate: (value, answers) => {
-        if (value.trim() || answers.grantType === "authCode") {
+      validate: value => {
+        if (value.trim()) {
           return true;
         }
         return 'Username cannot be empty';
-      },
-      when: answers => {
-        return (answers.serverType === "infinity" && answers.grantType === "passwordCreds") && fnStandardWhen('user', answers);
       }
     },
     {
@@ -100,14 +26,11 @@ export const getAuthQuestions = async (dxcbConfig) => {
       type: 'password',
       message: 'Enter password',
       default: defaultPegaConfig.password,
-      validate: (value, answers) => {
-        if (value.trim() || answers.grantType === "authCode") {
+      validate: value => {
+        if (value.trim()) {
           return true;
         }
         return 'Password cannot be empty';
-      },
-      when: answers => {
-        return (answers.user && (answers.serverType === "infinity" && answers.grantType === "passwordCreds") && fnStandardWhen('password', answers));
       }
     },
     {
@@ -119,9 +42,6 @@ export const getAuthQuestions = async (dxcbConfig) => {
           return true;
         }
         return 'clientId cannot be empty';
-      },
-      when: answers => {
-        return fnStandardWhen('clientId', answers);
       }
     },
     {
@@ -129,14 +49,11 @@ export const getAuthQuestions = async (dxcbConfig) => {
       type: 'password',
       message: 'Enter clientSecret',
       default: defaultPegaConfig.clientSecret,
-      validate: (value, answers) => {
+      validate: value => {
         if (value.trim()) {
           return true;
         }
         return 'clientSecret cannot be empty';
-      },
-      when: answers => {
-        return (answers.grantType !== "authCode" && fnStandardWhen('clientSecret', answers));
       }
     }
   ];

package/src/tasks/authenticate/index.js

@@ -1,150 +1,81 @@
 import path from 'path';
 import fs from 'fs';
+import https from 'https';
 
 import chalk from 'chalk';
 import inquirer from 'inquirer';
+import fetch from 'node-fetch';
 
-import { checkPathAccess, showVersion } from '../../util.js';
-import { TOKEN_PATH, INF_TOKEN_URL_V1, INF_AUTHORIZE_URL_V1, LP_TOKEN_URL, LP_AUTHORIZE_URL } from '../../constants.js';
+import { checkPathAccess, getTokenUrl } from '../../util.js';
+import { TOKEN_PATH } from '../../constants.js';
 
 import { getAuthQuestions } from './helper.js';
-import PegaAuth from '../../auth.js';
 
 export const TASKS_CONFIG_JSON_FILENAME = 'tasks.config.json';
 
 const pegaConfigJsonPath = path.join(path.resolve(), TASKS_CONFIG_JSON_FILENAME);
-let server = null;
 
 const generateAccessToken = async config => {
-
-  let authSuccess = false;
-  const { serverType, isolationId, grantType, clientId, clientSecret, user, password } = config;
-  const server = config.server.endsWith('/') ? config.server : `${config.server}/`;
-
-  return new Promise((resolve, reject) => {
-    const sTokenUri = `${server}${serverType === 'infinity' ? INF_TOKEN_URL_V1 : LP_TOKEN_URL}`;
-    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,
-      tokenUri: sTokenUri,
-      clientId: clientId,
-      clientSecret: clientSecret,
-      ignoreInvalidCerts: true,
-      ...authCodeConfig
-    };
-    if (serverType === 'infinity') {
-      authConfig.authService = 'pega';
-      if (grantType !== 'clientCreds' && user && password) {
-        authConfig.userIdentifier = user;
-        authConfig.password = Buffer.from(password).toString('base64');
+  const formData = new URLSearchParams();
+  formData.append('client_id', config.clientId);
+  formData.append('client_secret', config.clientSecret);
+  formData.append('username', config.user);
+  formData.append('password', config.password);
+  formData.append('grant_type', 'password');
+
+  const accessTokenUri = await getTokenUrl(config.server);
+  fetch(accessTokenUri, {
+    agent: new https.Agent({ rejectUnauthorized: false }),
+    method: 'POST',
+    headers: { 'content-type': 'application/x-www-form-urlencoded' },
+    body: formData.toString()
+  })
+    .then(response => {
+      if (response.ok && response.status === 200) {
+        return response.json();
+      } else {
+        throw new Error(`Failed with status: ${response.status}`);
       }
-    }
-    if (serverType === 'launchpad') {
-      authConfig.isolationId = isolationId;
-      // authConfig.noPKCE = true;
-    }
-    const auth = new PegaAuth(authConfig);
-    // console.log(`...about to invoke auth.login\n${JSON.stringify(authConfig)}`);
-
-    auth.login()
-      .then((token) => {
-        if (token?.token_type) {
-          fs.writeFile(TOKEN_PATH, JSON.stringify(token), err => {
-            if (err) {
-              console.error(err);
-              return reject(authSuccess);
-            }
-            console.log(`${chalk.bold.green('Authenticated successfully !!')}`);
-            authSuccess = true;
-            return resolve(authSuccess);
-          });
-        } else {
-          console.log(`${chalk.bold.red('Authentication failed:' + JSON.stringify(token.errors ? token.errors : token))}`);
-          return reject(authSuccess);
-        }
-      })
-      .catch((e) => {
-        console.log(`${chalk.bold.red(e)}`);
-        return reject(authSuccess);
-      });
-  });
+    })
+    .then(data => {
+      if (data && data.errors) {
+        const errMessages = data.errors;
+        errMessages.forEach(msgArr => {
+          throw new Error(`Failed with error - ${JSON.stringify(msgArr.message)}`);
+        });
+      }
+      if (data.token_type) {
+        fs.writeFile(TOKEN_PATH, JSON.stringify(data), err => {
+          if (err) {
+            console.error(err);
+          }
+          console.log(`${chalk.bold.green('Authenticated successfully !!')}`);
+        });
+      }
+    })
+    .catch(e => console.log(`${chalk.bold.red(e)}`));
 };
 
 export default async options => {
-
-  let authOK = false;
-
-  showVersion();
-
   await checkPathAccess(pegaConfigJsonPath);
 
-  let cfgData = fs.readFileSync(pegaConfigJsonPath, { encoding: 'utf8' });
-  let data = null;
-  if (cfgData) {
-    try {
-      data = JSON.parse(cfgData);
-    } catch (e) {
-      console.log(`${chalk.red('Invalid JSON within tasks.config.json')}`);
-      process.exit(1);
-    }
-  }
+  let data = fs.readFileSync(pegaConfigJsonPath, { encoding: 'utf8' });
+  data = data && JSON.parse(data);
 
   const serverConfig = data['server-config'];
-  const isPwdNonEmpty = serverConfig['password'] ? true : false;
+  const params = options.params;
 
-  // console.log(`serverConfig: ${JSON.stringify(serverConfig)}`);
-  const questions = await getAuthQuestions(serverConfig);
-  // console.log(`questions: ${JSON.stringify(questions)}`);
+  const questions = await getAuthQuestions(params);
   const answers = await inquirer.prompt(questions);
-  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;
-      }
-    }
-  }
-
-  try {
-    // console.log(`serverConfig: ${JSON.stringify(serverConfig)}`);
-    authOK = await generateAccessToken(serverConfig);
-  } catch (e) {
-  }
-
-  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 {
-      updCfg = JSON.stringify(data, null, 2);
-      fs.writeFileSync(pegaConfigJsonPath, updCfg, err => {
-        if (err) throw err;
-      });
-    } catch (e) {
-
-    }
-  }
-
-  process.exit(1);
+  serverConfig.server = answers.server;
+  serverConfig.user = answers.user;
+  serverConfig.password = answers.password;
+  serverConfig.clientId = answers.clientId;
+  serverConfig.clientSecret = answers.clientSecret;
+  await generateAccessToken(serverConfig);
+
+  data = JSON.stringify(data, null, 2);
+  fs.writeFile(pegaConfigJsonPath, data, err => {
+    if (err) throw err;
+  });
 };

package/src/tasks/create/index.js

@@ -14,8 +14,7 @@ import {
   getComponents,
   getComponentDefaults,
   sanitize,
-  validateSemver,
-  showVersion
+  validateSemver
 } from '../../util.js';
 import { COMPONENT_SCHEMA } from '../../constants.js';
 
@@ -88,7 +87,7 @@ const compileMustacheTemplates = async (
       ALLOWEDAPPS: JSON.stringify(allowedApplications),
       TYPE: type,
       SUB_TYPE: JSON.stringify(mustacheSubType),
-      DESCRIPTION: description || componentLabel,
+      DESCRIPTION: description,
       IS_TEMPLATE: isTemplate,
       IS_PICKLIST: isPicklist,
       IS_BOOLEAN: isBool,
@@ -173,17 +172,15 @@ const validateCompile = async (
 };
 
 export default async options => {
-  showVersion();
-
-  if (options.params[9]) {
-
-    const type = options.params[3];
-    const subtype = options.params[4];
-    const componentName = options.params[5];
-    const componentLabel = options.params[6];
-    const library = options.params[7];
-    const version = options.params[9];
-    const description = options.params[9];
+  if (options.params[10]) {
+    const componentName = options.params[3];
+    const componentLabel = options.params[4];
+    const library = options.params[5];
+    const version = options.params[6];
+    const framework = options.params[7];
+    const type = options.params[8];
+    const subtype = options.params[9];
+    const description = options.params[10];
 
     await validateCompile(
       {
@@ -201,50 +198,6 @@ export default async options => {
   } else {
     const componentDefaults = await getComponentDefaults();
     const questions = [
-      {
-        name: 'type',
-        type: 'rawlist',
-        message: 'Enter type of component',
-        default: componentDefaults.type,
-        choices: COMPONENT_SCHEMA.type
-      },
-      {
-        name: 'subtype',
-        type: 'rawlist',
-        message: 'Enter subtype of component',
-        default: componentDefaults.subtype,
-        choices: COMPONENT_SCHEMA.subtype.field,
-        when(answers) {
-          return answers.type === 'Field';
-        }
-      },
-      {
-        name: 'subtype',
-        type: 'rawlist',
-        message: 'Enter subtype of component',
-        default: componentDefaults.subtype,
-        choices: COMPONENT_SCHEMA.subtype.template,
-        when(answers) {
-          return answers.type === 'Template';
-        }
-      },
-      {
-        name: 'subtype',
-        type: 'rawlist',
-        message: 'Enter subtype of component',
-        default: [componentDefaults.subtype || COMPONENT_SCHEMA.subtype.widget[0]],
-        choices: COMPONENT_SCHEMA.subtype.widget,
-        when(answers) {
-          return answers.type === 'Widget';
-        },
-        validate: value => {
-          /* value should not be empty */
-          if (Array.isArray(value) && value.length) {
-            return true;
-          }
-          return 'Please select subtype';
-        }
-      },
       {
         name: 'componentName',
         message: 'Enter component name (required)',
@@ -273,7 +226,6 @@ export default async options => {
       {
         name: 'version',
         message: 'Enter component version',
-        default: componentDefaults.version,
         validate: value => {
           if (validateSemver(value)) {
             return true;
@@ -302,6 +254,57 @@ export default async options => {
         message: 'Please enter the application names to be supported (comma-separated). ',
         suffix: 'Keep empty for all applications'
       },
+      // {
+      //   name: 'framework',
+      //   type: 'rawlist',
+      //   message: 'Enter framework a',
+      //   default: 'COSMOS_React',
+      //   choices: COMPONENT_SCHEMA.framework
+      // },
+      {
+        name: 'type',
+        type: 'rawlist',
+        message: 'Enter type of component',
+        default: componentDefaults.type,
+        choices: COMPONENT_SCHEMA.type
+      },
+      {
+        name: 'subtype',
+        type: 'rawlist',
+        message: 'Enter subtype of component',
+        default: componentDefaults.subtype,
+        choices: COMPONENT_SCHEMA.subtype.field,
+        when(answers) {
+          return answers.type === 'Field';
+        }
+      },
+      {
+        name: 'subtype',
+        type: 'rawlist',
+        message: 'Enter subtype of component',
+        default: componentDefaults.subtype,
+        choices: COMPONENT_SCHEMA.subtype.template,
+        when(answers) {
+          return answers.type === 'Template';
+        }
+      },
+      {
+        name: 'subtype',
+        type: 'rawlist',
+        message: 'Enter subtype of component',
+        default: [componentDefaults.subtype || COMPONENT_SCHEMA.subtype.widget[0]],
+        choices: COMPONENT_SCHEMA.subtype.widget,
+        when(answers) {
+          return answers.type === 'Widget';
+        },
+        validate: value => {
+          /* value should not be empty */
+          if (Array.isArray(value) && value.length) {
+            return true;
+          }
+          return 'Please select subtype';
+        }
+      },
       {
         name: 'description',
         message: 'Enter description for the component',
@@ -309,6 +312,7 @@ export default async options => {
       }
     ];
 
+    console.log(chalk.green("DX Component Builder v2.0.16"));
     await inquirer.prompt(questions).then(async answers => {
       const {
         componentName,