@pega/custom-dx-components 26.1.11-alpha-0.2 → 26.1.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pega/custom-dx-components",
-  "version": "26.1.11-alpha-0.2",
+  "version": "26.1.11",
   "description": "Utility for building custom UI components",
   "bin": {
     "custom-dx-components": "./bin/index.js"

package/src/tasks/authenticate/helper.js

@@ -25,8 +25,8 @@ export const getAuthQuestions = async dxcbConfig => {
     answers.serverType = initAnswer('serverType', AUTHENTICATE_DEFAULTS.serverType);
     answers.isVanity = defaultPegaConfig.isVanity;
     answers.server = initAnswer('server', AUTHENTICATE_DEFAULTS.server);
-    answers.authUrl = initAnswer('authUrl', '');
-    answers.accessTokenUrl = initAnswer('accessTokenUrl', '');
+    answers.authorizeUri = initAnswer('authorizeUri', '');
+    answers.tokenUri = initAnswer('tokenUri', '');
     answers.clientId = initAnswer('clientId', AUTHENTICATE_DEFAULTS.clientId);
     answers.grantType = initAnswer('grantType', AUTHENTICATE_DEFAULTS.grantType);
     answers.authService = initAnswer('authService', AUTHENTICATE_DEFAULTS.authService);
@@ -99,21 +99,24 @@ export const getAuthQuestions = async dxcbConfig => {
       }
     },
     {
-      name: 'authUrl',
+      name: 'authorizeUri',
       type: 'input',
       message: 'Enter complete authorization URL',
-      default: defaultPegaConfig.authUrl,
+      default: defaultPegaConfig.authorizeUri,
       validate: value => isCompleteHttpUrl(value) || 'Authorization URL must be a complete HTTP(S) URL',
       when: answers =>
-        answers.serverType === 'launchpad' && answers.isVanity !== false && answers.grantType === 'authCode' && fnStandardWhen('authUrl', answers)
+        answers.serverType === 'launchpad' &&
+        answers.isVanity !== false &&
+        answers.grantType === 'authCode' &&
+        fnStandardWhen('authorizeUri', answers)
     },
     {
-      name: 'accessTokenUrl',
+      name: 'tokenUri',
       type: 'input',
       message: 'Enter complete access token URL',
-      default: defaultPegaConfig.accessTokenUrl,
+      default: defaultPegaConfig.tokenUri,
       validate: value => isCompleteHttpUrl(value) || 'Access token URL must be a complete HTTP(S) URL',
-      when: answers => answers.serverType === 'launchpad' && answers.isVanity !== false && fnStandardWhen('accessTokenUrl', answers)
+      when: answers => answers.serverType === 'launchpad' && answers.isVanity !== false && fnStandardWhen('tokenUri', answers)
     },
     {
       name: 'authService',

package/src/tasks/authenticate/index.js

@@ -19,15 +19,17 @@ export const generateAccessToken = async config => {
   let authSuccess = false;
   const { serverType, authService, isolationId, grantType, clientId, clientSecret, user, password, legacyTLS } = config;
   const launchpadVanity = isLaunchpadVanity(config);
-  if (launchpadVanity && (!isCompleteHttpUrl(config.accessTokenUrl) || (grantType === 'authCode' && !isCompleteHttpUrl(config.authUrl)))) {
-    throw new Error('Launchpad vanity configuration requires complete HTTP(S) authUrl and accessTokenUrl values');
+  if (launchpadVanity && (!isCompleteHttpUrl(config.tokenUri) || (grantType === 'authCode' && !isCompleteHttpUrl(config.authorizeUri)))) {
+    throw new Error('Launchpad vanity configuration requires complete HTTP(S) authorizeUri and tokenUri values');
   }
   // Try to gracefully deal with missing trailing slashes for server (and later conditionally for redirectUri)
   const server = config.server.endsWith('/') ? config.server : `${config.server}/`;
 
   return new Promise((resolve, reject) => {
-    const sTokenUri = launchpadVanity ? config.accessTokenUrl : `${server}${serverType === 'infinity' ? INF_TOKEN_URL_V1 : LP_TOKEN_URL}`;
-    const sAuthorizeUri = launchpadVanity ? config.authUrl : `${server}${serverType === 'infinity' ? INF_AUTHORIZE_URL_V1 : LP_AUTHORIZE_URL}`;
+    const sTokenUriInfinity = config.tokenUri || `${server}${INF_TOKEN_URL_V1}`;
+    const sAuthorizeUriInfinity = config.authorizeUri || `${server}${INF_AUTHORIZE_URL_V1}`;
+    const sTokenUri = launchpadVanity ? config.tokenUri : serverType === 'infinity' ? sTokenUriInfinity : `${server}${LP_TOKEN_URL}`;
+    const sAuthorizeUri = launchpadVanity ? config.authorizeUri : serverType === 'infinity' ? sAuthorizeUriInfinity : `${server}${LP_AUTHORIZE_URL}`;
     // console.log(`grantType: ${config.grantType}`);
     const browserAuthSuccessMarkup = `<div style="width: 300px; padding: 10px;">
     <svg xmlns="http://www. w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 311 68" version="1.1">
@@ -164,8 +166,8 @@ export default async options => {
     'serverType',
     'server',
     'isVanity',
-    'authUrl',
-    'accessTokenUrl',
+    'authorizeUri',
+    'tokenUri',
     'isolationId',
     'clientId',
     'grantType',

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

@@ -109,7 +109,7 @@
     "@babel/preset-react": "^7.27.1",
     "@babel/preset-typescript": "^7.27.1",
     "@pega/configs": "^0.16.3",
-    "@pega/custom-dx-components": "~26.1.11-alpha-0.2",
+    "@pega/custom-dx-components": "~26.1.11",
     "@pega/pcore-pconnect-typedefs": "^5.1.0",
     "@storybook/addon-docs": "^9.1.7",
     "@storybook/addon-essentials": "^9.0.0-alpha.12",

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

@@ -10,10 +10,10 @@
     "devServerPort": "3030",
     "serverType": "infinity",
     "server": "https://localhost:1080/prweb",
-    "authUrl": "",
-    "authUrlComment": "Authorization URL for the OAuth2 authentication",
-    "accessTokenUrl": "",
-    "accessTokenUrlComment": "Access token URL for the OAuth2 authentication",
+    "authorizeUri": "",
+    "authorizeUriComment": "Authorization URL for the OAuth2 authentication (mandatory when serverType is 'launchpad')",
+    "tokenUri": "",
+    "tokenUriComment": "Access token URL for the OAuth2 authentication (mandatory when serverType is 'launchpad')",
     "clientId": "10095186356008396159",
     "clientSecret_comment": "Needed only when using 'passwordCreds' or 'clientCreds' grantType",
     "clientSecret": "",