Merge pull request #3 from SoftwareAG/development_v10.12

Development v10.12

Author: sagpembo

package-lock.json

@@ -28,5 +28,8 @@
   "devDependencies": {
     "commander": "^8.3.0",
     "request": "^2.88.2"
+  },
+  "dependencies": {
+    "readline-sync": "^1.4.10"
   }
 }

package.json

@@ -13,8 +13,27 @@ var flowservice = require('./flowservice.js');
 var prettyprint = false;
 var compat = false;
 
+var tenantDomain;
+var tenantUser;
+var tenantPw;
+
 const { Command, Option } = require('commander');
 const { exit } = require('process');
+const readline = require('readline-sync');
+
+function readFromConsole(question,isPassword)
+{
+  var answer;
+  if(isPassword !== undefined && isPassword!==null && isPassword==true)
+  {
+    answer = readline.question("\x1b[32m" + question + "\x1b[0m",{hideEchoBack: true});
+  }
+  else
+  {
+    answer = readline.question("\x1b[32m" + question + "\x1b[0m");
+  }
+  return answer;
+}
 
 function checkOptions(){
   if(program.opts().verbose==true){
@@ -26,6 +45,27 @@ function checkOptions(){
     prettyprint = true;
   }
 
+  if(program.opts().domain == undefined){
+    tenantDomain = readFromConsole('Please type your tenant domain name: ');
+  }
+  else{
+    tenantDomain = program.opts().domain
+  }
+
+  if(program.opts().user == undefined){
+    tenantUser = readFromConsole('Please type your tenant User ID: ');
+  }
+  else{
+    tenantUser = program.opts().user
+  }
+
+  if(program.opts().password == undefined){
+    tenantPw = readFromConsole('Please type your tenant User Password: ',true);
+  }
+  else{
+    tenantPw = program.opts().password
+  }
+
 }
 
 function debug(message){
@@ -38,9 +78,10 @@ program
   .version('2022.07.1')
 
 //required options
-  .requiredOption('-d, --domain <tenantDomain>', 'Tenant Doamin Name, e.g. "tenant.int-aws-us.webmethods.io"')
-  .requiredOption('-u, --user <userid>', 'Tenant User ID')
-  .requiredOption('-p, --password <password>', 'Tenant User Password')
+  .option('-d, --domain <tenantDomain>', 'Tenant Doamin Name, e.g. "tenant.int-aws-us.webmethods.io"')
+  .option('-u, --user <userid>', 'Tenant User ID')
+  .option('-p, --password <password>', 'Tenant User Password')
+  //.requiredOption('-p, --password <password>', 'Tenant User Password')
 
 //options
   .addOption(new Option('-t, --timeout <delay>', 'timeout in seconds').default(60, 'one minute'))
@@ -122,12 +163,12 @@ Examples:
      project-publish fl65d3aa87fc1783ea5cf8c8 'My deployment' 'target.int-aws-us.webmethods.io' 'targetuser' 'targetpassword' '{"output":{"workflows":["fla73a20e13dd6736cf9c355","fl3cfd145262bbc5d44acff3"],"flows":["mapLeads"],"rest_api":[],"soap_api":[],"listener":[],"messaging":[]}}'  
 
   
-  \x1b[32m/Publish Project to another tenant:\x1b[0m
-      $ node wmiocli.js 
-        -d tenant.int-aws-us.webmethods.io 
-        -u user 
-        -p password 
-         project-publish fl65d3aa87fc1783ea5cf8c8 'My deployment'   
+  \x1b[32m/Deploy published Project in the tenant with the given name and deploy version:\x1b[0m
+  $ node wmiocli.js 
+    -d tenant.int-aws-us.webmethods.io 
+    -u user 
+    -p password 
+    project-deploy projectName 1   
 
   \x1b[4mWorkflow\x1b[0m
 
@@ -197,7 +238,38 @@ Examples:
     -d tenant.int-aws-us.webmethods.io 
     -u user
     -p password 
-    flowservice-execute fl65d3aa87fc1783ea5cf8c8 myFlowService             
+    flowservice-execute fl65d3aa87fc1783ea5cf8c8 myFlowService     
+
+    
+  \x1b[4mRoles\x1b[0m
+
+  \x1b[32mGet roles list or individual role\x1b[0m
+  $ node wmiocli.js 
+    -d tenant.int-aws-us.webmethods.io 
+    -u user
+    -p password 
+    role [role-name]
+
+  \x1b[32mCreates a role\x1b[0m
+  $ node wmiocli.js 
+    -d tenant.int-aws-us.webmethods.io 
+    -u user
+    -p password 
+    role-create 'rolename' 'role description' 'project 1 name,r,w,e;project 2 name,r;'
+
+  \x1b[32mUpdates a role with a provided Id\x1b[0m
+  $ node wmiocli.js 
+    -d tenant.int-aws-us.webmethods.io 
+    -u user
+    -p password 
+    role-update 'roleId' 'rolename' 'role description' 'project 1 name,r,w,e;project 2 name,r;'   
+
+  \x1b[32mDelete a role with a provided Id\x1b[0m
+  $ node wmiocli.js 
+    -d tenant.int-aws-us.webmethods.io 
+    -u user
+    -p password 
+    role-delete 'roleId'       
 `)
 
   .showSuggestionAfterError()
@@ -212,7 +284,7 @@ program.command('project [project-name]')
 .description('Lists all projects or view an individual project, specified via project name or uid')
 .action((projectName) => {
   checkOptions();
-  project.init(program.opts().domain,program.opts().user,program.opts().password,program.opts().timeout,program.opts().prettyprint)
+  project.init(tenantDomain,tenantUser,tenantPw,program.opts().timeout,program.opts().prettyprint)
   var resp = project.list(projectName);
   if(resp)console.log(resp);
 });  
@@ -221,7 +293,7 @@ program.command('project-assets <project-name>')
 .description('Lists project assets from given project name or uid')
 .action((projectName) => {
   checkOptions();
-  project.init(program.opts().domain,program.opts().user,program.opts().password,program.opts().timeout,program.opts().prettyprint)
+  project.init(tenantDomain,tenantUser,tenantPw,program.opts().timeout,program.opts().prettyprint)
   var resp = project.listAssets(projectName);
   if(resp)console.log(resp);
 });  
@@ -230,31 +302,31 @@ program.command('project-create <project-name>')
 .description('Create project with given name')
 .action((projectName) => {
   checkOptions();
-  project.init(program.opts().domain,program.opts().user,program.opts().password,program.opts().timeout,program.opts().prettyprint)
+  project.init(tenantDomain,tenantUser,tenantPw,program.opts().timeout,program.opts().prettyprint)
   project.create(projectName);
 });
 
 program.command('project-update <project-id> <project-name>')
 .description('Update project with new name')
 .action((projectId, projectName) => {
   checkOptions();
-  project.init(program.opts().domain,program.opts().user,program.opts().password,program.opts().timeout,program.opts().prettyprint)
+  project.init(tenantDomain,tenantUser,tenantPw,program.opts().timeout,program.opts().prettyprint)
   project.update(projectId, projectName);
 });
 
 program.command('project-delete <project-id>')
 .description('Delete project with given id')
 .action((projectId) => {
   checkOptions();
-  project.init(program.opts().domain,program.opts().user,program.opts().password,program.opts().timeout,program.opts().prettyprint)
+  project.init(tenantDomain,tenantUser,tenantPw,program.opts().timeout,program.opts().prettyprint)
   project.del(projectId);
 });
 
 program.command('project-publish <project-id> <publish-name> <target-tenant-domain-name> <target-user-id> <target-user-password> <assets-json>')
 .description('Pubilsh project to another tenant with given id')
 .action((projectId,publishName,targetTenantDomainName,targetUserId,targetUserPassword,assetsJson) => {
   checkOptions();
-  project.init(program.opts().domain,program.opts().user,program.opts().password,program.opts().timeout,program.opts().prettyprint)
+  project.init(tenantDomain,tenantUser,tenantPw,program.opts().timeout,program.opts().prettyprint)
   project.pub(projectId,publishName,targetTenantDomainName,targetUserId,targetUserPassword,assetsJson);
 
 });
@@ -263,7 +335,7 @@ program.command('project-deploy <projectName> <version>')
 .description('deploy published project with given version into tenant')
 .action((projectName, version) => {
   checkOptions();
-  project.init(program.opts().domain,program.opts().user,program.opts().password,program.opts().timeout,program.opts().prettyprint)
+  project.init(tenantDomain,tenantUser,tenantPw,program.opts().timeout,program.opts().prettyprint)
   project.deploy(projectName,version);
 });
 
@@ -276,7 +348,7 @@ program.command('role [role-id]')
 .description('Lists all roles or views an individual role')
 .action((roleId) => {
   checkOptions();
-  role.init(program.opts().domain,program.opts().user,program.opts().password,program.opts().timeout,program.opts().prettyprint)
+  role.init(tenantDomain,tenantUser,tenantPw,program.opts().timeout,program.opts().prettyprint)
   var resp = role.list(roleId);
   if(resp)console.log(resp);
 });  
@@ -285,23 +357,23 @@ program.command('role-create <role-name> <role-description> <roles-list>')
 .description('Create roles and specify the permissions for that role. Roles-list should be provided as follows projectName,r,w,e;project name 2,r;')
 .action((roleName,roleDescription,rolesList) => {
   checkOptions();
-  role.init(program.opts().domain,program.opts().user,program.opts().password,program.opts().timeout,program.opts().prettyprint);
+  role.init(tenantDomain,tenantUser,tenantPw,program.opts().timeout,program.opts().prettyprint);
   role.insert(roleName,roleDescription, rolesList);
 });  
 
 program.command('role-update <role-id> <role-name> <role-description> <roles-list>')
 .description('Create roles and specify the permissions for that role. Roles-list should be provided as follows projectName,r,w,e;project name 2,r;')
 .action((roleId, roleName,roleDescription,rolesList) => {
   checkOptions();
-  role.init(program.opts().domain,program.opts().user,program.opts().password,program.opts().timeout,program.opts().prettyprint);
+  role.init(tenantDomain,tenantUser,tenantPw,program.opts().timeout,program.opts().prettyprint);
   role.update(roleId, roleName,roleDescription, rolesList);
 });
 
-program.command('role-delete <role-name>')
-.description('Delete a roles with the given role name')
-.action((roleId, roleName,roleDescription,rolesList) => {
+program.command('role-delete <roleId>')
+.description('Delete a roles with the given role id')
+.action((roleId) => {
   checkOptions();
-  role.init(program.opts().domain,program.opts().user,program.opts().password,program.opts().timeout,program.opts().prettyprint);
+  role.init(tenantDomain,tenantUser,tenantPw,program.opts().timeout,program.opts().prettyprint);
   role.del(roleId);
 });  
 
@@ -318,7 +390,7 @@ program.command('user')
 .description('Lists all users')
 .action(() => {
   checkOptions();
-  user.init(program.opts().domain,program.opts().user,program.opts().password,program.opts().timeout,program.opts().prettyprint);
+  user.init(tenantDomain,tenantUser,tenantPw,program.opts().timeout,program.opts().prettyprint);
   user.list(undefined);
 });
 
@@ -328,7 +400,7 @@ program.command('user-role-assignment <user-id> <role-names>')
   checkOptions();
   debug("userId: " + userId);
   debug("Roles: " + roleNames);
-  user.init(program.opts().domain,program.opts().user,program.opts().password,program.opts().timeout,program.opts().prettyprint);
+  user.init(tenantDomain,tenantUser,tenantPw,program.opts().timeout,program.opts().prettyprint);
   user.assignRoles(userId,roleNames);
 });
 
@@ -341,7 +413,7 @@ program.command('workflow-export <project-id> <workflow-id> <filename>')
 .description('Export workflow with id <workflow-id> from project <project-id>')
 .action((projectId, workflowId, filename) => {
   checkOptions();
-  wf.init(program.opts().domain,program.opts().user,program.opts().password,program.opts().timeout,projectId);
+  wf.init(tenantDomain,tenantUser,tenantPw,program.opts().timeout,projectId);
   wf.exportwf(workflowId,filename);
 });
 
@@ -350,7 +422,7 @@ program.command('workflow-import <project-id> <filename>')
 .action((projectId, filename) => {
   checkOptions();
   debug("Importing Workflow");
-  wf.init(program.opts().domain,program.opts().user,program.opts().password,program.opts().timeout,projectId);
+  wf.init(tenantDomain,tenantUser,tenantPw,program.opts().timeout,projectId);
   wf.importwf(filename);
 });
 
@@ -359,23 +431,23 @@ program.command('workflow-delete <project-id> <workflow-id>')
 .action((projectId, workflowId) => {
   checkOptions();
   debug("Deleting Workflow [" + workflowId + "]");
-  wf.init(program.opts().domain,program.opts().user,program.opts().password,program.opts().timeout,projectId);
+  wf.init(tenantDomain,tenantUser,tenantPw,program.opts().timeout,projectId);
   wf.deletewf(workflowId);
 });
 
 program.command('workflow-execute <project-id> <workflow-id>')
  .description('Execute workflow <workflow-id> from project <project-id>')
 .action((projectId, workflowId) => {
   checkOptions();
-  wf.init(program.opts().domain,program.opts().user,program.opts().password,program.opts().timeout,projectId);
+  wf.init(tenantDomain,tenantUser,tenantPw,program.opts().timeout,projectId);
   wf.runwf(workflowId)
 });
 
 program.command('workflow-status <project-id> <run-id>')
 .description('Gets Execution status for workflow execution <run-id>')
 .action((projectId, runId) => {
   checkOptions();
-  wf.init(program.opts().domain,program.opts().user,program.opts().password,program.opts().timeout,projectId);
+  wf.init(tenantDomain,tenantUser,tenantPw,program.opts().timeout,projectId);
   wf.statuswf(runId);
 });
 
@@ -388,33 +460,36 @@ program.command('flowservice-export <project-id> <flow-name> <file-name>')
 .description('Export FlowService with name <flow-name> from project <project-id>')
 .action((projectId, flowName,filename) => {
   checkOptions();
-  flowservice.init(program.opts().domain,program.opts().user,program.opts().password,program.opts().timeout,projectId);
+  flowservice.init(tenantDomain,tenantUser,tenantPw,program.opts().timeout,projectId);
   flowservice.exportFlowService(flowName,filename);
 });
 
 program.command('flowservice-import <project-id> <filename>')
 .description('Import FlowService from <filename> into project <project-id>')
 .action((projectId, filename) => {
   checkOptions();
-  flowservice.init(program.opts().domain,program.opts().user,program.opts().password,program.opts().timeout,projectId);
+  flowservice.init(tenantDomain,tenantUser,tenantPw,program.opts().timeout,projectId);
   flowservice.importFlowService(filename);
 });
 
 program.command('flowservice-delete <project-id> <flow-name>')
 .description('Delete FlowService <flow-name> from project <project-id>')
 .action((projectId, flowName) => {
   checkOptions();
-  flowservice.init(program.opts().domain,program.opts().user,program.opts().password,program.opts().timeout,projectId);
+  flowservice.init(tenantDomain,tenantUser,tenantPw,program.opts().timeout,projectId);
   flowservice.deleteFlowService(flowName);
 });
 
 program.command('flowservice-execute <project-id> <flow-name> [input-json]')
  .description('Execute FlowService <flow-name> from project <project-id> with data <input-json>')
 .action((projectId, flowName,inputJson) => {
   checkOptions();
-  flowservice.init(program.opts().domain,program.opts().user,program.opts().password,program.opts().timeout,projectId);
+  flowservice.init(tenantDomain,tenantUser,tenantPw,program.opts().timeout,projectId);
   flowservice.runFlowService(flowName,inputJson);
 });
 
+
 program.parse();
 
+
+