@pnp/cli-microsoft365 7.0.0-beta.7e7b4f8 → 7.0.0-beta.934602e

package/dist/m365/pp/commands/solution/solution-publish.js

@@ -41,7 +41,7 @@ class PpSolutionPublishCommand extends PowerPlatformCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const solutionId = yield this.getSolutionId(args, logger);
                 const solutionComponents = yield this.getSolutionComponents(dynamicsApiUrl, solutionId, logger);
                 const parameterXml = this.buildXmlRequestObject(solutionComponents, logger);
@@ -95,7 +95,7 @@ class PpSolutionPublishCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving solutionId`);
             }
             const options = {
-                environment: args.options.environment,
+                environmentName: args.options.environmentName,
                 name: args.options.name,
                 output: 'json',
                 debug: this.debug,
@@ -132,7 +132,7 @@ _PpSolutionPublishCommand_instances = new WeakSet(), _PpSolutionPublishCommand_i
     });
 }, _PpSolutionPublishCommand_initOptions = function _PpSolutionPublishCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {

package/dist/m365/pp/commands/solution/solution-publisher-add.js

@@ -39,7 +39,7 @@ class PpSolutionPublisherAddCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Adding new publisher '${args.options.name}'...`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.0/publishers`,
                     headers: {
@@ -69,7 +69,7 @@ _PpSolutionPublisherAddCommand_instances = new WeakSet(), _PpSolutionPublisherAd
     });
 }, _PpSolutionPublisherAddCommand_initOptions = function _PpSolutionPublisherAddCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-n, --name <name>'
     }, {

package/dist/m365/pp/commands/solution/solution-publisher-get.js

@@ -56,7 +56,7 @@ class PpSolutionPublisherGetCommand extends PowerPlatformCommand_1.default {
                 responseType: 'json'
             };
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 if (args.options.id) {
                     requestOptions.url = `${dynamicsApiUrl}/api/data/v9.0/publishers(${args.options.id})?$select=publisherid,uniquename,friendlyname,versionnumber,isreadonly,description,customizationprefix,customizationoptionvalueprefix&api-version=9.1`;
                     const result = yield request_1.default.get(requestOptions);
@@ -85,7 +85,7 @@ _PpSolutionPublisherGetCommand_instances = new WeakSet(), _PpSolutionPublisherGe
     });
 }, _PpSolutionPublisherGetCommand_initOptions = function _PpSolutionPublisherGetCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {

package/dist/m365/pp/commands/solution/solution-publisher-list.js

@@ -41,7 +41,7 @@ class PpSolutionPublisherListCommand extends PowerPlatformCommand_1.default {
                 logger.logToStderr(`Retrieving list of publishers...`);
             }
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.0/publishers?$select=publisherid,uniquename,friendlyname,versionnumber,isreadonly,description,customizationprefix,customizationoptionvalueprefix${!args.options.includeMicrosoftPublishers ? `&$filter=publisherid ne 'd21aab70-79e7-11dd-8874-00188b01e34f'` : ''}&api-version=9.1`,
                     headers: {
@@ -67,7 +67,7 @@ _PpSolutionPublisherListCommand_instances = new WeakSet(), _PpSolutionPublisherL
     });
 }, _PpSolutionPublisherListCommand_initOptions = function _PpSolutionPublisherListCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--includeMicrosoftPublishers'
     }, {

package/dist/m365/pp/commands/solution/solution-publisher-remove.js

@@ -64,7 +64,7 @@ class PpSolutionPublisherRemoveCommand extends PowerPlatformCommand_1.default {
                 return args.options.id;
             }
             const options = {
-                environment: args.options.environment,
+                environmentName: args.options.environmentName,
                 name: args.options.name,
                 output: 'json',
                 debug: this.debug,
@@ -78,7 +78,7 @@ class PpSolutionPublisherRemoveCommand extends PowerPlatformCommand_1.default {
     deletePublisher(args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const publisherId = yield this.getPublisherId(args);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.1/publishers(${publisherId})`,
@@ -106,7 +106,7 @@ _PpSolutionPublisherRemoveCommand_instances = new WeakSet(), _PpSolutionPublishe
     });
 }, _PpSolutionPublisherRemoveCommand_initOptions = function _PpSolutionPublisherRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {

package/dist/m365/pp/commands/solution/solution-remove.js

@@ -64,7 +64,7 @@ class PpSolutionRemoveCommand extends PowerPlatformCommand_1.default {
                 return args.options.id;
             }
             const options = {
-                environment: args.options.environment,
+                environmentName: args.options.environmentName,
                 name: args.options.name,
                 output: 'json',
                 debug: this.debug,
@@ -78,7 +78,7 @@ class PpSolutionRemoveCommand extends PowerPlatformCommand_1.default {
     deleteSolution(args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+                const dynamicsApiUrl = yield powerPlatform_1.powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
                 const solutionId = yield this.getSolutionId(args);
                 const requestOptions = {
                     url: `${dynamicsApiUrl}/api/data/v9.1/solutions(${solutionId})`,
@@ -106,7 +106,7 @@ _PpSolutionRemoveCommand_instances = new WeakSet(), _PpSolutionRemoveCommand_ini
     });
 }, _PpSolutionRemoveCommand_initOptions = function _PpSolutionRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-i, --id [id]'
     }, {

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

@@ -78,9 +78,6 @@ class SpoListAddCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.schemaXml) {
-                this.warn(logger, `Option 'schemaXml' is deprecated.`);
-            }
             if (this.verbose) {
                 logger.logToStderr(`Creating list in site at ${args.options.webUrl}...`);
             }
@@ -114,9 +111,6 @@ class SpoListAddCommand extends SpoCommand_1.default {
         if (options.templateFeatureId) {
             requestBody.TemplateFeatureId = options.templateFeatureId;
         }
-        if (options.schemaXml) {
-            requestBody.SchemaXml = options.schemaXml.replace('\\', '\\\\').replace('"', '\\"');
-        }
         if (options.allowDeletion !== undefined) {
             requestBody.AllowDeletion = options.allowDeletion;
         }
@@ -302,7 +296,6 @@ _SpoListAddCommand_instances = new WeakSet(), _SpoListAddCommand_initTelemetry =
             'baseTemplate',
             'description',
             'templateFeatureId',
-            'schemaXml',
             'defaultContentApprovalWorkflowId',
             'defaultDisplayFormUrl',
             'defaultEditFormUrl',
@@ -354,8 +347,6 @@ _SpoListAddCommand_instances = new WeakSet(), _SpoListAddCommand_initTelemetry =
         option: '--description [description]'
     }, {
         option: '--templateFeatureId [templateFeatureId]'
-    }, {
-        option: '--schemaXml [schemaXml]'
     }, {
         option: '--allowDeletion [allowDeletion]',
         autocomplete: ['true', 'false']

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

@@ -67,9 +67,6 @@ class SpoListSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.schemaXml) {
-                this.warn(logger, `Option 'schemaXml' is deprecated.`);
-            }
             if (this.verbose) {
                 logger.logToStderr(`Updating list in site at ${args.options.webUrl}...`);
             }
@@ -116,9 +113,6 @@ class SpoListSetCommand extends SpoCommand_1.default {
         if (options.templateFeatureId) {
             requestBody.TemplateFeatureId = options.templateFeatureId;
         }
-        if (options.schemaXml) {
-            requestBody.SchemaXml = options.schemaXml.replace('\\', '\\\\').replace('"', '\\"');
-        }
         if (options.allowDeletion !== undefined) {
             requestBody.AllowDeletion = options.allowDeletion;
         }
@@ -307,7 +301,6 @@ _SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry =
             'newTitle',
             'description',
             'templateFeatureId',
-            'schemaXml',
             'defaultContentApprovalWorkflowId',
             'defaultDisplayFormUrl',
             'defaultEditFormUrl',
@@ -506,8 +499,6 @@ _SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry =
     }, {
         option: '--restrictUserUpdates [restrictUserUpdates]',
         autocomplete: ['true', 'false']
-    }, {
-        option: '--schemaXml [schemaXml]'
     }, {
         option: '--sendToLocationName [sendToLocationName]'
     }, {

package/dist/m365/spo/commands/listitem/listitem-attachment-list.js

@@ -53,7 +53,7 @@ class SpoListItemAttachmentListCommand extends SpoCommand_1.default {
                 requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
             }
             const requestOptions = {
-                url: `${requestUrl}/items(${args.options.itemId})?$select=AttachmentFiles&$expand=AttachmentFiles`,
+                url: `${requestUrl}/items(${args.options.listItemId})?$select=AttachmentFiles&$expand=AttachmentFiles`,
                 method: 'GET',
                 headers: {
                     'accept': 'application/json;odata=nometadata'
@@ -89,7 +89,7 @@ _SpoListItemAttachmentListCommand_instances = new WeakSet(), _SpoListItemAttachm
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '--itemId <itemId>'
+        option: '--listItemId <listItemId>'
     }, {
         option: '--listId [listId]'
     }, {
@@ -106,8 +106,8 @@ _SpoListItemAttachmentListCommand_instances = new WeakSet(), _SpoListItemAttachm
         if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
-        if (isNaN(parseInt(args.options.itemId))) {
-            return `${args.options.itemId} is not a number`;
+        if (isNaN(parseInt(args.options.listItemId))) {
+            return `${args.options.listItemId} is not a number`;
         }
         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'];

package/dist/m365/spo/commands/user/user-get.js

@@ -47,8 +47,8 @@ class SpoUserGetCommand extends SpoCommand_1.default {
             else if (args.options.email) {
                 requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByEmail('${formatting_1.formatting.encodeQueryParameter(args.options.email)}')`;
             }
-            else if (args.options.loginName) {
-                requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByLoginName('${formatting_1.formatting.encodeQueryParameter(args.options.loginName)}')`;
+            else if (args.options.userName) {
+                requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByLoginName('${formatting_1.formatting.encodeQueryParameter(args.options.userName)}')`;
             }
             const requestOptions = {
                 url: requestUrl,
@@ -73,7 +73,7 @@ _SpoUserGetCommand_instances = new WeakSet(), _SpoUserGetCommand_initTelemetry =
         Object.assign(this.telemetryProperties, {
             id: (!(!args.options.id)).toString(),
             email: (!(!args.options.email)).toString(),
-            loginName: (!(!args.options.loginName)).toString()
+            userName: (!(!args.options.userName)).toString()
         });
     });
 }, _SpoUserGetCommand_initOptions = function _SpoUserGetCommand_initOptions() {
@@ -84,7 +84,7 @@ _SpoUserGetCommand_instances = new WeakSet(), _SpoUserGetCommand_initTelemetry =
     }, {
         option: '--email [email]'
     }, {
-        option: '--loginName [loginName]'
+        option: '--userName [userName]'
     });
 }, _SpoUserGetCommand_initValidators = function _SpoUserGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -95,7 +95,7 @@ _SpoUserGetCommand_instances = new WeakSet(), _SpoUserGetCommand_initTelemetry =
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoUserGetCommand_initOptionSets = function _SpoUserGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'email', 'loginName'] });
+    this.optionSets.push({ options: ['id', 'email', 'userName'] });
 };
 module.exports = new SpoUserGetCommand();
 //# sourceMappingURL=user-get.js.map

package/dist/m365/teams/commands/meeting/meeting-get.js

@@ -16,13 +16,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsMeetingGetCommand_instances, _TeamsMeetingGetCommand_initTelemetry, _TeamsMeetingGetCommand_initOptions, _TeamsMeetingGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
-const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const validation_1 = require("../../../../utils/validation");
 const accessToken_1 = require("../../../../utils/accessToken");
-const AadUserGetCommand = require("../../../aad/commands/user/user-get");
+const aadUser_1 = require("../../../../utils/aadUser");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsMeetingGetCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.MEETING_GET;
@@ -37,20 +37,6 @@ class TeamsMeetingGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsMeetingGetCommand_instances, "m", _TeamsMeetingGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsMeetingGetCommand_instances, "m", _TeamsMeetingGetCommand_initValidators).call(this);
     }
-    getUserId(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const commandOptions = {
-                email: options.email,
-                userName: options.userName,
-                output: 'json',
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            const output = yield Cli_1.Cli.executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, commandOptions), { _: [] }) });
-            const getUserOutput = JSON.parse(output.stdout);
-            return getUserOutput.id;
-        });
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const isAppOnlyAccessToken = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
@@ -71,18 +57,13 @@ class TeamsMeetingGetCommand extends GraphCommand_1.default {
                 let requestUrl = `${this.resource}/v1.0/`;
                 if (isAppOnlyAccessToken) {
                     requestUrl += 'users/';
-                    if (args.options.userId) {
-                        requestUrl += args.options.userId;
-                    }
-                    else {
-                        const userId = yield this.getUserId(args.options);
-                        requestUrl += userId;
-                    }
+                    const userId = yield this.getUserId(args.options);
+                    requestUrl += userId;
                 }
                 else {
                     requestUrl += `me`;
                 }
-                requestUrl += `/onlineMeetings?$filter=JoinWebUrl eq '${encodeURIComponent(args.options.joinUrl)}'`;
+                requestUrl += `/onlineMeetings?$filter=JoinWebUrl eq '${formatting_1.formatting.encodeQueryParameter(args.options.joinUrl)}'`;
                 const requestOptions = {
                     url: requestUrl,
                     headers: {
@@ -103,6 +84,17 @@ class TeamsMeetingGetCommand extends GraphCommand_1.default {
             }
         });
     }
+    getUserId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.userId) {
+                return options.userId;
+            }
+            if (options.userName) {
+                return aadUser_1.aadUser.getUserIdByUpn(options.userName);
+            }
+            return aadUser_1.aadUser.getUserIdByEmail(options.email);
+        });
+    }
 }
 _TeamsMeetingGetCommand_instances = new WeakSet(), _TeamsMeetingGetCommand_initTelemetry = function _TeamsMeetingGetCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/teams/commands/meeting/meeting-list.js

@@ -21,8 +21,8 @@ const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const odata_1 = require("../../../../utils/odata");
 const validation_1 = require("../../../../utils/validation");
-const AadUserGetCommand = require("../../../aad/commands/user/user-get");
 const accessToken_1 = require("../../../../utils/accessToken");
+const aadUser_1 = require("../../../../utils/aadUser");
 class TeamsMeetingListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.MEETING_LIST;
@@ -60,7 +60,7 @@ class TeamsMeetingListCommand extends GraphCommand_1.default {
                         requestUrl += args.options.userName;
                     }
                     else if (args.options.email) {
-                        const userId = yield this.getUserId(args.options.email);
+                        const userId = yield aadUser_1.aadUser.getUserIdByEmail(args.options.email);
                         requestUrl += userId;
                     }
                 }
@@ -98,19 +98,6 @@ class TeamsMeetingListCommand extends GraphCommand_1.default {
             }
         });
     }
-    getUserId(email) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const options = {
-                email: email,
-                output: 'json',
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            const output = yield Cli_1.Cli.executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
-            const getUserOutput = JSON.parse(output.stdout);
-            return getUserOutput.id;
-        });
-    }
 }
 _TeamsMeetingListCommand_instances = new WeakSet(), _TeamsMeetingListCommand_initTelemetry = function _TeamsMeetingListCommand_initTelemetry() {
     this.telemetry.push((args) => {