sfdx-browserforce-plugin 2.11.3 → 3.0.0

package/lib/plugins/record-types/pages.js

@@ -9,10 +9,7 @@ class RecordTypePage {
         const xpath = `//a[contains(@href, "setup/ui/recordtypedelete.jsp?id=${recordTypeId.slice(0, 15)}")]`;
         await this.page.waitForXPath(xpath);
         const deleteLink = (await this.page.$x(xpath))[0];
-        await Promise.all([
-            this.page.waitForNavigation(),
-            this.page.evaluate((e) => e.click(), deleteLink)
-        ]);
+        await Promise.all([this.page.waitForNavigation(), this.page.evaluate((e) => e.click(), deleteLink)]);
         return new RecordTypeDeletePage(this.page);
     }
 }
@@ -33,10 +30,7 @@ class RecordTypeDeletePage {
     }
     async save() {
         await this.page.waitForSelector(this.saveButton);
-        await Promise.all([
-            this.page.waitForNavigation(),
-            this.page.click(this.saveButton)
-        ]);
+        await Promise.all([this.page.waitForNavigation(), this.page.click(this.saveButton)]);
         await this.throwPageErrors();
     }
     async throwOnMissingSaveButton() {
@@ -46,7 +40,7 @@ class RecordTypeDeletePage {
             if (bodyHandle) {
                 const errorMsg = await this.page.evaluate((div) => div.textContent, bodyHandle);
                 await bodyHandle.dispose();
-                if (errorMsg && errorMsg.trim()) {
+                if (errorMsg?.trim()) {
                     throw new Error(errorMsg.trim());
                 }
             }
@@ -57,7 +51,7 @@ class RecordTypeDeletePage {
         if (errorHandle) {
             const errorMsg = await this.page.evaluate((div) => div.innerText, errorHandle);
             await errorHandle.dispose();
-            if (errorMsg && errorMsg.trim()) {
+            if (errorMsg?.trim()) {
                 throw new Error(errorMsg.trim());
             }
         }

package/lib/plugins/record-types/pages.js.map

@@ -1 +1 @@
-{"version":3,"file":"pages.js","sourceRoot":"","sources":["../../../src/plugins/record-types/pages.ts"],"names":[],"mappings":";;;AAEA,MAAa,cAAc;IAGzB,YAAY,IAAU;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAC5B,YAAoB;QAEpB,MAAM,KAAK,GAAG,yDAAyD,YAAY,CAAC,KAAK,CACvF,CAAC,EACD,EAAE,CACH,KAAK,CAAC;QACP,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QACpC,MAAM,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAClD,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;YAC7B,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,UAAU,CAAC;SACjD,CAAC,CAAC;QACH,OAAO,IAAI,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;CACF;AAtBD,wCAsBC;AAED,MAAa,oBAAoB;IAI/B,YAAY,IAAU;QAFZ,eAAU,GAAG,oBAAoB,CAAC;QAG1C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,eAAwB;QACpC,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;QACtC,MAAM,kBAAkB,GAAG,WAAW,CAAC;QACvC,IAAI,eAAe,EAAE;YACnB,MAAM,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;YACpD,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;SAC1E;QACD,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACjD,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;YAC7B,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC;SACjC,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,wBAAwB;QAC5B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACtD,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;YACnD,IAAI,UAAU,EAAE;gBACd,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CACvC,CAAC,GAAmB,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,EACxC,UAAU,CACX,CAAC;gBACF,MAAM,UAAU,CAAC,OAAO,EAAE,CAAC;gBAC3B,IAAI,QAAQ,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE;oBAC/B,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;iBAClC;aACF;SACF;IACH,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,CACnC,qCAAqC,CACtC,CAAC;QACF,IAAI,WAAW,EAAE;YACf,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CACvC,CAAC,GAAmB,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,EACtC,WAAW,CACZ,CAAC;YACF,MAAM,WAAW,CAAC,OAAO,EAAE,CAAC;YAC5B,IAAI,QAAQ,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE;gBAC/B,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;aAClC;SACF;IACH,CAAC;CACF;AA3DD,oDA2DC"}
+{"version":3,"file":"pages.js","sourceRoot":"","sources":["../../../src/plugins/record-types/pages.ts"],"names":[],"mappings":"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"}

package/lib/plugins/relate-contact-to-multiple-accounts/index.e2e-spec.js

@@ -0,0 +1,34 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const assert_1 = __importDefault(require("assert"));
+const _1 = require(".");
+describe(_1.RelateContactToMultipleAccounts.name, function () {
+    let plugin;
+    before(() => {
+        plugin = new _1.RelateContactToMultipleAccounts(global.bf);
+    });
+    const configEnabled = {
+        enabled: true
+    };
+    const configDisabled = {
+        enabled: false
+    };
+    it('should enable', async () => {
+        await plugin.run(configEnabled);
+    });
+    it('should be enabled', async () => {
+        const res = await plugin.run(configEnabled);
+        assert_1.default.deepStrictEqual(res, { message: 'no action necessary' });
+    });
+    it('should disable', async () => {
+        await plugin.run(configDisabled);
+    });
+    it('should be disabled', async () => {
+        const res = await plugin.run(configDisabled);
+        assert_1.default.deepStrictEqual(res, { message: 'no action necessary' });
+    });
+});
+//# sourceMappingURL=index.e2e-spec.js.map

package/lib/plugins/relate-contact-to-multiple-accounts/index.e2e-spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.e2e-spec.js","sourceRoot":"","sources":["../../../src/plugins/relate-contact-to-multiple-accounts/index.e2e-spec.ts"],"names":[],"mappings":";;;;;AAAA,oDAA4B;AAC5B,wBAAoD;AAEpD,QAAQ,CAAC,kCAA+B,CAAC,IAAI,EAAE;IAC7C,IAAI,MAAM,CAAC;IACX,MAAM,CAAC,GAAG,EAAE;QACV,MAAM,GAAG,IAAI,kCAA+B,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG;QACpB,OAAO,EAAE,IAAI;KACd,CAAC;IACF,MAAM,cAAc,GAAG;QACrB,OAAO,EAAE,KAAK;KACf,CAAC;IAEF,EAAE,CAAC,eAAe,EAAE,KAAK,IAAI,EAAE;QAC7B,MAAM,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,mBAAmB,EAAE,KAAK,IAAI,EAAE;QACjC,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC5C,gBAAM,CAAC,eAAe,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,qBAAqB,EAAE,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;QAC9B,MAAM,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,oBAAoB,EAAE,KAAK,IAAI,EAAE;QAClC,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAC7C,gBAAM,CAAC,eAAe,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,qBAAqB,EAAE,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/lib/plugins/relate-contact-to-multiple-accounts/index.js

@@ -19,10 +19,7 @@ class RelateContactToMultipleAccounts extends plugin_1.BrowserforcePlugin {
         const page = await this.browserforce.openPage(PATHS.BASE);
         // First we have to click the 'Edit' button, to see the checkbox
         await page.waitForSelector(SELECTORS.EDIT_BUTTON);
-        await Promise.all([
-            page.waitForNavigation(),
-            page.click(SELECTORS.EDIT_BUTTON)
-        ]);
+        await Promise.all([page.waitForNavigation(), page.click(SELECTORS.EDIT_BUTTON)]);
         await page.waitForSelector(SELECTORS.ENABLED);
         const response = {
             enabled: await page.$eval(SELECTORS.ENABLED, (el) => el.checked)
@@ -34,10 +31,7 @@ class RelateContactToMultipleAccounts extends plugin_1.BrowserforcePlugin {
         const page = await this.browserforce.openPage(PATHS.BASE);
         // First we have to click the 'Edit' button, to make the checkbox editable
         await page.waitForSelector(SELECTORS.EDIT_BUTTON);
-        await Promise.all([
-            page.waitForNavigation(),
-            page.click(SELECTORS.EDIT_BUTTON)
-        ]);
+        await Promise.all([page.waitForNavigation(), page.click(SELECTORS.EDIT_BUTTON)]);
         // Change the value of the checkbox
         await page.waitForSelector(SELECTORS.ENABLED);
         await page.$eval(SELECTORS.ENABLED, (e, v) => {
@@ -56,10 +50,7 @@ class RelateContactToMultipleAccounts extends plugin_1.BrowserforcePlugin {
         if (await page.$(SELECTORS.CONFIRM_CHECKBOX)) {
             await page.click(SELECTORS.CONFIRM_CHECKBOX);
             await page.waitForSelector(SELECTORS.CONFIRM_BUTTON);
-            await Promise.all([
-                page.waitForNavigation(),
-                page.click(SELECTORS.CONFIRM_BUTTON)
-            ]);
+            await Promise.all([page.waitForNavigation(), page.click(SELECTORS.CONFIRM_BUTTON)]);
         }
         await (0, browserforce_1.throwPageErrors)(page);
         await page.close();

package/lib/plugins/relate-contact-to-multiple-accounts/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/relate-contact-to-multiple-accounts/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/relate-contact-to-multiple-accounts/index.ts"],"names":[],"mappings":"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"}

package/lib/plugins/reports-and-dashboards/folder-sharing/index.e2e-spec.js

@@ -0,0 +1,3 @@
+"use strict";
+// no tests because this setting is only available in old orgs
+//# sourceMappingURL=index.e2e-spec.js.map

package/lib/plugins/reports-and-dashboards/folder-sharing/index.e2e-spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.e2e-spec.js","sourceRoot":"","sources":["../../../../src/plugins/reports-and-dashboards/folder-sharing/index.e2e-spec.ts"],"names":[],"mappings":";AAAA,8DAA8D"}

package/lib/plugins/reports-and-dashboards/folder-sharing/index.js

@@ -47,10 +47,7 @@ class FolderSharing extends plugin_1.BrowserforcePlugin {
             e.checked = v;
         }, config.enableEnhancedFolderSharing);
         await page.waitForSelector(SELECTORS.SAVE_BUTTON);
-        await Promise.all([
-            page.waitForNavigation(),
-            page.click(SELECTORS.SAVE_BUTTON)
-        ]);
+        await Promise.all([page.waitForNavigation(), page.click(SELECTORS.SAVE_BUTTON)]);
         await page.close();
     }
 }

package/lib/plugins/reports-and-dashboards/folder-sharing/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/reports-and-dashboards/folder-sharing/index.ts"],"names":[],"mappings":";;;AACA,4CAAqD;AAErD,MAAM,KAAK,GAAG;IACZ,IAAI,EAAE,uCAAuC;CAC9C,CAAC;AACF,MAAM,SAAS,GAAG;IAChB,IAAI,EAAE,YAAY;IAClB,eAAe,EAAE,eAAe;IAChC,WAAW,EAAE,wBAAwB;CACtC,CAAC;AAMF,MAAa,aAAc,SAAQ,2BAAkB;IAC5C,KAAK,CAAC,QAAQ,CAAC,UAAmB;QACvC,MAAM,QAAQ,GAAG;YACf,2BAA2B,EAAE,IAAI;SAClC,CAAC;QACF,IAAI,IAAU,CAAC;QACf,IAAI;YACF,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACpD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,4BAA4B,CACtE,IAAI,EACJ,SAAS,CAAC,IAAI,CACf,CAAC;YACF,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;YACnE,IAAI,WAAW,EAAE;gBACf,QAAQ,CAAC,2BAA2B,GAAG,MAAM,WAAW,CAAC,KAAK,CAC5D,SAAS,CAAC,eAAe,EACzB,CAAC,EAAoB,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,CACrC,CAAC;aACH;iBAAM;gBACL,kBAAkB;gBAClB,QAAQ,CAAC,2BAA2B,GAAG,IAAI,CAAC;aAC7C;SACF;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,EAAE;gBAC9C,OAAO,QAAQ,CAAC;aACjB;YACD,MAAM,CAAC,CAAC;SACT;QACD,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,MAAc;QAC/B,IAAI,MAAM,CAAC,2BAA2B,KAAK,KAAK,EAAE;YAChD,MAAM,IAAI,KAAK,CACb,+DAA+D,CAChE,CAAC;SACH;QACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1D,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QACtD,MAAM,IAAI,CAAC,KAAK,CACd,SAAS,CAAC,eAAe,EACzB,CAAC,CAAmB,EAAE,CAAU,EAAE,EAAE;YAClC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC;QAChB,CAAC,EACD,MAAM,CAAC,2BAA2B,CACnC,CAAC;QACF,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAClD,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,IAAI,CAAC,iBAAiB,EAAE;YACxB,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC;SAClC,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;CACF;AAtDD,sCAsDC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/reports-and-dashboards/folder-sharing/index.ts"],"names":[],"mappings":";;;AACA,4CAAqD;AAErD,MAAM,KAAK,GAAG;IACZ,IAAI,EAAE,uCAAuC;CAC9C,CAAC;AACF,MAAM,SAAS,GAAG;IAChB,IAAI,EAAE,YAAY;IAClB,eAAe,EAAE,eAAe;IAChC,WAAW,EAAE,wBAAwB;CACtC,CAAC;AAMF,MAAa,aAAc,SAAQ,2BAAkB;IAC5C,KAAK,CAAC,QAAQ,CAAC,UAAmB;QACvC,MAAM,QAAQ,GAAG;YACf,2BAA2B,EAAE,IAAI;SAClC,CAAC;QACF,IAAI,IAAU,CAAC;QACf,IAAI;YACF,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACpD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,4BAA4B,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;YAC/F,MAAM,WAAW,GAAG,MAAM,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;YACnE,IAAI,WAAW,EAAE;gBACf,QAAQ,CAAC,2BAA2B,GAAG,MAAM,WAAW,CAAC,KAAK,CAC5D,SAAS,CAAC,eAAe,EACzB,CAAC,EAAoB,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,CACrC,CAAC;aACH;iBAAM;gBACL,kBAAkB;gBAClB,QAAQ,CAAC,2BAA2B,GAAG,IAAI,CAAC;aAC7C;SACF;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,EAAE;gBAC9C,OAAO,QAAQ,CAAC;aACjB;YACD,MAAM,CAAC,CAAC;SACT;QACD,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,MAAc;QAC/B,IAAI,MAAM,CAAC,2BAA2B,KAAK,KAAK,EAAE;YAChD,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;SAClF;QACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1D,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QACtD,MAAM,IAAI,CAAC,KAAK,CACd,SAAS,CAAC,eAAe,EACzB,CAAC,CAAmB,EAAE,CAAU,EAAE,EAAE;YAClC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC;QAChB,CAAC,EACD,MAAM,CAAC,2BAA2B,CACnC,CAAC;QACF,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;QAClD,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QACjF,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;CACF;AA9CD,sCA8CC"}

package/lib/plugins/reports-and-dashboards/index.e2e-spec.js

@@ -0,0 +1,3 @@
+"use strict";
+// no tests because the folder sharing setting is only available in old orgs
+//# sourceMappingURL=index.e2e-spec.js.map

package/lib/plugins/reports-and-dashboards/index.e2e-spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.e2e-spec.js","sourceRoot":"","sources":["../../../src/plugins/reports-and-dashboards/index.e2e-spec.ts"],"names":[],"mappings":";AAAA,4EAA4E"}

package/lib/plugins/reports-and-dashboards/index.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReportsAndDashboards = void 0;
 const plugin_1 = require("../../plugin");
-const utils_1 = require("../utils");
 const folder_sharing_1 = require("./folder-sharing");
 class ReportsAndDashboards extends plugin_1.BrowserforcePlugin {
     async retrieve(definition) {
@@ -16,11 +15,12 @@ class ReportsAndDashboards extends plugin_1.BrowserforcePlugin {
         return response;
     }
     diff(state, definition) {
-        const pluginFolderSharing = new folder_sharing_1.FolderSharing(null);
-        const response = {
-            folderSharing: pluginFolderSharing.diff(state.folderSharing, definition.folderSharing)
-        };
-        return (0, utils_1.removeEmptyValues)(response);
+        const response = {};
+        const folderSharing = new folder_sharing_1.FolderSharing(this.browserforce).diff(state.folderSharing, definition.folderSharing);
+        if (folderSharing !== undefined) {
+            response.folderSharing = folderSharing;
+        }
+        return Object.keys(response).length ? response : undefined;
     }
     async apply(plan) {
         if (plan.folderSharing) {

package/lib/plugins/reports-and-dashboards/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/reports-and-dashboards/index.ts"],"names":[],"mappings":";;;AAAA,yCAAkD;AAClD,oCAA6C;AAC7C,qDAAgF;AAMhF,MAAa,oBAAqB,SAAQ,2BAAkB;IACnD,KAAK,CAAC,QAAQ,CAAC,UAAmB;QACvC,MAAM,QAAQ,GAAW,EAAE,CAAC;QAC5B,IAAI,UAAU,EAAE;YACd,IAAI,UAAU,CAAC,aAAa,EAAE;gBAC5B,MAAM,mBAAmB,GAAG,IAAI,8BAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBACjE,QAAQ,CAAC,aAAa,GAAG,MAAM,mBAAmB,CAAC,QAAQ,CACzD,UAAU,CAAC,aAAa,CACzB,CAAC;aACH;SACF;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,IAAI,CAAC,KAAa,EAAE,UAAkB;QAC3C,MAAM,mBAAmB,GAAG,IAAI,8BAAa,CAAC,IAAI,CAAC,CAAC;QACpD,MAAM,QAAQ,GAAG;YACf,aAAa,EAAE,mBAAmB,CAAC,IAAI,CACrC,KAAK,CAAC,aAAa,EACnB,UAAU,CAAC,aAAa,CACzB;SACF,CAAC;QACF,OAAO,IAAA,yBAAiB,EAAC,QAAQ,CAAC,CAAC;IACrC,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,IAAY;QAC7B,IAAI,IAAI,CAAC,aAAa,EAAE;YACtB,MAAM,mBAAmB,GAAG,IAAI,8BAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACjE,MAAM,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SACrD;IACH,CAAC;CACF;AA/BD,oDA+BC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/reports-and-dashboards/index.ts"],"names":[],"mappings":";;;AAAA,yCAAkD;AAClD,qDAAgF;AAMhF,MAAa,oBAAqB,SAAQ,2BAAkB;IACnD,KAAK,CAAC,QAAQ,CAAC,UAAmB;QACvC,MAAM,QAAQ,GAAW,EAAE,CAAC;QAC5B,IAAI,UAAU,EAAE;YACd,IAAI,UAAU,CAAC,aAAa,EAAE;gBAC5B,MAAM,mBAAmB,GAAG,IAAI,8BAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBACjE,QAAQ,CAAC,aAAa,GAAG,MAAM,mBAAmB,CAAC,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;aACvF;SACF;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,IAAI,CAAC,KAAa,EAAE,UAAkB;QAC3C,MAAM,QAAQ,GAAW,EAAE,CAAC;QAC5B,MAAM,aAAa,GAAG,IAAI,8BAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,UAAU,CAAC,aAAa,CAEhG,CAAC;QACd,IAAI,aAAa,KAAK,SAAS,EAAE;YAC/B,QAAQ,CAAC,aAAa,GAAG,aAAa,CAAC;SACxC;QACD,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7D,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,IAAY;QAC7B,IAAI,IAAI,CAAC,aAAa,EAAE;YACtB,MAAM,mBAAmB,GAAG,IAAI,8BAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACjE,MAAM,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SACrD;IACH,CAAC;CACF;AA7BD,oDA6BC"}

package/lib/plugins/salesforce-to-salesforce/index.e2e-spec.js

@@ -0,0 +1,39 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const assert_1 = __importDefault(require("assert"));
+const _1 = require(".");
+describe(_1.SalesforceToSalesforce.name, function () {
+    let plugin;
+    before(() => {
+        plugin = new _1.SalesforceToSalesforce(global.bf);
+    });
+    const configEnabled = {
+        enabled: true
+    };
+    const configDisabled = {
+        enabled: false
+    };
+    it('should enable', async () => {
+        await plugin.run(configEnabled);
+    });
+    it('should be enabled', async () => {
+        const state = await plugin.retrieve();
+        assert_1.default.deepStrictEqual(state, configEnabled);
+    });
+    it('should fail to disable', async () => {
+        let err;
+        try {
+            await plugin.apply(configDisabled);
+        }
+        catch (e) {
+            err = e;
+        }
+        assert_1.default.throws(() => {
+            throw err;
+        }, /cannot be disabled/);
+    });
+});
+//# sourceMappingURL=index.e2e-spec.js.map

package/lib/plugins/salesforce-to-salesforce/index.e2e-spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.e2e-spec.js","sourceRoot":"","sources":["../../../src/plugins/salesforce-to-salesforce/index.e2e-spec.ts"],"names":[],"mappings":";;;;;AAAA,oDAA4B;AAC5B,wBAA2C;AAE3C,QAAQ,CAAC,yBAAsB,CAAC,IAAI,EAAE;IACpC,IAAI,MAAM,CAAC;IACX,MAAM,CAAC,GAAG,EAAE;QACV,MAAM,GAAG,IAAI,yBAAsB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG;QACpB,OAAO,EAAE,IAAI;KACd,CAAC;IACF,MAAM,cAAc,GAAG;QACrB,OAAO,EAAE,KAAK;KACf,CAAC;IAEF,EAAE,CAAC,eAAe,EAAE,KAAK,IAAI,EAAE;QAC7B,MAAM,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,mBAAmB,EAAE,KAAK,IAAI,EAAE;QACjC,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;QACtC,gBAAM,CAAC,eAAe,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,wBAAwB,EAAE,KAAK,IAAI,EAAE;QACtC,IAAI,GAAG,CAAC;QACR,IAAI;YACF,MAAM,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;SACpC;QAAC,OAAO,CAAC,EAAE;YACV,GAAG,GAAG,CAAC,CAAC;SACT;QACD,gBAAM,CAAC,MAAM,CAAC,GAAG,EAAE;YACjB,MAAM,GAAG,CAAC;QACZ,CAAC,EAAE,oBAAoB,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/lib/plugins/salesforce-to-salesforce/index.js

@@ -39,10 +39,7 @@ class SalesforceToSalesforce extends plugin_1.BrowserforcePlugin {
             await page.$eval(SELECTORS.ENABLED, (e, v) => {
                 e.checked = v;
             }, config.enabled);
-            await Promise.all([
-                page.waitForNavigation(),
-                page.click(SELECTORS.SAVE_BUTTON)
-            ]);
+            await Promise.all([page.waitForNavigation(), page.click(SELECTORS.SAVE_BUTTON)]);
             const result = await this.retrieve();
             await page.close();
             if (result.enabled !== config.enabled) {

package/lib/plugins/salesforce-to-salesforce/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/salesforce-to-salesforce/index.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA6B;AAC7B,yCAAkD;AAElD,MAAM,KAAK,GAAG;IACZ,IAAI,EAAE,mCAAmC;CAC1C,CAAC;AACF,MAAM,SAAS,GAAG;IAChB,OAAO,EAAE,WAAW;IACpB,IAAI,EAAE,kBAAkB;IACxB,WAAW,EAAE,oBAAoB;CAClC,CAAC;AAMF,MAAa,sBAAuB,SAAQ,2BAAkB;IACrD,KAAK,CAAC,QAAQ;QACnB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1D,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,QAAQ,GAAG;YACf,OAAO,EAAE,IAAI;SACd,CAAC;QACF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACpD,IAAI,WAAW,EAAE;YACf,QAAQ,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CACjC,SAAS,CAAC,OAAO,EACjB,CAAC,EAAoB,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,CACrC,CAAC;SACH;QACD,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,MAAc;QAC/B,IAAI,MAAM,CAAC,OAAO,KAAK,KAAK,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;SAC9D;QACD,kFAAkF;QAClF,MAAM,IAAA,iBAAM,EAAC,KAAK,IAAI,EAAE;YACtB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC1D,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YAC9C,MAAM,IAAI,CAAC,KAAK,CACd,SAAS,CAAC,OAAO,EACjB,CAAC,CAAmB,EAAE,CAAU,EAAE,EAAE;gBAClC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC;YAChB,CAAC,EACD,MAAM,CAAC,OAAO,CACf,CAAC;YACF,MAAM,OAAO,CAAC,GAAG,CAAC;gBAChB,IAAI,CAAC,iBAAiB,EAAE;gBACxB,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC;aAClC,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;YACrC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACnB,IAAI,MAAM,CAAC,OAAO,KAAK,MAAM,CAAC,OAAO,EAAE;gBACrC,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;aACxD;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA5CD,wDA4CC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/salesforce-to-salesforce/index.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA6B;AAC7B,yCAAkD;AAElD,MAAM,KAAK,GAAG;IACZ,IAAI,EAAE,mCAAmC;CAC1C,CAAC;AACF,MAAM,SAAS,GAAG;IAChB,OAAO,EAAE,WAAW;IACpB,IAAI,EAAE,kBAAkB;IACxB,WAAW,EAAE,oBAAoB;CAClC,CAAC;AAMF,MAAa,sBAAuB,SAAQ,2BAAkB;IACrD,KAAK,CAAC,QAAQ;QACnB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1D,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAC3C,MAAM,QAAQ,GAAG;YACf,OAAO,EAAE,IAAI;SACd,CAAC;QACF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACpD,IAAI,WAAW,EAAE;YACf,QAAQ,CAAC,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,EAAoB,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;SAC9F;QACD,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,MAAc;QAC/B,IAAI,MAAM,CAAC,OAAO,KAAK,KAAK,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;SAC9D;QACD,kFAAkF;QAClF,MAAM,IAAA,iBAAM,EAAC,KAAK,IAAI,EAAE;YACtB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC1D,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YAC9C,MAAM,IAAI,CAAC,KAAK,CACd,SAAS,CAAC,OAAO,EACjB,CAAC,CAAmB,EAAE,CAAU,EAAE,EAAE;gBAClC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC;YAChB,CAAC,EACD,MAAM,CAAC,OAAO,CACf,CAAC;YACF,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YACjF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;YACrC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACnB,IAAI,MAAM,CAAC,OAAO,KAAK,MAAM,CAAC,OAAO,EAAE;gBACrC,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;aACxD;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAtCD,wDAsCC"}

package/lib/plugins/security/certificate-and-key-management/index.js

@@ -25,11 +25,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CertificateAndKeyManagement = void 0;
 const fs_1 = require("fs");
-const jsonMergePatch = __importStar(require("json-merge-patch"));
 const path = __importStar(require("path"));
 const queryString = __importStar(require("querystring"));
 const plugin_1 = require("../../../plugin");
-const utils_1 = require("../../utils");
 const PATHS = {
     CERT_PREFIX: '0P1',
     KEYSTORE_IMPORT: '_ui/security/certificate/KeyStoreImportUi/e'
@@ -46,18 +44,15 @@ class CertificateAndKeyManagement extends plugin_1.BrowserforcePlugin {
             importFromKeystore: []
         };
         let existingCertificates;
-        if (definition?.certificates?.length ||
-            definition?.importFromKeystore?.length) {
-            existingCertificates = await this.org
-                .getConnection()
-                .tooling.query(`SELECT Id, DeveloperName, MasterLabel, OptionsIsPrivateKeyExportable, KeySize FROM Certificate`, { scanAll: false }
+        if (definition?.certificates?.length || definition?.importFromKeystore?.length) {
+            existingCertificates = await this.org.getConnection().tooling.query(`SELECT Id, DeveloperName, MasterLabel, OptionsIsPrivateKeyExportable, KeySize FROM Certificate`, { scanAll: false }
             // BUG in jsforce: query acts with scanAll:true and returns deleted CustomObjects.
             // It cannot be disabled.
             );
         }
         if (definition?.certificates?.length) {
             for (const cert of definition.certificates) {
-                const existingCert = existingCertificates.records.find(co => co.DeveloperName === cert.name);
+                const existingCert = existingCertificates.records.find((co) => co.DeveloperName === cert.name);
                 if (existingCert) {
                     response.certificates.push({
                         _id: existingCert.Id,
@@ -71,11 +66,10 @@ class CertificateAndKeyManagement extends plugin_1.BrowserforcePlugin {
         }
         if (definition?.importFromKeystore?.length) {
             for (const cert of definition.importFromKeystore) {
-                const existingCert = existingCertificates.records.find(co => co.DeveloperName === cert.name);
+                const existingCert = existingCertificates.records.find((co) => co.DeveloperName === cert.name);
                 if (existingCert) {
                     response.importFromKeystore.push({
-                        name: existingCert.DeveloperName,
-                        filePath: null
+                        name: existingCert.DeveloperName
                     });
                 }
             }
@@ -83,29 +77,30 @@ class CertificateAndKeyManagement extends plugin_1.BrowserforcePlugin {
         return response;
     }
     diff(state, definition) {
-        const response = {
-            certificates: [],
-            importFromKeystore: []
-        };
+        const response = {};
         if (state && definition && state.certificates && definition.certificates) {
             for (const cert of definition.certificates) {
-                const existingCert = state.certificates.find(c => c.name === cert.name);
+                const existingCert = state.certificates.find((c) => c.name === cert.name);
                 if (existingCert) {
-                    // move id from state to definition to be retained and used
+                    // copy id from state to definition to be retained and used
                     cert._id = existingCert._id;
-                    delete existingCert._id;
                 }
-                const certDiff = (0, utils_1.semanticallyCleanObject)((0, utils_1.removeNullValues)(jsonMergePatch.generate(existingCert, cert)), '_id');
-                if (certDiff) {
+                const certDiff = super.diff(existingCert, cert);
+                if (certDiff !== undefined) {
+                    if (!response.certificates) {
+                        response.certificates = [];
+                    }
                     response.certificates.push(certDiff);
                 }
             }
         }
         if (definition?.importFromKeystore?.length) {
-            response.importFromKeystore =
-                definition?.importFromKeystore?.filter(cert => !state.importFromKeystore.find(c => c.name === cert.name)) || [];
+            const importFromKeystore = definition?.importFromKeystore?.filter((cert) => !state?.importFromKeystore?.find((c) => c.name === cert.name));
+            if (importFromKeystore.length) {
+                response.importFromKeystore = importFromKeystore;
+            }
         }
-        return (0, utils_1.removeEmptyValues)(response);
+        return Object.keys(response).length ? response : undefined;
     }
     async apply(plan) {
         if (plan.certificates) {
@@ -127,10 +122,7 @@ class CertificateAndKeyManagement extends plugin_1.BrowserforcePlugin {
                     }
                     const page = await this.browserforce.openPage(`${PATHS.CERT_PREFIX}/e?${queryString.stringify(urlAttributes)}`);
                     await page.waitForSelector(SELECTORS.SAVE_BUTTON);
-                    await Promise.all([
-                        page.waitForNavigation(),
-                        page.click(SELECTORS.SAVE_BUTTON)
-                    ]);
+                    await Promise.all([page.waitForNavigation(), page.click(SELECTORS.SAVE_BUTTON)]);
                     await page.close();
                 }
             }
@@ -139,8 +131,11 @@ class CertificateAndKeyManagement extends plugin_1.BrowserforcePlugin {
             for (const certificate of plan.importFromKeystore) {
                 const page = await this.browserforce.openPage(`${PATHS.KEYSTORE_IMPORT}`);
                 await page.waitForSelector(SELECTORS.FILE_UPLOAD);
-                const elementHandle = await page.$(SELECTORS.FILE_UPLOAD);
+                const elementHandle = (await page.$(SELECTORS.FILE_UPLOAD));
                 // TODO: make relative to this.command.flags.definitionfile
+                if (!certificate.filePath) {
+                    throw new Error(`To import a certificate, the filePath is mandatory.`);
+                }
                 const filePath = path.resolve(certificate.filePath);
                 if (!(0, fs_1.existsSync)(filePath)) {
                     throw new Error(`file does not exist: ${filePath}`);
@@ -151,10 +146,7 @@ class CertificateAndKeyManagement extends plugin_1.BrowserforcePlugin {
                     await page.type(SELECTORS.KEYSTORE_PASSWORD, certificate.password);
                 }
                 await page.waitForSelector(SELECTORS.SAVE_BUTTON);
-                await Promise.all([
-                    page.waitForNavigation(),
-                    page.click(SELECTORS.SAVE_BUTTON)
-                ]);
+                await Promise.all([page.waitForNavigation(), page.click(SELECTORS.SAVE_BUTTON)]);
                 if (certificate.name) {
                     // rename cert as it has the wrong name
                     //  JKS aliases are case-insensitive (and so lowercase)
@@ -164,10 +156,7 @@ class CertificateAndKeyManagement extends plugin_1.BrowserforcePlugin {
                     const importedCert = certsResponse.records[0];
                     const certPage = await this.browserforce.openPage(`${importedCert.Id}/e?MasterLabel=${certificate.name}&DeveloperName=${certificate.name}`);
                     await certPage.waitForSelector(SELECTORS.SAVE_BUTTON);
-                    await Promise.all([
-                        certPage.waitForNavigation(),
-                        certPage.click(SELECTORS.SAVE_BUTTON)
-                    ]);
+                    await Promise.all([certPage.waitForNavigation(), certPage.click(SELECTORS.SAVE_BUTTON)]);
                     await certPage.close();
                 }
                 await page.close();

package/lib/plugins/security/certificate-and-key-management/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/security/certificate-and-key-management/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/security/certificate-and-key-management/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2BAAgC;AAEhC,2CAA6B;AAE7B,yDAA2C;AAC3C,4CAAqD;AAErD,MAAM,KAAK,GAAG;IACZ,WAAW,EAAE,KAAK;IAClB,eAAe,EAAE,6CAA6C;CAC/D,CAAC;AACF,MAAM,SAAS,GAAG;IAChB,WAAW,EAAE,oBAAoB;IACjC,iBAAiB,EAAE,gBAAgB;IACnC,WAAW,EAAE,oBAAoB;CAClC,CAAC;AA4BF,MAAa,2BAA4B,SAAQ,2BAAkB;IAC1D,KAAK,CAAC,QAAQ,CAAC,UAAkB;QACtC,MAAM,QAAQ,GAAW;YACvB,YAAY,EAAE,EAAE;YAChB,kBAAkB,EAAE,EAAE;SACvB,CAAC;QACF,IAAI,oBAAoB,CAAC;QACzB,IAAI,UAAU,EAAE,YAAY,EAAE,MAAM,IAAI,UAAU,EAAE,kBAAkB,EAAE,MAAM,EAAE;YAC9E,oBAAoB,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,KAAK,CACjE,gGAAgG,EAChG,EAAE,OAAO,EAAE,KAAK,EAAE;YAClB,kFAAkF;YAClF,yBAAyB;aAC1B,CAAC;SACH;QACD,IAAI,UAAU,EAAE,YAAY,EAAE,MAAM,EAAE;YACpC,KAAK,MAAM,IAAI,IAAI,UAAU,CAAC,YAAY,EAAE;gBAC1C,MAAM,YAAY,GAAG,oBAAoB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,aAAa,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC/F,IAAI,YAAY,EAAE;oBAChB,QAAQ,CAAC,YAAa,CAAC,IAAI,CAAC;wBAC1B,GAAG,EAAE,YAAY,CAAC,EAAE;wBACpB,IAAI,EAAE,YAAY,CAAC,aAAa;wBAChC,KAAK,EAAE,YAAY,CAAC,WAAW;wBAC/B,UAAU,EAAE,YAAY,CAAC,6BAA6B;wBACtD,OAAO,EAAE,YAAY,CAAC,OAAO;qBAC9B,CAAC,CAAC;iBACJ;aACF;SACF;QACD,IAAI,UAAU,EAAE,kBAAkB,EAAE,MAAM,EAAE;YAC1C,KAAK,MAAM,IAAI,IAAI,UAAU,CAAC,kBAAkB,EAAE;gBAChD,MAAM,YAAY,GAAG,oBAAoB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,aAAa,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC/F,IAAI,YAAY,EAAE;oBAChB,QAAQ,CAAC,kBAAmB,CAAC,IAAI,CAAC;wBAChC,IAAI,EAAE,YAAY,CAAC,aAAa;qBACjC,CAAC,CAAC;iBACJ;aACF;SACF;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,IAAI,CAAC,KAAc,EAAE,UAAmB;QAC7C,MAAM,QAAQ,GAAW,EAAE,CAAC;QAC5B,IAAI,KAAK,IAAI,UAAU,IAAI,KAAK,CAAC,YAAY,IAAI,UAAU,CAAC,YAAY,EAAE;YACxE,KAAK,MAAM,IAAI,IAAI,UAAU,CAAC,YAAY,EAAE;gBAC1C,MAAM,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC1E,IAAI,YAAY,EAAE;oBAChB,2DAA2D;oBAC3D,IAAI,CAAC,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC;iBAC7B;gBACD,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAA4B,CAAC;gBAC3E,IAAI,QAAQ,KAAK,SAAS,EAAE;oBAC1B,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE;wBAC1B,QAAQ,CAAC,YAAY,GAAG,EAAE,CAAC;qBAC5B;oBACD,QAAQ,CAAC,YAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;iBACvC;aACF;SACF;QACD,IAAI,UAAU,EAAE,kBAAkB,EAAE,MAAM,EAAE;YAC1C,MAAM,kBAAkB,GAAG,UAAU,EAAE,kBAAkB,EAAE,MAAM,CAC/D,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,kBAAkB,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,CACxE,CAAC;YACF,IAAI,kBAAkB,CAAC,MAAM,EAAE;gBAC7B,QAAQ,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;aAClD;SACF;QACD,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7D,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,IAAY;QAC7B,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,YAAY,EAAE;gBAC3C,IAAI,WAAW,CAAC,GAAG,EAAE;oBACnB,SAAS;iBACV;qBAAM;oBACL,aAAa;oBACb,MAAM,aAAa,GAAG;wBACpB,aAAa,EAAE,WAAW,CAAC,IAAI;wBAC/B,WAAW,EAAE,WAAW,CAAC,KAAK;qBAC/B,CAAC;oBACF,IAAI,WAAW,CAAC,OAAO,EAAE;wBACvB,aAAa,CAAC,SAAS,CAAC,GAAG,WAAW,CAAC,OAAO,CAAC;qBAChD;oBACD,IAAI,WAAW,CAAC,UAAU,KAAK,SAAS,EAAE;wBACxC,aAAa,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;qBACvD;oBACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAC3C,GAAG,KAAK,CAAC,WAAW,MAAM,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,CACjE,CAAC;oBACF,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;oBAClD,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;oBACjF,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;iBACpB;aACF;SACF;QACD,IAAI,IAAI,CAAC,kBAAkB,EAAE;YAC3B,KAAK,MAAM,WAAW,IAAI,IAAI,CAAC,kBAAkB,EAAE;gBACjD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,eAAe,EAAE,CAAC,CAAC;gBAC1E,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;gBAClD,MAAM,aAAa,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,CAAoC,CAAC;gBAC/F,2DAA2D;gBAC3D,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE;oBACzB,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;iBACxE;gBACD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;gBACpD,IAAI,CAAC,IAAA,eAAU,EAAC,QAAQ,CAAC,EAAE;oBACzB,MAAM,IAAI,KAAK,CAAC,wBAAwB,QAAQ,EAAE,CAAC,CAAC;iBACrD;gBACD,MAAM,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;gBACzC,IAAI,WAAW,CAAC,QAAQ,EAAE;oBACxB,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;oBACxD,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;iBACpE;gBACD,MAAM,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;gBAClD,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBACjF,IAAI,WAAW,CAAC,IAAI,EAAE;oBACpB,uCAAuC;oBACvC,uDAAuD;oBACvD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,GAAG;yBACjC,aAAa,EAAE;yBACf,OAAO,CAAC,KAAK,CACZ,qDAAqD,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CACvF,CAAC;oBACJ,MAAM,YAAY,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;oBAC9C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAC/C,GAAG,YAAY,CAAC,EAAE,kBAAkB,WAAW,CAAC,IAAI,kBAAkB,WAAW,CAAC,IAAI,EAAE,CACzF,CAAC;oBACF,MAAM,QAAQ,CAAC,eAAe,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;oBACtD,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,iBAAiB,EAAE,EAAE,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;oBACzF,MAAM,QAAQ,CAAC,KAAK,EAAE,CAAC;iBACxB;gBACD,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;aACpB;SACF;IACH,CAAC;CACF;AAzID,kEAyIC"}

package/lib/plugins/security/certificate-and-key-management/index.test.js

@@ -0,0 +1,66 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const assert_1 = __importDefault(require("assert"));
+const _1 = require(".");
+const tests = [
+    {
+        description: 'should not do anything if keystore already exists',
+        source: {
+            importFromKeystore: [
+                {
+                    name: 'Dummy'
+                }
+            ]
+        },
+        target: {
+            importFromKeystore: [
+                {
+                    name: 'Dummy',
+                    filePath: 'foo.jks'
+                }
+            ]
+        },
+        expected: undefined
+    },
+    {
+        description: 'should try to import keystore',
+        source: {
+            importFromKeystore: [
+                {
+                    name: 'Foo'
+                }
+            ]
+        },
+        target: {
+            importFromKeystore: [
+                {
+                    name: 'Dummy',
+                    filePath: 'foo.jks'
+                }
+            ]
+        },
+        expected: {
+            importFromKeystore: [
+                {
+                    name: 'Dummy',
+                    filePath: 'foo.jks'
+                }
+            ]
+        }
+    }
+];
+describe('CertificateAndKeyManagement', () => {
+    describe('diff()', () => {
+        const p = new _1.CertificateAndKeyManagement(global.bf);
+        for (const t of tests) {
+            it(t.description, () => {
+                const actual = p.diff(t.source, t.target);
+                assert_1.default.deepStrictEqual(actual, t.expected);
+            });
+        }
+    });
+});
+//# sourceMappingURL=index.test.js.map

package/lib/plugins/security/certificate-and-key-management/index.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../../src/plugins/security/certificate-and-key-management/index.test.ts"],"names":[],"mappings":";;;;;AAAA,oDAA4B;AAC5B,wBAAwD;AASxD,MAAM,KAAK,GAAQ;IACjB;QACE,WAAW,EAAE,mDAAmD;QAChE,MAAM,EAAE;YACN,kBAAkB,EAAE;gBAClB;oBACE,IAAI,EAAE,OAAO;iBACd;aACF;SACF;QACD,MAAM,EAAE;YACN,kBAAkB,EAAE;gBAClB;oBACE,IAAI,EAAE,OAAO;oBACb,QAAQ,EAAE,SAAS;iBACpB;aACF;SACF;QACD,QAAQ,EAAE,SAAS;KACpB;IACD;QACE,WAAW,EAAE,+BAA+B;QAC5C,MAAM,EAAE;YACN,kBAAkB,EAAE;gBAClB;oBACE,IAAI,EAAE,KAAK;iBACZ;aACF;SACF;QACD,MAAM,EAAE;YACN,kBAAkB,EAAE;gBAClB;oBACE,IAAI,EAAE,OAAO;oBACb,QAAQ,EAAE,SAAS;iBACpB;aACF;SACF;QACD,QAAQ,EAAE;YACR,kBAAkB,EAAE;gBAClB;oBACE,IAAI,EAAE,OAAO;oBACb,QAAQ,EAAE,SAAS;iBACpB;aACF;SACF;KACF;CACF,CAAC;AAEF,QAAQ,CAAC,6BAA6B,EAAE,GAAG,EAAE;IAC3C,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;QACtB,MAAM,CAAC,GAAG,IAAI,8BAA2B,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACrD,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;YACrB,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,EAAE;gBACrB,MAAM,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;gBAC1C,gBAAM,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC;YAC7C,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/lib/plugins/security/identity-provider/index.js

@@ -24,10 +24,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IdentityProvider = void 0;
-const jsonMergePatch = __importStar(require("json-merge-patch"));
 const p_retry_1 = __importStar(require("p-retry"));
 const plugin_1 = require("../../../plugin");
-const utils_1 = require("../../utils");
 const PATHS = {
     EDIT_VIEW: 'setup/secur/idp/IdpPage.apexp'
 };
@@ -39,25 +37,24 @@ const SELECTORS = {
     SAVE_BUTTON: 'input[name$=":save"]'
 };
 class IdentityProvider extends plugin_1.BrowserforcePlugin {
-    async retrieve(definition) {
+    async retrieve() {
         const page = await this.browserforce.openPage(PATHS.EDIT_VIEW);
         await page.waitForSelector(SELECTORS.EDIT_BUTTON);
         const disableButton = await page.$(SELECTORS.DISABLE_BUTTON);
-        const certNameHandle = await page.$(SELECTORS.CERT_NAME_SPAN);
+        const enabled = disableButton !== null;
         const response = {
-            enabled: disableButton !== null
+            enabled
         };
-        if (certNameHandle) {
-            response['certificate'] = await page.evaluate((span) => span.innerText, certNameHandle);
+        if (enabled) {
+            const certNameHandle = await page.$(SELECTORS.CERT_NAME_SPAN);
+            response.certificate = await page.evaluate((span) => span.innerText, certNameHandle);
         }
         await page.close();
         return response;
     }
-    diff(state, definition) {
-        return (0, utils_1.removeNullValues)(jsonMergePatch.generate(state, definition));
-    }
     async apply(plan) {
         if (plan.enabled && plan.certificate && plan.certificate !== '') {
+            // enable with required certificate
             // wait for cert to become available in Identity Provider UI
             await (0, p_retry_1.default)(async () => {
                 const certsResponse = await this.org
@@ -68,20 +65,17 @@ class IdentityProvider extends plugin_1.BrowserforcePlugin {
                 }
                 const page = await this.browserforce.openPage(PATHS.EDIT_VIEW);
                 await page.waitForSelector(SELECTORS.EDIT_BUTTON);
-                await Promise.all([
-                    page.waitForNavigation(),
-                    page.click(SELECTORS.EDIT_BUTTON)
-                ]);
+                await Promise.all([page.waitForNavigation(), page.click(SELECTORS.EDIT_BUTTON)]);
                 await page.waitForSelector(SELECTORS.CHOOSE_CERT);
                 const chooseCertOptions = await page.$$eval(`${SELECTORS.CHOOSE_CERT} option`, (options) => {
-                    return options.map(option => {
+                    return options.map((option) => {
                         return {
                             text: option.text,
                             value: option.value
                         };
                     });
                 });
-                const chooseCertOption = chooseCertOptions.find(x => x.text === plan.certificate);
+                const chooseCertOption = chooseCertOptions.find((x) => x.text === plan.certificate);
                 if (!chooseCertOption) {
                     throw new Error(`Waiting for Certificate '${plan.certificate}' to be available in Identity Provider picklist timed out`);
                 }
@@ -90,10 +84,7 @@ class IdentityProvider extends plugin_1.BrowserforcePlugin {
                     await dialog.accept();
                 });
                 await page.waitForSelector(SELECTORS.SAVE_BUTTON);
-                await Promise.all([
-                    page.waitForNavigation(),
-                    page.click(SELECTORS.SAVE_BUTTON)
-                ]);
+                await Promise.all([page.waitForNavigation(), page.click(SELECTORS.SAVE_BUTTON)]);
                 await page.close();
             }, {
                 retries: 5,
@@ -101,16 +92,14 @@ class IdentityProvider extends plugin_1.BrowserforcePlugin {
             });
         }
         else {
+            // disable
             const page = await this.browserforce.openPage(PATHS.EDIT_VIEW);
             await page.waitForSelector(SELECTORS.EDIT_BUTTON);
             await page.$(SELECTORS.DISABLE_BUTTON);
             page.on('dialog', async (dialog) => {
                 await dialog.accept();
             });
-            await Promise.all([
-                page.waitForNavigation(),
-                page.click(SELECTORS.DISABLE_BUTTON)
-            ]);
+            await Promise.all([page.waitForNavigation(), page.click(SELECTORS.DISABLE_BUTTON)]);
             await page.close();
         }
     }