@pnp/cli-microsoft365 7.0.0-beta.31d0077 → 7.0.0-beta.4bb805e

package/dist/m365/spo/commands/site/site-apppermission-add.js

@@ -47,10 +47,10 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
         }
         let endpoint = "";
         if (args.options.appId) {
-            endpoint = `${this.resource}/v1.0/myorganization/applications?$filter=appId eq '${formatting_1.formatting.encodeQueryParameter(args.options.appId)}'`;
+            endpoint = `${this.resource}/v1.0/myorganization/servicePrincipals?$select=appId,displayName&$filter=appId eq '${formatting_1.formatting.encodeQueryParameter(args.options.appId)}'`;
         }
         else {
-            endpoint = `${this.resource}/v1.0/myorganization/applications?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.appDisplayName)}'`;
+            endpoint = `${this.resource}/v1.0/myorganization/servicePrincipals?$select=appId,displayName&$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.appDisplayName)}'`;
         }
         const appRequestOptions = {
             url: endpoint,
@@ -168,7 +168,7 @@ _SpoSiteAppPermissionAddCommand_instances = new WeakSet(), _SpoSiteAppPermission
         return validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }));
 }, _SpoSiteAppPermissionAddCommand_initOptionSets = function _SpoSiteAppPermissionAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'appDisplayName'] });
+    this.optionSets.push({ options: ['appId', 'appDisplayName'], runsWhen: (args) => !args.options.appId && !args.options.appDisplayName });
 };
 module.exports = new SpoSiteAppPermissionAddCommand();
 //# sourceMappingURL=site-apppermission-add.js.map

package/dist/m365/spo/commands/site/site-apppermission-remove.js

@@ -99,7 +99,7 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeSiteAppPermission();
             }
             else {
@@ -122,7 +122,7 @@ _SpoSiteAppPermissionRemoveCommand_instances = new WeakSet(), _SpoSiteAppPermiss
             appId: typeof args.options.appId !== 'undefined',
             appDisplayName: typeof args.options.appDisplayName !== 'undefined',
             id: typeof args.options.id !== 'undefined',
-            confirm: (!!args.options.confirm).toString()
+            force: (!!args.options.force).toString()
         });
     });
 }, _SpoSiteAppPermissionRemoveCommand_initOptions = function _SpoSiteAppPermissionRemoveCommand_initOptions() {
@@ -135,7 +135,7 @@ _SpoSiteAppPermissionRemoveCommand_instances = new WeakSet(), _SpoSiteAppPermiss
     }, {
         option: '-n, --appDisplayName [appDisplayName]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoSiteAppPermissionRemoveCommand_initValidators = function _SpoSiteAppPermissionRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/site/site-hubsite-disconnect.js

@@ -57,7 +57,7 @@ class SpoSiteHubSiteDisconnectCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield disconnectHubSite();
             }
             else {
@@ -77,14 +77,14 @@ class SpoSiteHubSiteDisconnectCommand extends SpoCommand_1.default {
 _SpoSiteHubSiteDisconnectCommand_instances = new WeakSet(), _SpoSiteHubSiteDisconnectCommand_initTelemetry = function _SpoSiteHubSiteDisconnectCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: args.options.confirm || false
+            force: args.options.force || false
         });
     });
 }, _SpoSiteHubSiteDisconnectCommand_initOptions = function _SpoSiteHubSiteDisconnectCommand_initOptions() {
     this.options.unshift({
         option: '-u, --siteUrl <siteUrl>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoSiteHubSiteDisconnectCommand_initValidators = function _SpoSiteHubSiteDisconnectCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.siteUrl); }));

package/dist/m365/spo/commands/site/site-list.js

@@ -131,7 +131,7 @@ _SpoSiteListCommand_instances = new WeakSet(), _SpoSiteListCommand_initTelemetry
     }, {
         option: '--webTemplate [webTemplate]'
     }, {
-        option: '-f, --filter [filter]'
+        option: '--filter [filter]'
     }, {
         option: '--includeOneDriveSites'
     }, {

package/dist/m365/spo/commands/site/site-recyclebinitem-clear.js

@@ -36,7 +36,7 @@ class SpoSiteRecycleBinItemClearCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.clearRecycleBin(args, logger);
             }
             else {
@@ -91,7 +91,7 @@ _SpoSiteRecycleBinItemClearCommand_instances = new WeakSet(), _SpoSiteRecycleBin
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             secondary: !!args.options.secondary,
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoSiteRecycleBinItemClearCommand_initOptions = function _SpoSiteRecycleBinItemClearCommand_initOptions() {
@@ -100,7 +100,7 @@ _SpoSiteRecycleBinItemClearCommand_instances = new WeakSet(), _SpoSiteRecycleBin
     }, {
         option: '--secondary'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoSiteRecycleBinItemClearCommand_initValidators = function _SpoSiteRecycleBinItemClearCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/site/site-recyclebinitem-move.js

@@ -37,7 +37,7 @@ class SpoSiteRecycleBinItemMoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.moveRecycleBinItem(args, logger);
             }
             else {
@@ -88,7 +88,7 @@ _SpoSiteRecycleBinItemMoveCommand_instances = new WeakSet(), _SpoSiteRecycleBinI
         Object.assign(this.telemetryProperties, {
             ids: typeof args.options.ids !== 'undefined',
             all: !!args.options.all,
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoSiteRecycleBinItemMoveCommand_initOptions = function _SpoSiteRecycleBinItemMoveCommand_initOptions() {
@@ -99,7 +99,7 @@ _SpoSiteRecycleBinItemMoveCommand_instances = new WeakSet(), _SpoSiteRecycleBinI
     }, {
         option: '--all'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoSiteRecycleBinItemMoveCommand_initOptionSets = function _SpoSiteRecycleBinItemMoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['ids', 'all'] });

package/dist/m365/spo/commands/site/site-recyclebinitem-remove.js

@@ -36,7 +36,7 @@ class SpoSiteRecycleBinItemRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.removeRecycleBinItem(args, logger);
             }
             else {
@@ -79,7 +79,7 @@ class SpoSiteRecycleBinItemRemoveCommand extends SpoCommand_1.default {
 _SpoSiteRecycleBinItemRemoveCommand_instances = new WeakSet(), _SpoSiteRecycleBinItemRemoveCommand_initTelemetry = function _SpoSiteRecycleBinItemRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoSiteRecycleBinItemRemoveCommand_initOptions = function _SpoSiteRecycleBinItemRemoveCommand_initOptions() {
@@ -88,7 +88,7 @@ _SpoSiteRecycleBinItemRemoveCommand_instances = new WeakSet(), _SpoSiteRecycleBi
     }, {
         option: '-i, --ids <ids>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoSiteRecycleBinItemRemoveCommand_initValidators = function _SpoSiteRecycleBinItemRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/site/site-remove.js

@@ -91,7 +91,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                     this.handleRejectedPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeSite();
             }
             else {
@@ -306,7 +306,7 @@ _SpoSiteRemoveCommand_instances = new WeakSet(), _SpoSiteRemoveCommand_initTelem
             skipRecycleBin: (!(!args.options.skipRecycleBin)).toString(),
             fromRecycleBin: (!(!args.options.fromRecycleBin)).toString(),
             wait: args.options.wait,
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoSiteRemoveCommand_initOptions = function _SpoSiteRemoveCommand_initOptions() {
@@ -319,7 +319,7 @@ _SpoSiteRemoveCommand_instances = new WeakSet(), _SpoSiteRemoveCommand_initTelem
     }, {
         option: '--wait'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoSiteRemoveCommand_initValidators = function _SpoSiteRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));

package/dist/m365/spo/commands/site/site-set.js

@@ -311,7 +311,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
     }
     updateSiteProperties(logger, args) {
         const isGroupConnectedSite = this.isGroupConnectedSite();
-        const sharedProperties = ['classification', 'disableFlows', 'shareByEmailEnabled', 'sharingCapability', 'noScriptSite'];
+        const sharedProperties = ['classification', 'disableFlows', 'socialBarOnSitePagesDisabled', 'shareByEmailEnabled', 'sharingCapability', 'noScriptSite'];
         const siteProperties = ['title', 'resourceQuota', 'resourceQuotaWarningLevel', 'storageQuota', 'storageQuotaWarningLevel', 'allowSelfServiceUpgrade'];
         let properties = sharedProperties;
         properties = properties;
@@ -363,6 +363,9 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
             if (typeof args.options.disableFlows !== 'undefined') {
                 payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="DisableFlows"><Parameter Type="Boolean">${args.options.disableFlows}</Parameter></SetProperty>`);
             }
+            if (typeof args.options.socialBarOnSitePagesDisabled !== 'undefined') {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="SocialBarOnSitePagesDisabled"><Parameter Type="Boolean">${args.options.socialBarOnSitePagesDisabled}</Parameter></SetProperty>`);
+            }
             if (typeof args.options.shareByEmailEnabled !== 'undefined') {
                 payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="ShareByEmailEnabled"><Parameter Type="Boolean">${args.options.shareByEmailEnabled}</Parameter></SetProperty>`);
             }
@@ -442,6 +445,7 @@ _SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry =
         Object.assign(this.telemetryProperties, {
             classification: typeof args.options.classification === 'string',
             disableFlows: args.options.disableFlows,
+            socialBarOnSitePagesDisabled: args.options.socialBarOnSitePagesDisabled,
             isPublic: args.options.isPublic,
             owners: typeof args.options.owners !== 'undefined',
             shareByEmailEnabled: args.options.shareByEmailEnabled,
@@ -470,6 +474,9 @@ _SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry =
     }, {
         option: '--disableFlows [disableFlows]',
         autocomplete: ['true', 'false']
+    }, {
+        option: '--socialBarOnSitePagesDisabled [socialBarOnSitePagesDisabled]',
+        autocomplete: ['true', 'false']
     }, {
         option: '--isPublic [isPublic]',
         autocomplete: ['true', 'false']
@@ -517,6 +524,7 @@ _SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry =
         }
         if (typeof args.options.classification === 'undefined' &&
             typeof args.options.disableFlows === 'undefined' &&
+            typeof args.options.socialBarOnSitePagesDisabled === 'undefined' &&
             typeof args.options.title === 'undefined' &&
             typeof args.options.description === 'undefined' &&
             typeof args.options.isPublic === 'undefined' &&
@@ -580,7 +588,7 @@ _SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry =
     }));
 }, _SpoSiteSetCommand_initTypes = function _SpoSiteSetCommand_initTypes() {
     this.types.string.push('classification');
-    this.types.boolean.push('isPublic', 'disableFlows', 'shareByEmailEnabled', 'allowSelfServiceUpgrade', 'noScriptSite');
+    this.types.boolean.push('isPublic', 'disableFlows', 'socialBarOnSitePagesDisabled', 'shareByEmailEnabled', 'allowSelfServiceUpgrade', 'noScriptSite');
 };
 module.exports = new SpoSiteSetCommand();
 //# sourceMappingURL=site-set.js.map

package/dist/m365/spo/commands/sitedesign/sitedesign-remove.js

@@ -57,7 +57,7 @@ class SpoSiteDesignRemoveCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeSiteDesign();
             }
             else {
@@ -77,14 +77,14 @@ class SpoSiteDesignRemoveCommand extends SpoCommand_1.default {
 _SpoSiteDesignRemoveCommand_instances = new WeakSet(), _SpoSiteDesignRemoveCommand_initTelemetry = function _SpoSiteDesignRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: args.options.confirm || false
+            force: args.options.force || false
         });
     });
 }, _SpoSiteDesignRemoveCommand_initOptions = function _SpoSiteDesignRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoSiteDesignRemoveCommand_initValidators = function _SpoSiteDesignRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/sitedesign/sitedesign-rights-revoke.js

@@ -60,7 +60,7 @@ class SpoSiteDesignRightsRevokeCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield revokePermissions();
             }
             else {
@@ -80,7 +80,7 @@ class SpoSiteDesignRightsRevokeCommand extends SpoCommand_1.default {
 _SpoSiteDesignRightsRevokeCommand_instances = new WeakSet(), _SpoSiteDesignRightsRevokeCommand_initTelemetry = function _SpoSiteDesignRightsRevokeCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: args.options.confirm || false
+            force: args.options.force || false
         });
     });
 }, _SpoSiteDesignRightsRevokeCommand_initOptions = function _SpoSiteDesignRightsRevokeCommand_initOptions() {
@@ -89,7 +89,7 @@ _SpoSiteDesignRightsRevokeCommand_instances = new WeakSet(), _SpoSiteDesignRight
     }, {
         option: '-p, --principals <principals>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoSiteDesignRightsRevokeCommand_initValidators = function _SpoSiteDesignRightsRevokeCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/sitedesign/sitedesign-task-remove.js

@@ -37,7 +37,7 @@ class SpoSiteDesignTaskRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.removeSiteDesignTask(logger, args.options.id);
             }
             else {
@@ -78,14 +78,14 @@ class SpoSiteDesignTaskRemoveCommand extends SpoCommand_1.default {
 _SpoSiteDesignTaskRemoveCommand_instances = new WeakSet(), _SpoSiteDesignTaskRemoveCommand_initTelemetry = function _SpoSiteDesignTaskRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: args.options.confirm || false
+            force: args.options.force || false
         });
     });
 }, _SpoSiteDesignTaskRemoveCommand_initOptions = function _SpoSiteDesignTaskRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoSiteDesignTaskRemoveCommand_initValidators = function _SpoSiteDesignTaskRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/sitescript/sitescript-remove.js

@@ -37,7 +37,7 @@ class SpoSiteScriptRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.removeSiteScript(logger, args.options.id);
             }
             else {
@@ -79,14 +79,14 @@ class SpoSiteScriptRemoveCommand extends SpoCommand_1.default {
 _SpoSiteScriptRemoveCommand_instances = new WeakSet(), _SpoSiteScriptRemoveCommand_initTelemetry = function _SpoSiteScriptRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: args.options.confirm || false
+            force: args.options.force || false
         });
     });
 }, _SpoSiteScriptRemoveCommand_initOptions = function _SpoSiteScriptRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoSiteScriptRemoveCommand_initValidators = function _SpoSiteScriptRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/storageentity/storageentity-remove.js

@@ -39,7 +39,7 @@ class SpoStorageEntityRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.removeTenantProperty(logger, args);
             }
             else {
@@ -86,7 +86,7 @@ class SpoStorageEntityRemoveCommand extends SpoCommand_1.default {
 _SpoStorageEntityRemoveCommand_instances = new WeakSet(), _SpoStorageEntityRemoveCommand_initTelemetry = function _SpoStorageEntityRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoStorageEntityRemoveCommand_initOptions = function _SpoStorageEntityRemoveCommand_initOptions() {
@@ -95,7 +95,7 @@ _SpoStorageEntityRemoveCommand_instances = new WeakSet(), _SpoStorageEntityRemov
     }, {
         option: '-k, --key <key>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoStorageEntityRemoveCommand_initValidators = function _SpoStorageEntityRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl); }));

package/dist/m365/spo/commands/tenant/tenant-appcatalog-add.js

@@ -62,7 +62,8 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand_1.default {
         });
     }
     ensureNoExistingSite(url, force, logger) {
-        return new Promise((resolve, reject) => {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
                 logger.logToStderr(`Checking if site ${url} exists...`);
             }
@@ -74,14 +75,13 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand_1.default {
                     _: []
                 }
             };
-            Cli_1.Cli
-                .executeCommandWithOutput(spoSiteGetCommand, siteGetOptions)
-                .then(() => {
+            try {
+                yield Cli_1.Cli.executeCommandWithOutput(spoSiteGetCommand, siteGetOptions);
                 if (this.verbose) {
                     logger.logToStderr(`Found site ${url}`);
                 }
                 if (!force) {
-                    return reject(new Command_1.CommandError(`Another site exists at ${url}`));
+                    throw new Command_1.CommandError(`Another site exists at ${url}`);
                 }
                 if (this.verbose) {
                     logger.logToStderr(`Deleting site ${url}...`);
@@ -94,20 +94,17 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand_1.default {
                     verbose: this.verbose,
                     debug: this.debug
                 };
-                Cli_1.Cli
-                    .executeCommand(spoSiteRemoveCommand, { options: Object.assign(Object.assign({}, siteRemoveOptions), { _: [] }) })
-                    .then(() => resolve(), (err) => reject(err));
-            }, (err) => {
-                if (err.error.message !== 'File Not Found.' && err.error.message !== '404 FILE NOT FOUND') {
-                    // some other error occurred
-                    return reject(err.error);
+                yield Cli_1.Cli.executeCommand(spoSiteRemoveCommand, { options: Object.assign(Object.assign({}, siteRemoveOptions), { _: [] }) });
+            }
+            catch (err) {
+                if (((_a = err.error) === null || _a === void 0 ? void 0 : _a.message) !== 'File not Found' && ((_b = err.error) === null || _b === void 0 ? void 0 : _b.message) !== '404 FILE NOT FOUND') {
+                    throw err.error || err;
                 }
                 if (this.verbose) {
                     logger.logToStderr(`No site found at ${url}`);
                 }
-                // site not found. continue
-                resolve();
-            });
+                // Site not found. Continue
+            }
         });
     }
     createAppCatalog(options, logger) {

package/dist/m365/spo/commands/tenant/tenant-applicationcustomizer-remove.js

@@ -42,7 +42,7 @@ class SpoTenantApplicationCustomizerRemoveCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                if (args.options.confirm) {
+                if (args.options.force) {
                     return yield this.removeTenantApplicationCustomizer(logger, args);
                 }
                 const result = yield Cli_1.Cli.prompt({
@@ -117,7 +117,7 @@ _SpoTenantApplicationCustomizerRemoveCommand_instances = new WeakSet(), _SpoTena
             title: typeof args.options.title !== 'undefined',
             id: typeof args.options.id !== 'undefined',
             clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoTenantApplicationCustomizerRemoveCommand_initOptions = function _SpoTenantApplicationCustomizerRemoveCommand_initOptions() {
@@ -128,7 +128,7 @@ _SpoTenantApplicationCustomizerRemoveCommand_instances = new WeakSet(), _SpoTena
     }, {
         option: '-c, --clientSideComponentId  [clientSideComponentId]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoTenantApplicationCustomizerRemoveCommand_initValidators = function _SpoTenantApplicationCustomizerRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/tenant/tenant-applicationcustomizer-set.js

@@ -23,6 +23,8 @@ const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const os = require("os");
+const Cli_1 = require("../../../../cli/Cli");
+const spoListItemListCommand = require("../listitem/listitem-list");
 const request_1 = require("../../../../request");
 class SpoTenantApplicationCustomizerSetCommand extends SpoCommand_1.default {
     get name() {
@@ -46,6 +48,20 @@ class SpoTenantApplicationCustomizerSetCommand extends SpoCommand_1.default {
                 if (!appCatalogUrl) {
                     throw 'No app catalog URL found';
                 }
+                if (args.options.newClientSideComponentId !== undefined) {
+                    const componentManifest = yield this.getComponentManifest(appCatalogUrl, args.options.newClientSideComponentId, logger);
+                    const clientComponentManifest = JSON.parse(componentManifest.ClientComponentManifest);
+                    if (clientComponentManifest.extensionType !== "ApplicationCustomizer") {
+                        throw `The extension type of this component is not of type 'ApplicationCustomizer' but of type '${clientComponentManifest.extensionType}'`;
+                    }
+                    const solution = yield this.getSolutionFromAppCatalog(appCatalogUrl, componentManifest.SolutionId, logger);
+                    if (!solution.ContainsTenantWideExtension) {
+                        throw `The solution does not contain an extension that can be deployed to all sites. Make sure that you've entered the correct component Id.`;
+                    }
+                    else if (!solution.SkipFeatureDeployment) {
+                        throw 'The solution has not been deployed to all sites. Make sure to deploy this solution to all sites.';
+                    }
+                }
                 const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(appCatalogUrl, '/lists/TenantWideExtensions');
                 const listItemId = yield this.getListItemId(appCatalogUrl, args.options, listServerRelativeUrl, logger);
                 yield this.updateTenantWideExtension(appCatalogUrl, args.options, listServerRelativeUrl, listItemId, logger);
@@ -72,9 +88,59 @@ class SpoTenantApplicationCustomizerSetCommand extends SpoCommand_1.default {
             return listItemInstances[0].Id;
         });
     }
+    getComponentManifest(appCatalogUrl, clientSideComponentId, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr('Retrieving component manifest item from the ComponentManifests list on the app catalog site so that we get the solution id');
+            }
+            const camlQuery = `<View><ViewFields><FieldRef Name='ClientComponentId'></FieldRef><FieldRef Name='SolutionId'></FieldRef><FieldRef Name='ClientComponentManifest'></FieldRef></ViewFields><Query><Where><Eq><FieldRef Name='ClientComponentId' /><Value Type='Guid'>${clientSideComponentId}</Value></Eq></Where></Query></View>`;
+            const commandOptions = {
+                webUrl: appCatalogUrl,
+                listUrl: `${urlUtil_1.urlUtil.getServerRelativeSiteUrl(appCatalogUrl)}/Lists/ComponentManifests`,
+                camlQuery: camlQuery,
+                verbose: this.verbose,
+                debug: this.debug,
+                output: 'json'
+            };
+            const output = yield Cli_1.Cli.executeCommandWithOutput(spoListItemListCommand, { options: Object.assign(Object.assign({}, commandOptions), { _: [] }) });
+            if (this.verbose) {
+                logger.logToStderr(output.stderr);
+            }
+            const outputParsed = JSON.parse(output.stdout);
+            if (outputParsed.length === 0) {
+                throw 'No component found with the specified clientSideComponentId found in the component manifest list. Make sure that the application is added to the application catalog';
+            }
+            return outputParsed[0];
+        });
+    }
+    getSolutionFromAppCatalog(appCatalogUrl, solutionId, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving solution with id ${solutionId} from the application catalog`);
+            }
+            const camlQuery = `<View><ViewFields><FieldRef Name='SkipFeatureDeployment'></FieldRef><FieldRef Name='ContainsTenantWideExtension'></FieldRef></ViewFields><Query><Where><Eq><FieldRef Name='AppProductID' /><Value Type='Guid'>${solutionId}</Value></Eq></Where></Query></View>`;
+            const commandOptions = {
+                webUrl: appCatalogUrl,
+                listUrl: `${urlUtil_1.urlUtil.getServerRelativeSiteUrl(appCatalogUrl)}/AppCatalog`,
+                camlQuery: camlQuery,
+                verbose: this.verbose,
+                debug: this.debug,
+                output: 'json'
+            };
+            const output = yield Cli_1.Cli.executeCommandWithOutput(spoListItemListCommand, { options: Object.assign(Object.assign({}, commandOptions), { _: [] }) });
+            if (this.verbose) {
+                logger.logToStderr(output.stderr);
+            }
+            const outputParsed = JSON.parse(output.stdout);
+            if (outputParsed.length === 0) {
+                throw `No component found with the solution id ${solutionId}. Make sure that the solution is available in the app catalog`;
+            }
+            return outputParsed[0];
+        });
+    }
     updateTenantWideExtension(appCatalogUrl, options, listServerRelativeUrl, itemId, logger) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { title, id, clientSideComponentId, newTitle, clientSideComponentProperties, webTemplate } = options;
+            const { title, id, clientSideComponentId, newTitle, newClientSideComponentId, clientSideComponentProperties, webTemplate } = options;
             if (this.verbose) {
                 logger.logToStderr(`Updating tenant-wide application customizer: "${title || id || clientSideComponentId}"...`);
             }
@@ -85,6 +151,12 @@ class SpoTenantApplicationCustomizerSetCommand extends SpoCommand_1.default {
                     FieldValue: newTitle
                 });
             }
+            if (newClientSideComponentId !== undefined) {
+                formValues.push({
+                    FieldName: 'TenantWideExtensionComponentId',
+                    FieldValue: newClientSideComponentId
+                });
+            }
             if (clientSideComponentProperties !== undefined) {
                 formValues.push({
                     FieldName: 'TenantWideExtensionComponentProperties',
@@ -118,6 +190,7 @@ _SpoTenantApplicationCustomizerSetCommand_instances = new WeakSet(), _SpoTenantA
             id: typeof args.options.id !== 'undefined',
             clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
             newTitle: typeof args.options.newTitle !== 'undefined',
+            newClientSideComponentId: typeof args.options.newClientSideComponentId !== 'undefined',
             clientSideComponentProperties: typeof args.options.clientSideComponentProperties !== 'undefined',
             webTemplate: typeof args.options.webTemplate !== 'undefined'
         });
@@ -131,6 +204,8 @@ _SpoTenantApplicationCustomizerSetCommand_instances = new WeakSet(), _SpoTenantA
         option: '-c, --clientSideComponentId  [clientSideComponentId]'
     }, {
         option: '--newTitle [newTitle]'
+    }, {
+        option: '--newClientSideComponentId [newClientSideComponentId]'
     }, {
         option: '-p, --clientSideComponentProperties [clientSideComponentProperties]'
     }, {
@@ -144,7 +219,10 @@ _SpoTenantApplicationCustomizerSetCommand_instances = new WeakSet(), _SpoTenantA
         if (args.options.clientSideComponentId && !validation_1.validation.isValidGuid(args.options.clientSideComponentId)) {
             return `${args.options.clientSideComponentId} is not a valid GUID`;
         }
-        if (!args.options.newTitle && !args.options.clientSideComponentProperties && !args.options.webTemplate) {
+        if (args.options.newClientSideComponentId && !validation_1.validation.isValidGuid(args.options.newClientSideComponentId)) {
+            return `${args.options.newClientSideComponentId} is not a valid GUID`;
+        }
+        if (!args.options.newTitle && !args.options.newClientSideComponentId && !args.options.clientSideComponentProperties && !args.options.webTemplate) {
             return `Please specify an option to be updated`;
         }
         return true;

package/dist/m365/spo/commands/tenant/tenant-commandset-remove.js

@@ -42,7 +42,7 @@ class SpoTenantCommandSetRemoveCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                if (args.options.confirm) {
+                if (args.options.force) {
                     return yield this.removeTenantCommandSet(logger, args);
                 }
                 const result = yield Cli_1.Cli.prompt({
@@ -118,7 +118,7 @@ _SpoTenantCommandSetRemoveCommand_instances = new WeakSet(), _SpoTenantCommandSe
             title: typeof args.options.title !== 'undefined',
             id: typeof args.options.id !== 'undefined',
             clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoTenantCommandSetRemoveCommand_initOptions = function _SpoTenantCommandSetRemoveCommand_initOptions() {
@@ -129,7 +129,7 @@ _SpoTenantCommandSetRemoveCommand_instances = new WeakSet(), _SpoTenantCommandSe
     }, {
         option: '-c, --clientSideComponentId  [clientSideComponentId]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoTenantCommandSetRemoveCommand_initValidators = function _SpoTenantCommandSetRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {