refactor for insert and security patch

Author: Mohith Shrivastava

oclif.manifest.json

@@ -0,0 +1 @@
+{"version":"0.2.8","commands":{"deploy:apex":{"id":"deploy:apex","description":"Deploy apex class using tooling api","usage":"<%= command.id %> -p <string> [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"mo-dx-plugin","pluginType":"core","aliases":[],"examples":["$ sfdx deploy:apex -p filepath"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"targetusername":{"name":"targetusername","type":"option","char":"u","description":"username or alias for the target org; overrides default target org"},"apiversion":{"name":"apiversion","type":"option","description":"override the api version used for api requests made by this command"},"filepath":{"name":"filepath","type":"option","char":"p","description":"file path","required":true}},"args":[]},"deploy:aura":{"id":"deploy:aura","description":"Deploy aura bundles using tooling api","usage":"<%= command.id %> -p <string> [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"mo-dx-plugin","pluginType":"core","aliases":[],"examples":["$ sfdx deploy:aura -p filepath"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"targetusername":{"name":"targetusername","type":"option","char":"u","description":"username or alias for the target org; overrides default target org"},"apiversion":{"name":"apiversion","type":"option","description":"override the api version used for api requests made by this command"},"filepath":{"name":"filepath","type":"option","char":"p","description":"file path","required":true}},"args":[]},"deploy:lwc":{"id":"deploy:lwc","description":"Deploy lwc wusing tooling api","usage":"<%= command.id %> [-p <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"mo-dx-plugin","pluginType":"core","aliases":[],"examples":["$ sfdx deploy:lwc -p filepath"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"targetusername":{"name":"targetusername","type":"option","char":"u","description":"username or alias for the target org; overrides default target org"},"apiversion":{"name":"apiversion","type":"option","description":"override the api version used for api requests made by this command"},"filepath":{"name":"filepath","type":"option","char":"p","description":"file path"}},"args":[]},"deploy:staticresource":{"id":"deploy:staticresource","description":"Deploy static resource using tooling api","usage":"<%= command.id %> [-p <string>] [-r <string>] [-c <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"mo-dx-plugin","pluginType":"core","aliases":[],"examples":["$ sfdx deploy:staticresource -p <filepath>","$ sfdx deploy:staticresource -p <filepath> --cachecontrol public","$ sfdx deploy:staticresource -p <filepath> --cachecontrol public --resourcefolder <name of the folder where you have single page app>"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"targetusername":{"name":"targetusername","type":"option","char":"u","description":"username or alias for the target org; overrides default target org"},"apiversion":{"name":"apiversion","type":"option","description":"override the api version used for api requests made by this command"},"filepath":{"name":"filepath","type":"option","char":"p","description":"file path of the resource bundle"},"resourcefolder":{"name":"resourcefolder","type":"option","char":"r","description":"name of the folder where you have single page app, This defaults to staticresources","default":"staticresources"},"cachecontrol":{"name":"cachecontrol","type":"option","char":"c","description":"cache control, defaults to public","default":"private"}},"args":[]},"deploy:trigger":{"id":"deploy:trigger","description":"Deploy apex triggers using tooling api","usage":"<%= command.id %> -p <string> [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"mo-dx-plugin","pluginType":"core","aliases":[],"examples":["$ sfdx deploy:trigger -p filepath"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"targetusername":{"name":"targetusername","type":"option","char":"u","description":"username or alias for the target org; overrides default target org"},"apiversion":{"name":"apiversion","type":"option","description":"override the api version used for api requests made by this command"},"filepath":{"name":"filepath","type":"option","char":"p","description":"file path","required":true}},"args":[]},"deploy:vf":{"id":"deploy:vf","description":"Deploy visualforce page using tooling api","usage":"<%= command.id %> -p <string> [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"mo-dx-plugin","pluginType":"core","aliases":[],"examples":["$ sfdx deploy:vf -p filepath"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"targetusername":{"name":"targetusername","type":"option","char":"u","description":"username or alias for the target org; overrides default target org"},"apiversion":{"name":"apiversion","type":"option","description":"override the api version used for api requests made by this command"},"filepath":{"name":"filepath","type":"option","char":"p","description":"file path","required":true}},"args":[]},"deploy:vfcomponent":{"id":"deploy:vfcomponent","description":"Deploy visualforce components using tooling api","usage":"<%= command.id %> -p <string> [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"mo-dx-plugin","pluginType":"core","aliases":[],"examples":["$ sfdx deploy:vfcomponent -p filepath"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"targetusername":{"name":"targetusername","type":"option","char":"u","description":"username or alias for the target org; overrides default target org"},"apiversion":{"name":"apiversion","type":"option","description":"override the api version used for api requests made by this command"},"filepath":{"name":"filepath","type":"option","char":"p","description":"file path","required":true}},"args":[]},"metadata:rename":{"id":"metadata:rename","description":"Rename metadata using metadata api","usage":"<%= command.id %> -t <string> -n <string> -o <string> [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"mo-dx-plugin","pluginType":"core","aliases":[],"examples":["$ sfdx metadata:rename -t <metadatatype> -n <newname> -o <oldname>","$ sfdx metadata:rename -t CustomObject -n MyCustomObject1New__c -o MyCustomObject1__c"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"targetusername":{"name":"targetusername","type":"option","char":"u","description":"username or alias for the target org; overrides default target org"},"apiversion":{"name":"apiversion","type":"option","description":"override the api version used for api requests made by this command"},"metadatatype":{"name":"metadatatype","type":"option","char":"t","description":"type of the metadata. Examples are CustomObject, Profile","required":true},"newfullname":{"name":"newfullname","type":"option","char":"n","description":"new name of the metadata element","required":true},"oldfullname":{"name":"oldfullname","type":"option","char":"o","description":"old name of the metadata element","required":true}},"args":[]},"retrieve:dxsource":{"id":"retrieve:dxsource","description":"Retrieves Source is DX format from Unmanaged/Managed package","usage":"<%= command.id %> -n <string> [-p <string>] [-m <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"mo-dx-plugin","pluginType":"core","aliases":[],"examples":["$ sfdx retrieve:dxsource -n <package/changeset>","$ sfdx retrieve:dxsource -n <package/changeset> -m \"true\"","$ sfdx retrieve:dxsource -n <package/changeset> -p <[pathName]>","$ sfdx retrieve:dxsource -u myOrg@example.com -n <package/changeset> -p <[pathName]>"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"targetusername":{"name":"targetusername","type":"option","char":"u","description":"username or alias for the target org; overrides default target org"},"apiversion":{"name":"apiversion","type":"option","description":"override the api version used for api requests made by this command"},"packagename":{"name":"packagename","type":"option","char":"n","description":"the name of the package you want to retrieve","required":true},"pathname":{"name":"pathname","type":"option","char":"p","description":"where to convert the result to.defaults to force-app","default":"force-app"},"retainmetadata":{"name":"retainmetadata","type":"option","char":"m","description":"If set retain the metadata folder in mdapiout directory and do not clean"}},"args":[]},"retrieve:pkgsource":{"id":"retrieve:pkgsource","description":"Retrieves Source from Unmanaged/Managed package in Metadata API format","usage":"<%= command.id %> -n <string> [-r <string>] [-u <string>] [--apiversion <string>] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]","pluginName":"mo-dx-plugin","pluginType":"core","aliases":[],"examples":["$ sfdx retrieve:pkgsource -n <package/changeset>","$ sfdx retrieve:pkgsource -n <package/changeset> -r <relative path where source is retrieved and unzipped>","$ sfdx retrieve:pkgsource -n <package/changeset> -r /changesets/src"],"flags":{"json":{"name":"json","type":"boolean","description":"format output as json","allowNo":false},"loglevel":{"name":"loglevel","type":"option","description":"logging level for this command invocation","required":false,"helpValue":"(trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL)","options":["trace","debug","info","warn","error","fatal","TRACE","DEBUG","INFO","WARN","ERROR","FATAL"],"default":"warn"},"targetusername":{"name":"targetusername","type":"option","char":"u","description":"username or alias for the target org; overrides default target org"},"apiversion":{"name":"apiversion","type":"option","description":"override the api version used for api requests made by this command"},"packagename":{"name":"packagename","type":"option","char":"n","description":"the name of the package you want to retrieve","required":true},"retrievedir":{"name":"retrievedir","type":"option","char":"r","description":"directory path to retrieve","required":false}},"args":[]}}}

package.json

@@ -14,6 +14,7 @@
     "fs-extra": "^8.1.0",
     "lodash": "^4.17.13",
     "mime-types": "^2.1.24",
+    "xmldom-sfdx-encoding": "^0.1.29",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
@@ -35,7 +36,7 @@
     "nyc": "^14",
     "sinon": "5",
     "ts-node": "^7",
-    "typescript": "~3.3.3"
+    "typescript": "3"
   },
   "engines": {
     "node": ">=8.0.0"

src/commands/deploy/apex.ts

@@ -2,7 +2,6 @@ import { core, flags, SfdxCommand } from '@salesforce/command';
 import { AnyJson } from '@salesforce/ts-types';
 import * as chalk from 'chalk';
 import fs = require('fs-extra');
-import { SobjectResult } from '../../models/sObjectResult';
 import { Deploy, DeployResult } from '../../service/deploy';
 import {display, displaylog} from '../../service/displayError';
 import { getFileName } from '../../service/getFileName';
@@ -50,6 +49,8 @@ export default class ApexDeploy extends SfdxCommand {
 
     const filebody = await fs.readFile(this.flags.filepath, 'utf8');
 
+    const fileMetaXML = await fs.readFile(this.flags.filepath + '-meta.xml', 'utf8');
+
      // get the apex class Id using the class Name
     const className = getFileName(this.flags.filepath, '.cls');
     const apexclass = await conn.tooling.sobject('Apexclass').find({
@@ -59,37 +60,24 @@ export default class ApexDeploy extends SfdxCommand {
 
     // logic to update apex class
     if (apexclass.length > 0) {
-      const updateResult = await this.updateApex(apexclass, filebody, conn) as any; // tslint:disable-line:no-any
+      const updateResult = await this.updateApex(apexclass, filebody, fileMetaXML, conn, className, 'Updated') as any; // tslint:disable-line:no-any
       return  updateResult;
     } else {
-        // logic to create an apex class
-        const apexClass = {
-          Body: filebody,
-          NamespacePrefix: namespacePrefix
-        } as ApexClass;
-
-        try {
-          const apexSaveResult = await conn.tooling.sobject('ApexClass').create(apexClass) as SobjectResult;
-          if ( apexSaveResult.success) {
-            this.ux.stopSpinner(chalk.bold.green('Apex Class Successfully Created ✔'));
-          } else {
-            this.ux.table(apexSaveResult.errors);
-            this.ux.stopSpinner(chalk.bold.red('Apex Class Creation Failed ×'));
-          }
-          return apexSaveResult as any ; // tslint:disable-line:no-any
-        } catch (ex) {
-          displaylog(chalk.bold.red(ex), this.ux);
-          this.ux.stopSpinner(chalk.bold.red('Apex Class Creation Failed ×'));
-        }
+      // We compile the code with null as EntityId
+      const updateResult = await this.updateApex(null, filebody, fileMetaXML, conn, className, 'Created') as any; // tslint:disable-line:no-any
+      return updateResult;
       }
     }
 
-  private async updateApex(apexclass: ApexClass[], filebody: string, conn: core.Connection) {
-    const classId = apexclass[0].Id;
-    const deployAction = new Deploy('ApexContainer', 'ApexClassMember', classId, filebody, conn);
+  private async updateApex(apexclass: ApexClass[], filebody: string, metadataXML: string, conn: core.Connection, className: string, mode: string) {
+    let classId = null;
+    if (apexclass ) {
+      classId = apexclass[0].Id;
+    }
+    const deployAction = new Deploy('ApexContainer', 'ApexClassMember', className, classId, filebody, metadataXML, conn);
     const deployResult = await deployAction.deployMetadata() as DeployResult;
     if (deployResult.success) {
-      this.ux.stopSpinner(chalk.bold.greenBright('Apex Class Successfully Updated ✔'));
+      this.ux.stopSpinner(chalk.bold.greenBright('Apex Class Successfully ' + mode + ' ✔'));
     } else {
       if (deployResult.queryResult.records.length > 0 && deployResult.queryResult.records[0].DeployDetails.componentFailures.length > 0) {
         display(deployResult, this.ux);