@pnp/cli-microsoft365 7.0.0-beta.90ef876 → 7.0.0-beta.df9f285

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

@@ -36,29 +36,8 @@ class SpoRoleDefinitionRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeRoleDefinition = () => __awaiter(this, void 0, void 0, function* () {
-                if (this.verbose) {
-                    logger.logToStderr(`Removing role definition from site ${args.options.webUrl}...`);
-                }
-                const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/roledefinitions(${args.options.id})`,
-                    method: 'delete',
-                    headers: {
-                        'X-HTTP-Method': 'DELETE',
-                        'If-Match': '*',
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                try {
-                    yield request_1.default.delete(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.force) {
-                yield removeRoleDefinition();
+                yield this.removeRoleDefinition(logger, args);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -68,11 +47,34 @@ class SpoRoleDefinitionRemoveCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to remove the role definition with id ${args.options.id} from site ${args.options.webUrl}?`
                 });
                 if (result.continue) {
-                    yield removeRoleDefinition();
+                    yield this.removeRoleDefinition(logger, args);
                 }
             }
         });
     }
+    removeRoleDefinition(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Removing role definition from site ${args.options.webUrl}...`);
+            }
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/roledefinitions(${args.options.id})`,
+                method: 'delete',
+                headers: {
+                    'X-HTTP-Method': 'DELETE',
+                    'If-Match': '*',
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _SpoRoleDefinitionRemoveCommand_instances = new WeakSet(), _SpoRoleDefinitionRemoveCommand_initTelemetry = function _SpoRoleDefinitionRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

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-commsite-enable.js

@@ -15,10 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoSiteCommSiteEnableCommand_instances, _SpoSiteCommSiteEnableCommand_initTelemetry, _SpoSiteCommSiteEnableCommand_initOptions, _SpoSiteCommSiteEnableCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const formatting_1 = require("../../../../utils/formatting");
-const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -38,26 +35,20 @@ class SpoSiteCommSiteEnableCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const designPackageId = args.options.designPackageId || '{d604dac3-50d3-405e-9ab9-d4713cda74ef}';
+            const designPackageId = args.options.designPackageId || '96c933ac-3698-44c7-9f4a-5fd17d71af9e';
+            if (this.verbose) {
+                logger.logToStderr(`Enabling communication site at ${args.options.url}...`);
+            }
             try {
-                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
-                if (this.debug) {
-                    logger.logToStderr(`Retrieving request digest...`);
-                }
-                const ctxInfo = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 const requestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    url: `${args.options.url}/_api/sitepages/communicationsite/enable`,
                     headers: {
-                        'X-RequestDigest': ctxInfo.FormDigestValue
+                        'accept': 'application/json;odata=nometadata'
                     },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><Method Name="EnableCommSite" Id="5" ObjectPathId="3"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Guid">${formatting_1.formatting.escapeXml(designPackageId)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                    data: { designPackageId },
+                    responseType: 'json'
                 };
-                const res = yield request_1.default.post(requestOptions);
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    throw response.ErrorInfo.ErrorMessage;
-                }
+                yield request_1.default.post(requestOptions);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);

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/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}...`);
@@ -90,24 +90,21 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand_1.default {
                     url: url,
                     skipRecycleBin: true,
                     wait: true,
-                    force: true,
+                    confirm: true,
                     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-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-set.js

@@ -13,15 +13,19 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoTenantCommandSetSetCommand_instances, _SpoTenantCommandSetSetCommand_initTelemetry, _SpoTenantCommandSetSetCommand_initOptions, _SpoTenantCommandSetSetCommand_initValidators;
+var _SpoTenantCommandSetSetCommand_instances, _SpoTenantCommandSetSetCommand_initTelemetry, _SpoTenantCommandSetSetCommand_initOptions, _SpoTenantCommandSetSetCommand_initValidators, _SpoTenantCommandSetSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
+const os = require("os");
 const urlUtil_1 = require("../../../../utils/urlUtil");
+const Cli_1 = require("../../../../cli/Cli");
+const spoListItemListCommand = require("../listitem/listitem-list");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
+const odata_1 = require("../../../../utils/odata");
 class SpoTenantCommandSetSetCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.TENANT_COMMANDSET_SET;
@@ -35,6 +39,7 @@ class SpoTenantCommandSetSetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoTenantCommandSetSetCommand_instances, "m", _SpoTenantCommandSetSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoTenantCommandSetSetCommand_instances, "m", _SpoTenantCommandSetSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoTenantCommandSetSetCommand_instances, "m", _SpoTenantCommandSetSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTenantCommandSetSetCommand_instances, "m", _SpoTenantCommandSetSetCommand_initOptionSets).call(this);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -43,34 +48,97 @@ class SpoTenantCommandSetSetCommand extends SpoCommand_1.default {
                 if (!appCatalogUrl) {
                     throw 'No app catalog URL found';
                 }
-                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(appCatalogUrl, '/lists/TenantWideExtensions');
-                const listItem = yield this.getListItemById(logger, appCatalogUrl, listServerRelativeUrl, args.options.id);
-                if (listItem.TenantWideExtensionLocation.indexOf("ClientSideExtension.ListViewCommandSet") === -1) {
-                    throw 'The item is not a ListViewCommandSet';
+                if (args.options.newClientSideComponentId !== undefined) {
+                    const componentManifest = yield this.getComponentManifest(appCatalogUrl, args.options.newClientSideComponentId, logger);
+                    const clientComponentManifest = JSON.parse(componentManifest.ClientComponentManifest);
+                    if (clientComponentManifest.extensionType !== "ListViewCommandSet") {
+                        throw `The extension type of this component is not of type 'ListViewCommandSet' 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.';
+                    }
                 }
-                yield this.updateTenantWideExtension(appCatalogUrl, args.options, listServerRelativeUrl, logger);
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(appCatalogUrl, '/lists/TenantWideExtensions');
+                const listItemId = yield this.getListItemId(appCatalogUrl, args.options, listServerRelativeUrl, logger);
+                yield this.updateTenantWideExtension(logger, appCatalogUrl, args.options, listServerRelativeUrl, listItemId);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
             }
         });
     }
-    getListItemById(logger, webUrl, listServerRelativeUrl, id) {
+    getComponentManifest(appCatalogUrl, clientSideComponentId, logger) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Getting the list item by id ${id}`);
+                logger.logToStderr('Retrieving component manifest item from the ComponentManifests list on the app catalog site so that we get the solution id');
             }
-            const reqOptions = {
-                url: `${webUrl}/_api/web/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/Items(${id})`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
+            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'
             };
-            return yield request_1.default.get(reqOptions);
+            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];
         });
     }
-    updateTenantWideExtension(appCatalogUrl, options, listServerRelativeUrl, logger) {
+    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];
+        });
+    }
+    getListItemId(appCatalogUrl, options, listServerRelativeUrl, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { title, id, clientSideComponentId } = options;
+            const filter = title ? `Title eq '${title}'` : id ? `Id eq '${id}'` : `TenantWideExtensionComponentId eq '${clientSideComponentId}'`;
+            if (this.verbose) {
+                logger.logToStderr(`Getting tenant-wide listview commandset: "${title || id || clientSideComponentId}"...`);
+            }
+            const listItemInstances = yield odata_1.odata.getAllItems(`${appCatalogUrl}/_api/web/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/Items?$filter=startswith(TenantWideExtensionLocation, 'ClientSideExtension.ListViewCommandSet') and ${filter}`);
+            if (!listItemInstances || listItemInstances.length === 0) {
+                throw 'The specified listview commandset was not found';
+            }
+            if (listItemInstances.length > 1) {
+                throw `Multiple listview commandsets with ${title ? `title '${title}'` : `ClientSideComponentId '${clientSideComponentId}'`} found. Please disambiguate using IDs: ${os.EOL}${listItemInstances.map(item => `- ${item.Id}`).join(os.EOL)}`;
+            }
+            return listItemInstances[0].Id;
+        });
+    }
+    updateTenantWideExtension(logger, appCatalogUrl, options, listServerRelativeUrl, listItemId) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
                 logger.logToStderr('Updating tenant wide extension to the TenantWideExtensions list');
@@ -82,10 +150,10 @@ class SpoTenantCommandSetSetCommand extends SpoCommand_1.default {
                     FieldValue: options.newTitle
                 });
             }
-            if (options.clientSideComponentId !== undefined) {
+            if (options.newClientSideComponentId !== undefined) {
                 formValues.push({
                     FieldName: 'TenantWideExtensionComponentId',
-                    FieldValue: options.clientSideComponentId
+                    FieldValue: options.newClientSideComponentId
                 });
             }
             if (options.location !== undefined) {
@@ -113,7 +181,7 @@ class SpoTenantCommandSetSetCommand extends SpoCommand_1.default {
                 });
             }
             const requestOptions = {
-                url: `${appCatalogUrl}/_api/web/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/Items(${options.id})/ValidateUpdateListItem()`,
+                url: `${appCatalogUrl}/_api/web/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/Items(${listItemId})/ValidateUpdateListItem()`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
@@ -149,9 +217,12 @@ class SpoTenantCommandSetSetCommand extends SpoCommand_1.default {
 _SpoTenantCommandSetSetCommand_instances = new WeakSet(), _SpoTenantCommandSetSetCommand_initTelemetry = function _SpoTenantCommandSetSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            title: typeof args.options.title !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
             newTitle: typeof args.options.newTitle !== 'undefined',
             listType: args.options.listType,
-            clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
+            newClientSideComponentId: typeof args.options.newClientSideComponentId !== 'undefined',
             clientSideComponentProperties: typeof args.options.clientSideComponentProperties !== 'undefined',
             webTemplate: typeof args.options.webTemplate !== 'undefined',
             location: args.options.location
@@ -159,14 +230,18 @@ _SpoTenantCommandSetSetCommand_instances = new WeakSet(), _SpoTenantCommandSetSe
     });
 }, _SpoTenantCommandSetSetCommand_initOptions = function _SpoTenantCommandSetSetCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-i, --id [id]'
+    }, {
+        option: '-t, --title [title]'
+    }, {
+        option: '-c, --clientSideComponentId [clientSideComponentId]'
     }, {
-        option: '-t, --newTitle [newTitle]'
+        option: '--newTitle [newTitle]'
     }, {
         option: '-l, --listType [listType]',
         autocomplete: SpoTenantCommandSetSetCommand.listTypes
     }, {
-        option: '-c, --clientSideComponentId [clientSideComponentId]'
+        option: '--newClientSideComponentId [newClientSideComponentId]'
     }, {
         option: '-p, --clientSideComponentProperties [clientSideComponentProperties]'
     }, {
@@ -179,15 +254,21 @@ _SpoTenantCommandSetSetCommand_instances = new WeakSet(), _SpoTenantCommandSetSe
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (!args.options.newTitle &&
             !args.options.listType &&
-            !args.options.clientSideComponentId &&
+            !args.options.newClientSideComponentId &&
             !args.options.clientSideComponentProperties &&
             !args.options.webTemplate &&
             !args.options.location) {
             return 'Specify at least one property to update';
         }
+        if (args.options.id && isNaN(parseInt(args.options.id))) {
+            return `${args.options.id} is not a number`;
+        }
         if (args.options.clientSideComponentId && !validation_1.validation.isValidGuid(args.options.clientSideComponentId)) {
             return `${args.options.clientSideComponentId} is not a valid GUID`;
         }
+        if (args.options.newClientSideComponentId && !validation_1.validation.isValidGuid(args.options.newClientSideComponentId)) {
+            return `${args.options.newClientSideComponentId} is not a valid GUID`;
+        }
         if (args.options.listType && SpoTenantCommandSetSetCommand.listTypes.indexOf(args.options.listType) < 0) {
             return `${args.options.listType} is not a valid list type. Allowed values are ${SpoTenantCommandSetSetCommand.listTypes.join(', ')}`;
         }
@@ -196,6 +277,8 @@ _SpoTenantCommandSetSetCommand_instances = new WeakSet(), _SpoTenantCommandSetSe
         }
         return true;
     }));
+}, _SpoTenantCommandSetSetCommand_initOptionSets = function _SpoTenantCommandSetSetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['title', 'id', 'clientSideComponentId'] });
 };
 SpoTenantCommandSetSetCommand.listTypes = ['List', 'Library', 'SitePages'];
 SpoTenantCommandSetSetCommand.locations = ['ContextMenu', 'CommandBar', 'Both'];