forceios 13.1.0 → 13.2.0-alpha.0

package/README.md

@@ -39,21 +39,46 @@ forceios create
     --packagename=app package identifier (e.g. com.mycompany.myapp)
     --organization=organization name (your company's/organization's name)
     [--outputdir=output directory (leave empty for current directory)]
+    [--consumerkey=OAuth consumer key for the Salesforce External Client App or Connected App]
+    [--callbackurl=OAuth callback URL for the Salesforce External Client App or Connected App]
+    [--loginserver=Login server URL for the Salesforce org]
 
  OR 
 
 # create an iOS native mobile application from a template
 forceios createwithtemplate
-    --templaterepouri=template repo URI or Mobile SDK template name
+    [--templatesource=git repo URL (optionally with #branch) or local path to a templates suite (root must contain templates.json)]
+    [--templaterepouri=template repo URI or Mobile SDK template name]
+    [--template=template name within the templates suite (e.g. ReactNativeTemplate)]
     --appname=application name
     --packagename=app package identifier (e.g. com.mycompany.myapp)
     --organization=organization name (your company's/organization's name)
     [--outputdir=output directory (leave empty for current directory)]
+    [--consumerkey=OAuth consumer key for the Salesforce External Client App or Connected App]
+    [--callbackurl=OAuth callback URL for the Salesforce External Client App or Connected App]
+    [--loginserver=Login server URL for the Salesforce org]
 
  OR 
 
-# list available Mobile SDK templates
+# show version of Mobile SDK
+forceios version
+
+ OR 
+
+# list available Mobile SDK templates to create an iOS native mobile application
 forceios listtemplates
+    [--templatesource=git repo URL (optionally with #branch) or local path to a templates suite (root must contain templates.json)]
+    [--doc=include verbose documentation from template.json files]
+    [--json=output response in JSON format]
+
+ OR 
+
+# list details for a specific Mobile SDK template to create an iOS native mobile application
+forceios describetemplate
+    [--templatesource=git repo URL (optionally with #branch) or local path to a templates suite (root must contain templates.json)]
+    [--template=template name within the templates suite (e.g. ReactNativeTemplate)]
+    [--doc=include verbose documentation from template.json files]
+    [--json=output response in JSON format]
 
  OR 
 
@@ -64,11 +89,6 @@ forceios checkconfig
 
  OR 
 
-# show version of Mobile SDK
-forceios version
-
- OR 
-
 forceios
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "forceios",
-    "version": "13.1.0",
+    "version": "13.2.0-alpha.0",
     "description": "Utilities for creating mobile apps based on the Salesforce Mobile SDK for iOS",
     "keywords": [ "mobilesdk", "ios", "salesforce", "mobile", "sdk" ],
     "homepage": "https://github.com/forcedotcom/SalesforceMobileSDK-iOS",

package/shared/configHelper.js

@@ -73,7 +73,8 @@ function getCommandExpanded(cli, commandName) {
         args: getArgsExpanded(cli, commandName),
         description: applyCli(command.description, cli),
         longDescription: applyCli(command.longDescription, cli),
-        help: applyCli(command.help, cli)
+        help: applyCli(command.help, cli),
+        supportCustomFlags: command.supportCustomFlags
     };
 }
 

package/shared/constants.js

@@ -28,7 +28,7 @@
 var path = require('path'),
     shelljs = require('shelljs');
 
-var VERSION= '13.1.0';
+var VERSION= '13.2.0-alpha.0';
 
 module.exports = {
     version: VERSION,
@@ -60,9 +60,9 @@ module.exports = {
         },
         cordova: {
             checkCmd: 'cordova -v',
-//            pluginRepoUri: 'https://github.com/forcedotcom/SalesforceMobileSDK-CordovaPlugin#dev',    // dev
+            pluginRepoUri: 'https://github.com/forcedotcom/SalesforceMobileSDK-CordovaPlugin#dev',    // dev
             minVersion: '12.0.0',
-             pluginRepoUri: 'salesforce-mobilesdk-cordova-plugin@v' + VERSION, // GA
+//             pluginRepoUri: 'salesforce-mobilesdk-cordova-plugin@v' + VERSION, // GA
             platformVersion: {
                 ios: '7.1.1',
                 android: '14.0.1'
@@ -79,8 +79,8 @@ module.exports = {
         android: 'Android Studio'
     },
 
-//    templatesRepoUri: 'https://github.com/forcedotcom/SalesforceMobileSDK-Templates#dev',    // dev
-     templatesRepoUri: 'https://github.com/forcedotcom/SalesforceMobileSDK-Templates#v' + VERSION, // GA
+    templatesRepoUri: 'https://github.com/forcedotcom/SalesforceMobileSDK-Templates#dev',    // dev
+//     templatesRepoUri: 'https://github.com/forcedotcom/SalesforceMobileSDK-Templates#v' + VERSION, // GA
 
     forceclis: {
         forceios: {
@@ -140,7 +140,7 @@ module.exports = {
             commands: ['create', 'createwithtemplate', 'version', 'listtemplates', 'describetemplate', 'checkconfig']
         }
     },
-
+    
     args: {
         platform: {
             name: 'platform',
@@ -296,7 +296,7 @@ module.exports = {
             type: 'string',
             hidden: true
         },
-	sdkDependencies: {
+	    sdkDependencies: {
             name: 'sdkdependencies',
             description: 'override sdk dependencies',
             'char': 'd',
@@ -329,6 +329,39 @@ module.exports = {
             required: false,
             type: 'boolean',
             hidden: false
+        },
+        consumerKey: {
+            name: 'consumerkey',
+            'char': 'c',
+            description: 'OAuth consumer key for the Salesforce External Client App or Connected App',
+            longDescription: 'The OAuth consumer key (client ID) for your Salesforce External Client App or Connected App. When provided, this will be automatically configured in the generated app.',
+            prompt: 'Enter your OAuth consumer key (leave empty to manually configure this value in the project\'s bootconfig file):',
+            error: cli => val => 'Invalid value for consumer key: \'' + val + '\'.',
+            validate: cli => val => val === undefined || val === '' || /\S+/.test(val),
+            required: false,
+            type: 'string'
+        },
+        callbackURL: {
+            name: 'callbackurl',
+            'char': 'u',
+            description: 'OAuth callback URL for the Salesforce External Client App or Connected App',
+            longDescription: 'The OAuth callback URL (redirect URI) for your Salesforce External Client App or Connected App. When provided, this will be automatically configured in the generated app.',
+            prompt: 'Enter your OAuth callback URL (leave empty to manually configure this value in the project\'s bootconfig file):',
+            error: cli => val => 'Invalid value for callback URL: \'' + val + '\'.',
+            validate: cli => val => val === undefined || val === '' || /\S+/.test(val),
+            required: false,
+            type: 'string'
+        },
+        loginServer: {
+            name: 'loginserver',
+            'char': 'l',
+            description: 'Login server URL for the Salesforce org',
+            longDescription: 'The login server URL for your Salesforce org (e.g. https://login.salesforce.com, https://test.salesforce.com, or custom domain). When provided, this will be automatically configured in the generated app.',
+            prompt: 'Enter your login server URL (leave empty for https://login.salesforce.com):',
+            error: cli => val => 'Invalid value for login server: \'' + val + '\'.',
+            validate: cli => val => val === undefined || val === '' || /\S+/.test(val),
+            required: false,
+            type: 'string'
         }
     },
 
@@ -342,6 +375,9 @@ module.exports = {
                           'organization',
                           cli.appTypes.indexOf('hybrid_remote') >=0 ? 'startPage' : null,
                           'outputDir',
+                          'consumerKey',
+                          'callbackURL',
+                          'loginServer',
                           'verbose',
                           cli.name === 'forcehybrid' ? 'pluginRepoUri' : null,
 			  'sdkDependencies'
@@ -361,13 +397,17 @@ module.exports = {
                           'organization',
                           cli.appTypes.indexOf('hybrid_remote') >=0 ? 'startPage' : null,
                           'outputDir',
+                          'consumerKey',
+                          'callbackURL',
+                          'loginServer',
                           'verbose',
                           cli.name === 'forcehybrid' ? 'pluginRepoUri' : null,
                           'sdkDependencies'              
                          ].filter(x=>x!=null),
             description: cli => 'create ' + cli.purpose + ' from a template',
             longDescription: cli => 'Create ' + cli.purpose + ' from a template.',
-            help: 'This command initiates creation of a new app based on the Mobile SDK template that you specify. The template can be a specialized app for your app type that Mobile SDK provides, or your own custom app that you\'ve configured to use as a template. See https://developer.salesforce.com/docs/atlas.en-us.mobile_sdk.meta/mobile_sdk/ios_new_project_template.htm for information on custom templates.'
+            help: 'This command initiates creation of a new app based on the Mobile SDK template that you specify. The template can be a specialized app for your app type that Mobile SDK provides, or your own custom app that you\'ve configured to use as a template. See https://developer.salesforce.com/docs/atlas.en-us.mobile_sdk.meta/mobile_sdk/ios_new_project_template.htm for information on custom templates.',
+            supportCustomFlags: true
         },
         version: {
             name: 'version',

package/shared/createHelper.js

@@ -32,7 +32,11 @@ var path = require('path'),
     configHelper = require('./configHelper'),
     prepareTemplate = require('./templateHelper').prepareTemplate,
     getSDKTemplateURI = require('./templateHelper').getSDKTemplateURI,
-    fs = require('fs');
+    fs = require('fs'),
+    Ajv = require('ajv'),
+    COLOR = require('./outputColors'),
+    readJsonFile = require('./jsonChecker').readJsonFile,
+    JSON5 = require('json5');
 
 // Constant
 var SERVER_PROJECT_DIR = 'server';    
@@ -147,75 +151,112 @@ function createAndroidAPI35Theme(projectDir) {
 function printDetails(config) {
     // Printing out details
     var details = ['Creating ' + config.platform.replace(',', ' and ') + ' ' + config.apptype + ' application using Salesforce Mobile SDK',
-                        '  with app name:        ' + config.appname,
-                        '       package name:    ' + config.packagename,
-                        '       organization:    ' + config.organization,
+                        '  with app name:         ' + config.appname,
+                        '       package name:     ' + config.packagename,
+                        '       organization:     ' + config.organization,
                         '',
-                        '  in:                   ' + config.projectPath,
+                        '  in:                    ' + config.projectPath,
                         '',
-                        '  from template repo:   ' + config.templaterepouri
+                        '  from template repo:    ' + config.templaterepouri
                   ];
 
     if (config.templatepath) {
-        details = details.concat(['       template path:   ' + config.templatepath]);
+        details = details.concat(['       template path:    ' + config.templatepath]);
     }
             
 
     if (config.sdkdependencies) {
-        details = details.concat(['       sdk dependencies:   ' + config.sdkdependencies]);
+        details = details.concat(['       sdk dependencies: ' + config.sdkdependencies]);
+    }
+
+    // OAuth configuration details
+    if (config.consumerkey && config.consumerkey !== '__INSERT_CONSUMER_KEY_HERE__' && config.consumerkey.trim() !== '') {
+        details = details.concat(['       consumer key:     ' + config.consumerkey]);
+    }
+
+    if (config.callbackurl && config.callbackurl !== '__INSERT_CALLBACK_URL_HERE__' && config.callbackurl.trim() !== '') {
+        details = details.concat(['       callback URL:     ' + config.callbackurl]);
+    }
+
+    if (config.loginserver && config.loginserver.trim() !== '') {
+        details = details.concat(['       login server:     ' + config.loginserver]);
     }
             
     // Hybrid extra details
     if (config.apptype.indexOf('hybrid') >= 0) {
         if (config.apptype === 'hybrid_remote') {
-            details = details.concat(['       start page:      ' + config.startpage]);
+            details = details.concat(['       start page:       ' + config.startpage]);
         }
 
-        details = details.concat(['       plugin repo:     ' + config.cordovaPluginRepoUri]);
+        details = details.concat(['       plugin repo:      ' + config.cordovaPluginRepoUri]);
     }
             
     utils.logParagraph(details);
 }
 
+//
+// Check if valid OAuth configuration is provided
+//
+function hasValidOAuthConfig(config) {
+    return config.consumerkey && config.callbackurl &&
+           config.consumerkey !== '__INSERT_CONSUMER_KEY_HERE__' &&
+           config.callbackurl !== '__INSERT_CALLBACK_URL_HERE__' &&
+           config.consumerkey.trim() !== '' && 
+           config.callbackurl.trim() !== '' &&
+           (!config.loginserver || config.loginserver.trim() !== '');
+}
+
 //
 // Print next steps
 //
-function printNextSteps(ide, projectPath, result) {
+function printNextSteps(ide, projectPath, result, hasValidOAuth) {
     var workspacePath = path.join(projectPath, result.workspacePath);
     var bootconfigFile =  path.join(projectPath, result.bootconfigFile);
 
+    var nextSteps = ['Next steps' + (result.platform ? ' for ' + result.platform : '') + ':',
+                     '',
+                     'Your application project is ready in ' + projectPath + '.',
+                     'To use your new application in ' + ide + ', do the following:', 
+                     '   - open ' + workspacePath + ' in ' + ide];
+
+    // Only show OAuth configuration instructions if valid OAuth config was not provided
+    if (!hasValidOAuth) {
+        nextSteps.push('   - make sure to plug your OAuth Client ID and Callback URI');
+        nextSteps.push('     into ' + bootconfigFile);
+    }
+
+    nextSteps.push('   - build and run');
+
     // Printing out next steps
-    utils.logParagraph(['Next steps' + (result.platform ? ' for ' + result.platform : '') + ':',
-                        '',
-                        'Your application project is ready in ' + projectPath + '.',
-                        'To use your new application in ' + ide + ', do the following:', 
-                        '   - open ' + workspacePath + ' in ' + ide, 
-                        '   - build and run', 
-                        'Before you ship, make sure to plug your OAuth Client ID and Callback URI,',
-                        'and OAuth Scopes into ' + bootconfigFile,
-                       ]);
+    utils.logParagraph(nextSteps);
 };    
 
 //
 // Print next steps for Native Login
 // 
-function printNextStepsForNativeLogin(ide, projectPath, result) {
+function printNextStepsForNativeLogin(ide, projectPath, result, hasValidOAuth) {
     var workspacePath = path.join(projectPath, result.workspacePath);
     var bootconfigFile =  path.join(projectPath, result.bootconfigFile);
     var entryFile = (ide === 'XCode') ? 'SceneDelegate' : 'MainApplication';  
 
+    var nextSteps = ['Next steps' + (result.platform ? ' for ' + result.platform : '') + ':',
+                     '',
+                     'Your application project is ready in ' + projectPath + '.',
+                     'To use your new application in ' + ide + ', do the following:', 
+                     '   - open ' + workspacePath + ' in ' + ide];
+
+    // Only show OAuth configuration instructions if valid OAuth config was not provided
+    if (!hasValidOAuth) {
+        nextSteps.push('   - Update the OAuth Client ID, Callback URI, and Community URL in ' + entryFile + ' class.');        
+        nextSteps.push('   - Make sure to plug your OAuth Client ID and Callback URI into');
+        nextSteps.push('     into ' + bootconfigFile);
+        nextSteps.push('     since it is still be used for authentication if we fallback on the webview.');
+    }
+
+    nextSteps.push('   - build and run');
+
     // Printing out next steps
-    utils.logParagraph(['Next steps' + (result.platform ? ' for ' + result.platform : '') + ':',
-                        '',
-                        'Your application project is ready in ' + projectPath + '.',
-                        'To use your new application in ' + ide + ', do the following:', 
-                        '   - open ' + workspacePath + ' in ' + ide, 
-                        '   - Update the OAuth Client ID, Callback URI, and Community URL in ' + entryFile + ' class.',
-                        '   - build and run', 
-                        'Before you ship, make sure to plug your OAuth Client ID and Callback URI,',
-                        'and OAuth Scopes into ' + bootconfigFile + ', since it is still used for',
-                        'authentication if we fallback on the webview.'
-                       ]);
+    utils.logParagraph(nextSteps);
 }
 
 //
@@ -409,6 +450,8 @@ function actuallyCreateApp(forcecli, config) {
         }
         config.templateLocalPath = path.join(repoDir, config.templatepath);
 
+        validateCustomProperties(`${repoDir}/template.json`, config.templateProperties);
+
         // Override sdk dependencies in package.json if any were provided
         if (config.sdkdependencies) {
             overrideSdkDependencies(path.join(config.templateLocalPath, 'package.json'), config.sdkdependencies);
@@ -435,13 +478,14 @@ function actuallyCreateApp(forcecli, config) {
         
         // Printing next steps
         if (!(results instanceof Array)) { results = [results] };
+        var hasValidOAuth = hasValidOAuthConfig(config);
         for (var result of results) {
             var ide = SDK.ides[result.platform || config.platform.split(',')[0]];
 
             if (config.templatepath != undefined && config.templatepath.includes('NativeLogin')) {
-                printNextStepsForNativeLogin(ide, config.projectPath, result);
+                printNextStepsForNativeLogin(ide, config.projectPath, result, hasValidOAuth);
             } else {
-                printNextSteps(ide, config.projectPath, result);
+                printNextSteps(ide, config.projectPath, result, hasValidOAuth);
             }
         }
         printNextStepsForServerProjectIfNeeded(config.projectPath);
@@ -453,6 +497,33 @@ function actuallyCreateApp(forcecli, config) {
     }
 }
 
+function validateCustomProperties(templateJsonPath, customProperties) {
+    // skip if template json file does not exist
+    if (!fs.existsSync(templateJsonPath)) {
+        return;
+    }
+
+    utils.log('Validating custom properties against schema...');
+    // Validate data against schema with AJV
+    const ajv = new Ajv({allErrors: true});
+    const schema = readJsonFile(templateJsonPath);
+    const validate = ajv.compile(schema);
+
+    const jsonToValidate = {
+        templatePrerequisites: { templateProperties: customProperties }
+    }
+    const valid = validate(jsonToValidate);
+
+    if (!valid) {
+        utils.logError('Custom properties validation failed:\n', 
+            JSON.stringify(validate.errors, null, "  "));       
+        process.exit(1);
+    }
+
+    utils.logInfo('Custom properties are valid\n', COLOR.green);
+}
+
 module.exports = {
-    createApp
+    createApp,
+    validateCustomProperties
 };

package/shared/jsonChecker.js

@@ -71,5 +71,6 @@ function readJsonFile(filePath) {
 }
 
 module.exports = {
-    validateJson
+    validateJson,
+    readJsonFile
 };

package/shared/oclifAdapter.js

@@ -37,7 +37,7 @@ const logError = require('./utils').logError;
 const separateRepoUrlPathBranch = require('./utils').separateRepoUrlPathBranch;
 const os = require('os');
 
-const { SfdxError } = require('@salesforce/core');
+const { SfError } = require('@salesforce/core');
 const { Command, flags } = require('@oclif/command');
 
 const namespace = 'mobilesdk';
@@ -160,9 +160,15 @@ class OclifAdapter extends Command {
     }
 
     execute(cli, klass) {
-        const { flags } = this.parse(klass);
-        if (OclifAdapter.validateCommand(cli, klass.command.name, flags)) {
-            return OclifAdapter.runCommand(cli, klass.command.name, flags);
+        const { flags, argv : remainingArgs } = this.parse(klass);
+        const commandConfig = klass.command;
+        if (OclifAdapter.validateCommand(cli, commandConfig.name, flags)) {
+            // If the command supports custom flags and there are remaining arguments, parse the custom properties
+            if (klass.command.supportCustomFlags === true && remainingArgs.length > 0) {
+                const customProperties = OclifAdapter.getCustomProperties(remainingArgs);
+                flags.templateProperties = customProperties;
+            }
+            return OclifAdapter.runCommand(cli, commandConfig.name, flags);
         }
     }
 
@@ -201,13 +207,55 @@ class OclifAdapter extends Command {
                         this.flags[name] = flag.quantity + '';
                         break;
                     } else {
-                        throw new SfdxError(`Unexpected value type for flag ${name}`, 'UnexpectedFlagValueType');
+                        throw new SfError(`Unexpected value type for flag ${name}`, 'UnexpectedFlagValueType');
                     }
                 default:
-                    throw new SfdxError(`Unexpected value type for flag ${name}`, 'UnexpectedFlagValueType');
+                    throw new SfError(`Unexpected value type for flag ${name}`, 'UnexpectedFlagValueType');
             }
         });
     }
+
+    static getCustomProperties(args) {
+        const properties = {};
+        const prefix = '--template-property-';
+        
+        for (let i = 0; i < args.length; i++) {
+            const arg = args[i];
+            
+            // Check if this argument starts with --template- but not --template-property-
+            if (arg.startsWith('--template-') && !arg.startsWith(prefix)) {
+                throw new SfError(
+                    `Invalid template property flag: "${arg}". Template properties must be prefixed with "${prefix}".`,
+                    'InvalidTemplatePropertyPrefix'
+                );
+            }
+            
+            // Check if this argument is a template property flag
+            if (arg.startsWith(prefix)) {
+                // Check if the value is provided with equals sign (--template-property-prop1=val1)
+                if (arg.includes('=')) {
+                    const equalIndex = arg.indexOf('=');
+                    const propertyName = arg.substring(prefix.length, equalIndex);
+                    const propertyValue = arg.substring(equalIndex + 1);
+                    properties[propertyName] = propertyValue;
+                } else {
+                    // Extract the property name (everything after the prefix)
+                    const propertyName = arg.substring(prefix.length);
+                    
+                    // Check if there's a next argument and it's not another template property flag
+                    if (i + 1 < args.length && !args[i + 1].startsWith('--')) {
+                        // Use the next argument as the value
+                        properties[propertyName] = args[i + 1];
+                        i++; // Skip the value in the next iteration
+                    }
+                    // If the next argument is another flag or doesn't exist, skip this property
+                }
+            }
+        }
+        
+        return properties;
+    }
+    
 }
 
 OclifAdapter.getCommand = function (cli, commandName) {

package/shared/templateHelper.js

@@ -29,7 +29,8 @@
 var path = require('path'),
     SDK = require('./constants'),
     utils = require('./utils'),
-    fs = require('fs');
+    fs = require('fs'),
+    { constantCase } = require('change-case');
 
 //
 // Helper to prepare template
@@ -70,12 +71,15 @@ function getTemplates(cli, templateSourceOrRepoUri, includeDescriptions) {
         var applicableTemplates = templates
             .filter(template => cli.appTypes.includes(template.appType) && cli.platforms.filter(platform => template.platforms.includes(platform)).length > 0);
 
-        // If descriptions are requested, add them to each template
-        if (includeDescriptions) {
-            applicableTemplates.forEach(function(template) {
-                template.metadata = getTemplateMetadata(template.path, repoDir);
-            });
-        }
+        // Add metadata and custom properties to each template
+        applicableTemplates.forEach(function (template) {
+            const metadata = getTemplateMetadata(template.path, repoDir);
+            template.customProperties = getCustomProperties(metadata);
+            // If descriptions are requested, add metadata
+            if (includeDescriptions) {
+                template.metadata = metadata;
+            }
+        });
 
         // Cleanup
         utils.removeFile(tmpDir);
@@ -121,7 +125,7 @@ function getTemplateMetadata(templatePath, repoDir) {
         if (fs.existsSync(templateJsonPath)) {
             var templateJsonContent = fs.readFileSync(templateJsonPath, 'utf8');
             var templateData = JSON.parse(templateJsonContent);
-            
+
             // Return all metadata properties from the template.json file
             // This makes the function more flexible for future use cases
             return templateData;
@@ -157,47 +161,65 @@ function getTemplate(templateName, templateSourceOrRepoUri, includeDescriptions)
 
         // Finding the specific template
         var template = templates.find(t => t.path === templateName);
-        
+
         if (!template) {
             utils.removeFile(tmpDir);
             return null;
         }
-        
+
+        const metadata = getTemplateMetadata(template.path, repoDir);
+        template.customProperties = getCustomProperties(metadata);
+
         // If descriptions are requested, add metadata
         if (includeDescriptions) {
-            template.metadata = getTemplateMetadata(template.path, repoDir);
+            template.metadata = metadata;
         }
-        
+
         // Cleanup
         utils.removeFile(tmpDir);
-        
+
         return template;
     } catch (error) {
         return null;
     }
 }
 
+//
+// Build template command string
+//
+function buildTemplateCommand(source, commandPrefix, templatePath, extraRequiredArgs, customProperties) {
+    var sourceForCommand = source || SDK.templatesRepoUri;
+    var command = commandPrefix + ' --' + SDK.args.templateSource.name + '=' + sourceForCommand
+        + ' --' + SDK.args.template.name + '=' + templatePath;
+
+    if (extraRequiredArgs) {
+        command += ` ${extraRequiredArgs}`;
+    }
+
+    // Add custom command args if provided
+    if (customProperties) {
+        const customCommandArgs = getCustomCommandArgs(customProperties);
+        if (customCommandArgs.length > 0) {
+            command += ` ${customCommandArgs.join(' ')}`;
+        }
+    }
+
+    return command;
+}
+
 //
 // Display template list with optional metadata
 //
 function displayTemplateList(templates, source, cliName, commandPrefix, includeDescriptions, extraRequiredArgs, outputJson) {
-    var utils = require('./utils');
     var COLOR = require('./outputColors');
     var logInfo = utils.logInfo;
-    var SDK = require('./constants');
 
     if (outputJson) {
         // Output in JSON format
         var jsonOutput = {
             repository: source || 'default',
-            templates: templates.map(function(template, index) {
-                var sourceForCommand = source || SDK.templatesRepoUri;
-                var command = commandPrefix + ' --' + SDK.args.templateSource.name + '=' + sourceForCommand
-                    + ' --' + SDK.args.template.name + '=' + template.path;
-                
-                if (extraRequiredArgs) {
-                    command += ` ${extraRequiredArgs}`;
-                }
+            templates: templates.map(function (template, index) {
+                var command = buildTemplateCommand(source, commandPrefix, template.path, extraRequiredArgs, template.customProperties);
 
                 var jsonTemplate = {
                     index: index + 1,
@@ -215,7 +237,7 @@ function displayTemplateList(templates, source, cliName, commandPrefix, includeD
                 return jsonTemplate;
             })
         };
-        
+
         logInfo(JSON.stringify(jsonOutput, null, 2), COLOR.white);
         return;
     }
@@ -232,17 +254,10 @@ function displayTemplateList(templates, source, cliName, commandPrefix, includeD
         var template = templates[i];
         logInfo((i + 1) + ') ' + template.description, COLOR.cyan);
 
-        var sourceForCommand = source || SDK.templatesRepoUri;
-        var command = commandPrefix + ' --' + SDK.args.templateSource.name + '=' + sourceForCommand
-            + ' --' + SDK.args.template.name + '=' + template.path;
-        
-        // Add additional required args if provided
-        if (extraRequiredArgs) {
-            command += ` ${extraRequiredArgs}`;
-        }
-        
+        var command = buildTemplateCommand(source, commandPrefix, template.path, extraRequiredArgs, template.customProperties);
+
         logInfo(command, COLOR.magenta);
-        
+
         // If descriptions are requested and available, show them
         if (includeDescriptions && template.metadata) {
             if (template.metadata.description) {
@@ -266,21 +281,14 @@ function displayTemplateList(templates, source, cliName, commandPrefix, includeD
 // Display detailed information about a single template
 //
 function displayTemplateDetail(template, source, cliName, commandPrefix, includeDescriptions, extraRequiredArgs, outputJson) {
-    var utils = require('./utils');
     var COLOR = require('./outputColors');
     var logInfo = utils.logInfo;
-    var SDK = require('./constants');
+
+    // create command usage
+    var command = buildTemplateCommand(source, commandPrefix, template.path, extraRequiredArgs, template.customProperties);
 
     if (outputJson) {
         // Output in JSON format
-        var sourceForCommand = source || SDK.templatesRepoUri;
-        var command = commandPrefix + ' --' + SDK.args.templateSource.name + '=' + sourceForCommand
-            + ' --' + SDK.args.template.name + '=' + template.path;
-        
-        if (extraRequiredArgs) {
-            command += ` ${extraRequiredArgs}`;
-        }
-
         var jsonOutput = {
             repository: source || 'default',
             template: {
@@ -295,7 +303,7 @@ function displayTemplateDetail(template, source, cliName, commandPrefix, include
         if (includeDescriptions && template.metadata) {
             jsonOutput.template.metadata = template.metadata;
         }
-        
+
         logInfo(JSON.stringify(jsonOutput, null, 2), COLOR.white);
         return;
     }
@@ -313,29 +321,42 @@ function displayTemplateDetail(template, source, cliName, commandPrefix, include
     logInfo('Description: ' + template.description, COLOR.cyan);
     logInfo('App Type: ' + template.appType, COLOR.cyan);
     logInfo('Platforms: ' + template.platforms.join(', '), COLOR.cyan);
+    logInfo('\nUsage:', COLOR.magenta);
 
     // Display command usage
-    var sourceForCommand = source || SDK.templatesRepoUri;
-    var command = commandPrefix + ' --' + SDK.args.templateSource.name + '=' + sourceForCommand
-        + ' --' + SDK.args.template.name + '=' + template.path;
-    
-    // Add additional required args if provided
-    if (extraRequiredArgs) {
-        command += ` ${extraRequiredArgs}`;
-    }
-    
-    logInfo('\nUsage:', COLOR.magenta);
     logInfo(command, COLOR.magenta);
-    
+
     // If descriptions are requested and available, show raw JSON metadata
     if (includeDescriptions && template.metadata) {
         logInfo('\nTemplate Metadata (template.json):', COLOR.cyan);
         logInfo(JSON.stringify(template.metadata, null, 2), COLOR.white);
     }
-    
+
     logInfo('');
 }
 
+/**
+ * Get custom properties from metadata
+ * @param {Object} metadata - Template schema json object
+ * @returns {Object} Custom properties object
+ */
+function getCustomProperties(metadata) {
+    return metadata?.properties?.templatePrerequisites?.properties?.templateProperties || null;
+}
+
+/**
+ * Get custom command args from custom properties metadata
+ * @param {JSON} customPropertiesMetadata - Custom properties metadata
+ * @returns {Array} Custom command args
+ */
+function getCustomCommandArgs(customPropertiesMetadata) {
+    const properties = customPropertiesMetadata?.properties;
+    if (!properties) {
+        return [];
+    }
+    return Object.keys(properties).map(key => `--template-property-${key}=<${constantCase(key)}>`);
+}
+
 module.exports = {
     prepareTemplate,
     getTemplates,
@@ -343,5 +364,7 @@ module.exports = {
     getAppTypeFromTemplate,
     getTemplateMetadata,
     displayTemplateList,
-    displayTemplateDetail
+    displayTemplateDetail,
+    getCustomProperties,
+    getCustomCommandArgs
 };