@pnp/cli-microsoft365 5.7.0-beta.c116041 → 6.0.0-beta.22bbec5

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

@@ -37,7 +37,7 @@ class SpoWebAddCommand extends SpoCommand_1.default {
         return 'Create new subsite';
     }
     getExcludedOptionsWithUrls() {
-        return ['webUrl'];
+        return ['url'];
     }
     commandAction(logger, args, cb) {
         let siteInfo = null;
@@ -55,7 +55,7 @@ class SpoWebAddCommand extends SpoCommand_1.default {
                 responseType: 'json',
                 data: {
                     parameters: {
-                        Url: args.options.webUrl,
+                        Url: args.options.url,
                         Title: args.options.title,
                         Description: args.options.description,
                         Language: args.options.locale,
@@ -65,7 +65,7 @@ class SpoWebAddCommand extends SpoCommand_1.default {
                 }
             };
             if (this.verbose) {
-                logger.logToStderr(`Creating subsite ${args.options.parentWebUrl}/${args.options.webUrl}...`);
+                logger.logToStderr(`Creating subsite ${args.options.parentWebUrl}/${args.options.url}...`);
             }
             return request_1.default.post(requestOptions);
         })
@@ -77,7 +77,7 @@ class SpoWebAddCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr("Setting inheriting navigation from the parent site...");
             }
-            subsiteFullUrl = `${args.options.parentWebUrl}/${encodeURIComponent(args.options.webUrl)}`;
+            subsiteFullUrl = `${args.options.parentWebUrl}/${encodeURIComponent(args.options.url)}`;
             const requestOptions = {
                 url: `${subsiteFullUrl}/_api/web/effectivebasepermissions`,
                 headers: {
@@ -157,7 +157,7 @@ _SpoWebAddCommand_instances = new WeakSet(), _SpoWebAddCommand_initTelemetry = f
     }, {
         option: '-d, --description [description]'
     }, {
-        option: '-u, --webUrl <webUrl>'
+        option: '-u, --url <url>'
     }, {
         option: '-w, --webTemplate <webTemplate>'
     }, {

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

@@ -34,7 +34,7 @@ class SpoWebGetCommand extends SpoCommand_1.default {
         return 'Retrieve information about the specified site';
     }
     commandAction(logger, args, cb) {
-        let url = `${args.options.webUrl}/_api/web`;
+        let url = `${args.options.url}/_api/web`;
         if (args.options.withGroups) {
             url += '?$expand=AssociatedMemberGroup,AssociatedOwnerGroup,AssociatedVisitorGroup';
         }
@@ -61,12 +61,12 @@ _SpoWebGetCommand_instances = new WeakSet(), _SpoWebGetCommand_initTelemetry = f
     });
 }, _SpoWebGetCommand_initOptions = function _SpoWebGetCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
+        option: '-u, --url <url>'
     }, {
         option: '--withGroups'
     });
 }, _SpoWebGetCommand_initValidators = function _SpoWebGetCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoWebGetCommand();
 //# sourceMappingURL=web-get.js.map

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

@@ -37,9 +37,9 @@ class SpoWebListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         if (this.verbose) {
-            logger.logToStderr(`Retrieving all webs in site at ${args.options.webUrl}...`);
+            logger.logToStderr(`Retrieving all webs in site at ${args.options.url}...`);
         }
-        let requestUrl = `${args.options.webUrl}/_api/web/webs`;
+        let requestUrl = `${args.options.url}/_api/web/webs`;
         if (args.options.output !== 'json') {
             requestUrl += '?$select=Title,Id,URL';
         }
@@ -60,10 +60,10 @@ class SpoWebListCommand extends SpoCommand_1.default {
 }
 _SpoWebListCommand_instances = new WeakSet(), _SpoWebListCommand_initOptions = function _SpoWebListCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
+        option: '-u, --url <url>'
     });
 }, _SpoWebListCommand_initValidators = function _SpoWebListCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoWebListCommand();
 //# sourceMappingURL=web-list.js.map

package/dist/m365/spo/commands/web/web-reindex.js

@@ -38,13 +38,13 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
         let requestDigest = '';
         let webIdentityResp;
         utils_1.spo
-            .getRequestDigest(args.options.webUrl)
+            .getRequestDigest(args.options.url)
             .then((res) => {
             requestDigest = res.FormDigestValue;
             if (this.debug) {
                 logger.logToStderr(`Retrieved request digest. Retrieving web identity...`);
             }
-            return utils_1.spo.getCurrentWebIdentity(args.options.webUrl, requestDigest);
+            return utils_1.spo.getCurrentWebIdentity(args.options.url, requestDigest);
         })
             .then((identityResp) => {
             webIdentityResp = identityResp;
@@ -54,20 +54,20 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Checking if the site is a no-script site...`);
             }
-            return propertybag_base_1.SpoPropertyBagBaseCommand.isNoScriptSite(args.options.webUrl, requestDigest, webIdentityResp, logger, this.debug);
+            return propertybag_base_1.SpoPropertyBagBaseCommand.isNoScriptSite(args.options.url, requestDigest, webIdentityResp, logger, this.debug);
         })
             .then((isNoScriptSite) => {
             if (isNoScriptSite) {
                 if (this.verbose) {
                     logger.logToStderr(`Site is a no-script site. Reindexing lists instead...`);
                 }
-                return this.reindexLists(args.options.webUrl, requestDigest, logger, webIdentityResp);
+                return this.reindexLists(args.options.url, requestDigest, logger, webIdentityResp);
             }
             if (this.verbose) {
                 logger.logToStderr(`Site is not a no-script site. Reindexing site...`);
             }
             const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/allproperties`,
+                url: `${args.options.url}/_api/web/allproperties`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
@@ -78,7 +78,7 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
             .then((webProperties) => {
             let searchVersion = webProperties.vti_x005f_searchversion || 0;
             searchVersion++;
-            return propertybag_base_1.SpoPropertyBagBaseCommand.setProperty('vti_searchversion', searchVersion.toString(), args.options.webUrl, requestDigest, webIdentityResp, logger, this.debug);
+            return propertybag_base_1.SpoPropertyBagBaseCommand.setProperty('vti_searchversion', searchVersion.toString(), args.options.url, requestDigest, webIdentityResp, logger, this.debug);
         })
             .then(_ => cb(), (err) => {
             if (this.reindexedLists) {
@@ -138,10 +138,10 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
 }
 _SpoWebReindexCommand_instances = new WeakSet(), _SpoWebReindexCommand_initOptions = function _SpoWebReindexCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
+        option: '-u, --url <url>'
     });
 }, _SpoWebReindexCommand_initValidators = function _SpoWebReindexCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoWebReindexCommand();
 //# sourceMappingURL=web-reindex.js.map

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

@@ -37,7 +37,7 @@ class SpoWebRemoveCommand extends SpoCommand_1.default {
     commandAction(logger, args, cb) {
         const removeWeb = () => {
             const requestOptions = {
-                url: `${encodeURI(args.options.webUrl)}/_api/web`,
+                url: `${encodeURI(args.options.url)}/_api/web`,
                 headers: {
                     accept: 'application/json;odata=nometadata',
                     'X-HTTP-Method': 'DELETE'
@@ -45,7 +45,7 @@ class SpoWebRemoveCommand extends SpoCommand_1.default {
                 responseType: 'json'
             };
             if (this.verbose) {
-                logger.logToStderr(`Deleting subsite ${args.options.webUrl} ...`);
+                logger.logToStderr(`Deleting subsite ${args.options.url} ...`);
             }
             request_1.default
                 .post(requestOptions)
@@ -59,7 +59,7 @@ class SpoWebRemoveCommand extends SpoCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to remove the subsite ${args.options.webUrl}`
+                message: `Are you sure you want to remove the subsite ${args.options.url}`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -79,12 +79,12 @@ _SpoWebRemoveCommand_instances = new WeakSet(), _SpoWebRemoveCommand_initTelemet
     });
 }, _SpoWebRemoveCommand_initOptions = function _SpoWebRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
+        option: '-u, --url <url>'
     }, {
         option: '--confirm'
     });
 }, _SpoWebRemoveCommand_initValidators = function _SpoWebRemoveCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoWebRemoveCommand();
 //# sourceMappingURL=web-remove.js.map

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

@@ -65,7 +65,7 @@ class SpoWebSetCommand extends SpoCommand_1.default {
             payload.SearchScope = SpoWebSetCommand.searchScopeOptions.indexOf(searchScope);
         }
         const requestOptions = {
-            url: `${args.options.webUrl}/_api/web`,
+            url: `${args.options.url}/_api/web`,
             headers: {
                 'content-type': 'application/json;odata=nometadata',
                 accept: 'application/json;odata=nometadata'
@@ -74,7 +74,7 @@ class SpoWebSetCommand extends SpoCommand_1.default {
             data: payload
         };
         if (this.verbose) {
-            logger.logToStderr(`Updating properties of subsite ${args.options.webUrl}...`);
+            logger.logToStderr(`Updating properties of subsite ${args.options.url}...`);
         }
         request_1.default
             .patch(requestOptions)
@@ -101,7 +101,7 @@ _SpoWebSetCommand_instances = new WeakSet(), _SpoWebSetCommand_initTelemetry = f
     });
 }, _SpoWebSetCommand_initOptions = function _SpoWebSetCommand_initOptions() {
     this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
+        option: '-u, --url <url>'
     }, {
         option: '-t, --title [title]'
     }, {
@@ -128,7 +128,7 @@ _SpoWebSetCommand_instances = new WeakSet(), _SpoWebSetCommand_initTelemetry = f
     });
 }, _SpoWebSetCommand_initValidators = function _SpoWebSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands.js

@@ -192,9 +192,6 @@ exports.default = {
     SITE_APPPERMISSION_LIST: `${prefix} site apppermission list`,
     SITE_APPPERMISSION_REMOVE: `${prefix} site apppermission remove`,
     SITE_APPPERMISSION_SET: `${prefix} site apppermission set`,
-    SITE_CLASSIC_ADD: `${prefix} site classic add`,
-    SITE_CLASSIC_LIST: `${prefix} site classic list`,
-    SITE_CLASSIC_SET: `${prefix} site classic set`,
     SITE_COMMSITE_ENABLE: `${prefix} site commsite enable`,
     SITE_ENSURE: `${prefix} site ensure`,
     SITE_GET: `${prefix} site get`,

package/dist/m365/teams/commands/app/app-install.js

@@ -55,7 +55,7 @@ class TeamsAppInstallCommand extends GraphCommand_1.default {
                 },
                 responseType: 'json',
                 data: {
-                    'teamsApp@odata.bind': `${this.resource}/v1.0/appCatalogs/teamsApps/${args.options.appId}`
+                    'teamsApp@odata.bind': `${this.resource}/v1.0/appCatalogs/teamsApps/${args.options.id}`
                 }
             };
             return request_1.default.post(requestOptions);
@@ -101,11 +101,11 @@ _TeamsAppInstallCommand_instances = new WeakSet(), _TeamsAppInstallCommand_initT
         });
     });
 }, _TeamsAppInstallCommand_initOptions = function _TeamsAppInstallCommand_initOptions() {
-    this.options.unshift({ option: '--appId <appId>' }, { option: '--teamId [teamId]' }, { option: '--userId [userId]' }, { option: '--userName [userName]' });
+    this.options.unshift({ option: '--id <id>' }, { option: '--teamId [teamId]' }, { option: '--userId [userId]' }, { option: '--userName [userName]' });
 }, _TeamsAppInstallCommand_initValidators = function _TeamsAppInstallCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.appId)) {
-            return `${args.options.appId} is not a valid GUID`;
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         if (!args.options.teamId &&
             !args.options.userId &&

package/dist/m365/teams/commands/app/app-uninstall.js

@@ -37,7 +37,7 @@ class TeamsAppUninstallCommand extends GraphCommand_1.default {
     commandAction(logger, args, cb) {
         const uninstallApp = () => {
             const requestOptions = {
-                url: `${this.resource}/v1.0/teams/${args.options.teamId}/installedApps/${args.options.appId}`,
+                url: `${this.resource}/v1.0/teams/${args.options.teamId}/installedApps/${args.options.id}`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 }
@@ -54,7 +54,7 @@ class TeamsAppUninstallCommand extends GraphCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to uninstall the app with id ${args.options.appId} from the Microsoft Teams team ${args.options.teamId}?`
+                message: `Are you sure you want to uninstall the app with id ${args.options.id} from the Microsoft Teams team ${args.options.teamId}?`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -74,7 +74,7 @@ _TeamsAppUninstallCommand_instances = new WeakSet(), _TeamsAppUninstallCommand_i
     });
 }, _TeamsAppUninstallCommand_initOptions = function _TeamsAppUninstallCommand_initOptions() {
     this.options.unshift({
-        option: '--appId <appId>'
+        option: '--id <id>'
     }, {
         option: '--teamId <teamId>'
     }, {

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

@@ -49,14 +49,14 @@ class TeamsChannelGetCommand extends GraphCommand_1.default {
         });
     }
     getChannelId(args) {
-        if (args.options.channelId) {
-            return Promise.resolve(args.options.channelId);
+        if (args.options.id) {
+            return Promise.resolve(args.options.id);
         }
         if (args.options.primary) {
             return Promise.resolve('');
         }
         const channelRequestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.channelName)}'`,
+            url: `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.name)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -107,8 +107,8 @@ _TeamsChannelGetCommand_instances = new WeakSet(), _TeamsChannelGetCommand_initT
         Object.assign(this.telemetryProperties, {
             teamId: typeof args.options.teamId !== 'undefined',
             teamName: typeof args.options.teamName !== 'undefined',
-            channelId: typeof args.options.channelId !== 'undefined',
-            channelName: typeof args.options.channelName !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
             primary: (!(!args.options.primary)).toString()
         });
     });
@@ -118,9 +118,9 @@ _TeamsChannelGetCommand_instances = new WeakSet(), _TeamsChannelGetCommand_initT
     }, {
         option: '--teamName [teamName]'
     }, {
-        option: '-c, --channelId [channelId]'
+        option: '-c, --id [id]'
     }, {
-        option: '--channelName [channelName]'
+        option: '--name [name]'
     }, {
         option: '--primary'
     });
@@ -135,23 +135,23 @@ _TeamsChannelGetCommand_instances = new WeakSet(), _TeamsChannelGetCommand_initT
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.channelId && args.options.channelName && args.options.primary) {
-            return 'Specify channelId, channelName or primary';
+        if (args.options.id && args.options.name && args.options.primary) {
+            return 'Specify id, name or primary';
         }
-        if (!args.options.channelId && args.options.channelName && args.options.primary) {
-            return 'Specify channelId, channelName or primary.';
+        if (!args.options.id && args.options.name && args.options.primary) {
+            return 'Specify id, name or primary.';
         }
-        if (args.options.channelId && !args.options.channelName && args.options.primary) {
-            return 'Specify channelId, channelName or primary.';
+        if (args.options.id && !args.options.name && args.options.primary) {
+            return 'Specify id, name or primary.';
         }
-        if (args.options.channelId && args.options.channelName && !args.options.primary) {
-            return 'Specify channelId, channelName or primary.';
+        if (args.options.id && args.options.name && !args.options.primary) {
+            return 'Specify id, name or primary.';
         }
-        if (!args.options.channelId && !args.options.channelName && !args.options.primary) {
-            return 'Specify channelId, channelName or primary, one is required';
+        if (!args.options.id && !args.options.name && !args.options.primary) {
+            return 'Specify id, name or primary, one is required';
         }
-        if (args.options.channelId && !utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
-            return `${args.options.channelId} is not a valid Teams ChannelId`;
+        if (args.options.id && !utils_1.validation.isValidTeamsChannelId(args.options.id)) {
+            return `${args.options.id} is not a valid Teams channel id`;
         }
         return true;
     }));

package/dist/m365/teams/commands/channel/channel-remove.js

@@ -36,9 +36,9 @@ class TeamsChannelRemoveCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args, cb) {
         const removeChannel = () => {
-            if (args.options.channelName) {
+            if (args.options.name) {
                 const requestOptions = {
-                    url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.channelName)}'`,
+                    url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.name)}'`,
                     headers: {
                         accept: 'application/json;odata.metadata=none'
                     },
@@ -63,9 +63,9 @@ class TeamsChannelRemoveCommand extends GraphCommand_1.default {
                 })
                     .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
             }
-            if (args.options.channelId) {
+            if (args.options.id) {
                 const requestOptions = {
-                    url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels/${encodeURIComponent(args.options.channelId)}`,
+                    url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels/${encodeURIComponent(args.options.id)}`,
                     headers: {
                         accept: 'application/json;odata.metadata=none'
                     },
@@ -80,7 +80,7 @@ class TeamsChannelRemoveCommand extends GraphCommand_1.default {
             removeChannel();
         }
         else {
-            const channelName = args.options.channelName ? args.options.channelName : args.options.channelId;
+            const channelName = args.options.name ? args.options.name : args.options.id;
             cli_1.Cli.prompt({
                 type: 'confirm',
                 name: 'continue',
@@ -100,16 +100,16 @@ class TeamsChannelRemoveCommand extends GraphCommand_1.default {
 _TeamsChannelRemoveCommand_instances = new WeakSet(), _TeamsChannelRemoveCommand_initTelemetry = function _TeamsChannelRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            channelId: typeof args.options.channelId !== 'undefined',
-            channelName: typeof args.options.channelName !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
             confirm: (!(!args.options.confirm)).toString()
         });
     });
 }, _TeamsChannelRemoveCommand_initOptions = function _TeamsChannelRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-c, --channelId [channelId]'
+        option: '-c, --id [id]'
     }, {
-        option: '-n, --channelName [channelName]'
+        option: '-n, --name [name]'
     }, {
         option: '-i, --teamId <teamId>'
     }, {
@@ -117,14 +117,14 @@ _TeamsChannelRemoveCommand_instances = new WeakSet(), _TeamsChannelRemoveCommand
     });
 }, _TeamsChannelRemoveCommand_initValidators = function _TeamsChannelRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.channelId && args.options.channelName) {
-            return 'Specify channelId or channelName but not both';
+        if (args.options.id && args.options.name) {
+            return 'Specify id or name but not both';
         }
-        if (!args.options.channelId && !args.options.channelName) {
-            return 'Specify channelId or channelName';
+        if (!args.options.id && !args.options.name) {
+            return 'Specify id or name';
         }
-        if (args.options.channelId && !utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
-            return `${args.options.channelId} is not a valid Teams Channel Id`;
+        if (args.options.id && !utils_1.validation.isValidTeamsChannelId(args.options.id)) {
+            return `${args.options.id} is not a valid Teams channel id`;
         }
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;

package/dist/m365/teams/commands/channel/channel-set.js

@@ -35,7 +35,7 @@ class TeamsChannelSetCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args, cb) {
         const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.channelName)}'`,
+            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.name)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -64,8 +64,8 @@ class TeamsChannelSetCommand extends GraphCommand_1.default {
     }
     mapRequestBody(options) {
         const requestBody = {};
-        if (options.newChannelName) {
-            requestBody.displayName = options.newChannelName;
+        if (options.newName) {
+            requestBody.displayName = options.newName;
         }
         if (options.description) {
             requestBody.description = options.description;
@@ -76,7 +76,7 @@ class TeamsChannelSetCommand extends GraphCommand_1.default {
 _TeamsChannelSetCommand_instances = new WeakSet(), _TeamsChannelSetCommand_initTelemetry = function _TeamsChannelSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            newChannelName: typeof args.options.newChannelName !== 'undefined',
+            newName: typeof args.options.newName !== 'undefined',
             description: typeof args.options.description !== 'undefined'
         });
     });
@@ -84,9 +84,9 @@ _TeamsChannelSetCommand_instances = new WeakSet(), _TeamsChannelSetCommand_initT
     this.options.unshift({
         option: '-i, --teamId <teamId>'
     }, {
-        option: '--channelName <channelName>'
+        option: '--name <name>'
     }, {
-        option: '--newChannelName [newChannelName]'
+        option: '--newName [newName]'
     }, {
         option: '--description [description]'
     });
@@ -95,7 +95,7 @@ _TeamsChannelSetCommand_instances = new WeakSet(), _TeamsChannelSetCommand_initT
         if (!utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.channelName.toLowerCase() === "general") {
+        if (args.options.name.toLowerCase() === "general") {
             return 'General channel cannot be updated';
         }
         return true;

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

@@ -34,7 +34,7 @@ class TeamsMessageGetCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args, cb) {
         const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${args.options.teamId}/channels/${args.options.channelId}/messages/${args.options.messageId}`,
+            url: `${this.resource}/v1.0/teams/${args.options.teamId}/channels/${args.options.channelId}/messages/${args.options.id}`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -50,11 +50,11 @@ class TeamsMessageGetCommand extends GraphCommand_1.default {
 }
 _TeamsMessageGetCommand_instances = new WeakSet(), _TeamsMessageGetCommand_initOptions = function _TeamsMessageGetCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --teamId <teamId>'
+        option: '-t, --teamId <teamId>'
     }, {
         option: '-c, --channelId <channelId>'
     }, {
-        option: '-m, --messageId <messageId>'
+        option: '-i, --id <id>'
     });
 }, _TeamsMessageGetCommand_initValidators = function _TeamsMessageGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -71,11 +71,11 @@ class TeamsTabGetCommand extends GraphCommand_1.default {
         });
     }
     getTabId(args) {
-        if (args.options.tabId) {
-            return Promise.resolve(args.options.tabId);
+        if (args.options.id) {
+            return Promise.resolve(args.options.id);
         }
         const tabRequestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels/${encodeURIComponent(this.channelId)}/tabs?$filter=displayName eq '${encodeURIComponent(args.options.tabName)}'`,
+            url: `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels/${encodeURIComponent(this.channelId)}/tabs?$filter=displayName eq '${encodeURIComponent(args.options.name)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -126,8 +126,8 @@ _TeamsTabGetCommand_instances = new WeakSet(), _TeamsTabGetCommand_initTelemetry
             teamName: typeof args.options.teamName !== 'undefined',
             channelId: typeof args.options.channelId !== 'undefined',
             channelName: typeof args.options.channelName !== 'undefined',
-            tabId: typeof args.options.tabId !== 'undefined',
-            tabName: typeof args.options.tabName !== 'undefined'
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined'
         });
     });
 }, _TeamsTabGetCommand_initOptions = function _TeamsTabGetCommand_initOptions() {
@@ -140,9 +140,9 @@ _TeamsTabGetCommand_instances = new WeakSet(), _TeamsTabGetCommand_initTelemetry
     }, {
         option: '--channelName [channelName]'
     }, {
-        option: '-i, --tabId [tabId]'
+        option: '-i, --id [id]'
     }, {
-        option: '-n, --tabName [tabName]'
+        option: '-n, --name [name]'
     });
 }, _TeamsTabGetCommand_initValidators = function _TeamsTabGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -164,14 +164,14 @@ _TeamsTabGetCommand_instances = new WeakSet(), _TeamsTabGetCommand_initTelemetry
         if (args.options.channelId && !utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams ChannelId`;
         }
-        if (args.options.tabId && args.options.tabName) {
-            return 'Specify either tabId or tabName, but not both.';
+        if (args.options.id && args.options.name) {
+            return 'Specify either id or name, but not both.';
         }
-        if (!args.options.tabId && !args.options.tabName) {
-            return 'Specify tabId or tabName, one is required';
+        if (!args.options.id && !args.options.name) {
+            return 'Specify id or name, one is required';
         }
-        if (args.options.tabId && !utils_1.validation.isValidGuid(args.options.tabId)) {
-            return `${args.options.tabId} is not a valid GUID`;
+        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));

package/dist/m365/teams/commands/tab/tab-remove.js

@@ -37,7 +37,7 @@ class TeamsTabRemoveCommand extends GraphCommand_1.default {
     commandAction(logger, args, cb) {
         const removeTab = () => {
             const requestOptions = {
-                url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels/${args.options.channelId}/tabs/${encodeURIComponent(args.options.tabId)}`,
+                url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels/${args.options.channelId}/tabs/${encodeURIComponent(args.options.id)}`,
                 headers: {
                     accept: "application/json;odata.metadata=none"
                 },
@@ -53,7 +53,7 @@ class TeamsTabRemoveCommand extends GraphCommand_1.default {
                 type: "confirm",
                 name: "continue",
                 default: false,
-                message: `Are you sure you want to remove the tab with id ${args.options.tabId} from channel ${args.options.channelId} in team ${args.options.teamId}?`
+                message: `Are you sure you want to remove the tab with id ${args.options.id} from channel ${args.options.channelId} in team ${args.options.teamId}?`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -73,11 +73,11 @@ _TeamsTabRemoveCommand_instances = new WeakSet(), _TeamsTabRemoveCommand_initTel
     });
 }, _TeamsTabRemoveCommand_initOptions = function _TeamsTabRemoveCommand_initOptions() {
     this.options.unshift({
-        option: "-i, --teamId <teamId>"
+        option: "-t, --teamId <teamId>"
     }, {
         option: "-c, --channelId <channelId>"
     }, {
-        option: "-t, --tabId <tabId>"
+        option: "-i, --id <id>"
     }, {
         option: "--confirm"
     });
@@ -89,8 +89,8 @@ _TeamsTabRemoveCommand_instances = new WeakSet(), _TeamsTabRemoveCommand_initTel
         if (!utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams ChannelId`;
         }
-        if (!utils_1.validation.isValidGuid(args.options.tabId)) {
-            return `${args.options.tabId} is not a valid GUID`;
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));