@pnp/cli-microsoft365 5.8.0-beta.40c8ac8 → 6.0.0-beta.076a3a5

package/dist/m365/teams/commands/chat/chat-message-send.js

@@ -13,7 +13,7 @@ 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 _TeamsChatMessageSendCommand_instances, _TeamsChatMessageSendCommand_initTelemetry, _TeamsChatMessageSendCommand_initOptions, _TeamsChatMessageSendCommand_initValidators;
+var _TeamsChatMessageSendCommand_instances, _TeamsChatMessageSendCommand_initTelemetry, _TeamsChatMessageSendCommand_initOptions, _TeamsChatMessageSendCommand_initValidators, _TeamsChatMessageSendCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const Auth_1 = require("../../../../Auth");
@@ -29,6 +29,7 @@ class TeamsChatMessageSendCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsChatMessageSendCommand_instances, "m", _TeamsChatMessageSendCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsChatMessageSendCommand_instances, "m", _TeamsChatMessageSendCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsChatMessageSendCommand_instances, "m", _TeamsChatMessageSendCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChatMessageSendCommand_instances, "m", _TeamsChatMessageSendCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CHAT_MESSAGE_SEND;
@@ -165,22 +166,6 @@ _TeamsChatMessageSendCommand_instances = new WeakSet(), _TeamsChatMessageSendCom
     });
 }, _TeamsChatMessageSendCommand_initValidators = function _TeamsChatMessageSendCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.chatId && !args.options.userEmails && !args.options.chatName) {
-            return 'Specify chatId or userEmails or chatName, one is required.';
-        }
-        let nrOfMutuallyExclusiveOptionsInUse = 0;
-        if (args.options.chatId) {
-            nrOfMutuallyExclusiveOptionsInUse++;
-        }
-        if (args.options.userEmails) {
-            nrOfMutuallyExclusiveOptionsInUse++;
-        }
-        if (args.options.chatName) {
-            nrOfMutuallyExclusiveOptionsInUse++;
-        }
-        if (nrOfMutuallyExclusiveOptionsInUse > 1) {
-            return 'Specify either chatId or userEmails or chatName, but not multiple.';
-        }
         if (args.options.chatId && !utils_1.validation.isValidTeamsChatId(args.options.chatId)) {
             return `${args.options.chatId} is not a valid Teams ChatId.`;
         }
@@ -192,6 +177,8 @@ _TeamsChatMessageSendCommand_instances = new WeakSet(), _TeamsChatMessageSendCom
         }
         return true;
     }));
+}, _TeamsChatMessageSendCommand_initOptionSets = function _TeamsChatMessageSendCommand_initOptionSets() {
+    this.optionSets.push(['chatId', 'userEmails', 'chatName']);
 };
 module.exports = new TeamsChatMessageSendCommand();
 //# sourceMappingURL=chat-message-send.js.map

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

@@ -13,7 +13,7 @@ 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 _TeamsTabGetCommand_instances, _TeamsTabGetCommand_initTelemetry, _TeamsTabGetCommand_initOptions, _TeamsTabGetCommand_initValidators;
+var _TeamsTabGetCommand_instances, _TeamsTabGetCommand_initTelemetry, _TeamsTabGetCommand_initOptions, _TeamsTabGetCommand_initValidators, _TeamsTabGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -29,6 +29,7 @@ class TeamsTabGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsTabGetCommand_instances, "m", _TeamsTabGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsTabGetCommand_instances, "m", _TeamsTabGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsTabGetCommand_instances, "m", _TeamsTabGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsTabGetCommand_instances, "m", _TeamsTabGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TAB_GET;
@@ -71,11 +72,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 +127,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,41 +141,25 @@ _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* () {
-        if (args.options.teamId && args.options.teamName) {
-            return 'Specify either teamId or teamName, but not both.';
-        }
-        if (!args.options.teamId && !args.options.teamName) {
-            return 'Specify teamId or teamName, one is required';
-        }
         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) {
-            return 'Specify either channelId or channelName, but not both.';
-        }
-        if (!args.options.channelId && !args.options.channelName) {
-            return 'Specify channelId or channelName, 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.tabId && args.options.tabName) {
-            return 'Specify either tabId or tabName, but not both.';
-        }
-        if (!args.options.tabId && !args.options.tabName) {
-            return 'Specify tabId or tabName, one is required';
+            return `${args.options.channelId} is not a valid Teams channel id`;
         }
-        if (args.options.tabId && !utils_1.validation.isValidGuid(args.options.tabId)) {
+        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.tabId} is not a valid GUID`;
         }
         return true;
     }));
+}, _TeamsTabGetCommand_initOptionSets = function _TeamsTabGetCommand_initOptionSets() {
+    this.optionSets.push(['teamId', 'teamName'], ['channelId', 'channelName'], ['id', 'name']);
 };
 module.exports = new TeamsTabGetCommand();
 //# sourceMappingURL=tab-get.js.map

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;
     }));

package/dist/m365/teams/commands/team/team-archive.js

@@ -48,10 +48,6 @@ class TeamsTeamArchiveCommand extends GraphCommand_1.default {
         });
     }
     commandAction(logger, args, cb) {
-        if (args.options.teamId) {
-            args.options.id = args.options.teamId;
-            this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
-        }
         const siteReadOnlyForMembers = args.options.shouldSetSpoSiteReadOnlyForMembers === true;
         this
             .getTeamId(args)
@@ -77,8 +73,7 @@ _TeamsTeamArchiveCommand_instances = new WeakSet(), _TeamsTeamArchiveCommand_ini
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
             name: typeof args.options.name !== 'undefined',
-            shouldSetSpoSiteReadOnlyForMembers: args.options.shouldSetSpoSiteReadOnlyForMembers === true,
-            teamId: typeof args.options.teamId !== 'undefined'
+            shouldSetSpoSiteReadOnlyForMembers: args.options.shouldSetSpoSiteReadOnlyForMembers === true
         });
     });
 }, _TeamsTeamArchiveCommand_initOptions = function _TeamsTeamArchiveCommand_initOptions() {
@@ -86,22 +81,17 @@ _TeamsTeamArchiveCommand_instances = new WeakSet(), _TeamsTeamArchiveCommand_ini
         option: '-i, --id [id]'
     }, {
         option: '-n, --name [name]'
-    }, {
-        option: '--teamId [teamId]'
     }, {
         option: '--shouldSetSpoSiteReadOnlyForMembers'
     });
 }, _TeamsTeamArchiveCommand_initValidators = function _TeamsTeamArchiveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.id && !args.options.name && !args.options.teamId) {
+        if (!args.options.id && !args.options.name) {
             return 'Specify either id or name';
         }
-        if (args.options.name && (args.options.id || args.options.teamId)) {
+        if (args.options.name && args.options.id) {
             return 'Specify either id or name but not both';
         }
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} 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`;
         }

package/dist/m365/teams/commands/team/team-clone.js

@@ -35,14 +35,6 @@ class TeamsTeamCloneCommand extends GraphCommand_1.default {
         return 'Creates a clone of a Microsoft Teams team';
     }
     commandAction(logger, args, cb) {
-        if (args.options.teamId) {
-            args.options.id = args.options.teamId;
-            this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
-        }
-        if (args.options.displayName) {
-            args.options.name = args.options.displayName;
-            this.warn(logger, `Option 'displayName' is deprecated. Please use 'name' instead.`);
-        }
         const data = {
             displayName: args.options.name,
             mailNickname: this.generateMailNickname(args.options.name),
@@ -92,20 +84,14 @@ _TeamsTeamCloneCommand_instances = new WeakSet(), _TeamsTeamCloneCommand_initTel
             classification: typeof args.options.classification !== 'undefined',
             visibility: typeof args.options.visibility !== 'undefined',
             id: typeof args.options.id !== 'undefined',
-            teamId: typeof args.options.teamId !== 'undefined',
-            name: typeof args.options.name !== 'undefined',
-            displayName: typeof args.options.displayName !== 'undefined'
+            name: typeof args.options.name !== 'undefined'
         });
     });
 }, _TeamsTeamCloneCommand_initOptions = function _TeamsTeamCloneCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id [teamId]'
-    }, {
-        option: '--teamId [teamId]'
+        option: '-i, --id [id]'
     }, {
         option: '-n, --name [name]'
-    }, {
-        option: '--displayName [displayName]'
     }, {
         option: '-p, --partsToClone <partsToClone>',
         autocomplete: ['apps', 'channels', 'members', 'settings', 'tabs']
@@ -119,9 +105,6 @@ _TeamsTeamCloneCommand_instances = new WeakSet(), _TeamsTeamCloneCommand_initTel
     });
 }, _TeamsTeamCloneCommand_initValidators = function _TeamsTeamCloneCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} 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`;
         }
@@ -146,7 +129,7 @@ _TeamsTeamCloneCommand_instances = new WeakSet(), _TeamsTeamCloneCommand_initTel
         return true;
     }));
 }, _TeamsTeamCloneCommand_initOptionSets = function _TeamsTeamCloneCommand_initOptionSets() {
-    this.optionSets.push(['id', 'teamId'], ['name', 'displayName']);
+    this.optionSets.push(['id', 'name']);
 };
 module.exports = new TeamsTeamCloneCommand();
 //# sourceMappingURL=team-clone.js.map

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

@@ -13,7 +13,7 @@ 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 _TeamsTeamGetCommand_instances, _TeamsTeamGetCommand_initTelemetry, _TeamsTeamGetCommand_initOptions, _TeamsTeamGetCommand_initValidators;
+var _TeamsTeamGetCommand_instances, _TeamsTeamGetCommand_initTelemetry, _TeamsTeamGetCommand_initOptions, _TeamsTeamGetCommand_initValidators, _TeamsTeamGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -27,6 +27,7 @@ class TeamsTeamGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsTeamGetCommand_instances, "m", _TeamsTeamGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsTeamGetCommand_instances, "m", _TeamsTeamGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsTeamGetCommand_instances, "m", _TeamsTeamGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamGetCommand_instances, "m", _TeamsTeamGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TEAM_GET;
@@ -81,17 +82,13 @@ _TeamsTeamGetCommand_instances = new WeakSet(), _TeamsTeamGetCommand_initTelemet
     });
 }, _TeamsTeamGetCommand_initValidators = function _TeamsTeamGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id && args.options.name) {
-            return 'Specify either teamId or teamName, but not both.';
-        }
-        if (!args.options.id && !args.options.name) {
-            return 'Specify teamId or teamName, one is required';
-        }
         if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));
+}, _TeamsTeamGetCommand_initOptionSets = function _TeamsTeamGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 };
 module.exports = new TeamsTeamGetCommand();
 //# sourceMappingURL=team-get.js.map

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

@@ -13,7 +13,7 @@ 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 _TeamsTeamRemoveCommand_instances, _TeamsTeamRemoveCommand_initTelemetry, _TeamsTeamRemoveCommand_initOptions, _TeamsTeamRemoveCommand_initValidators;
+var _TeamsTeamRemoveCommand_instances, _TeamsTeamRemoveCommand_initTelemetry, _TeamsTeamRemoveCommand_initOptions, _TeamsTeamRemoveCommand_initOptionSets, _TeamsTeamRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -28,6 +28,7 @@ class TeamsTeamRemoveCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsTeamRemoveCommand_instances, "m", _TeamsTeamRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsTeamRemoveCommand_instances, "m", _TeamsTeamRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsTeamRemoveCommand_instances, "m", _TeamsTeamRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamRemoveCommand_instances, "m", _TeamsTeamRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TEAM_REMOVE;
@@ -49,10 +50,6 @@ class TeamsTeamRemoveCommand extends GraphCommand_1.default {
         });
     }
     commandAction(logger, args, cb) {
-        if (args.options.teamId) {
-            args.options.id = args.options.teamId;
-            this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
-        }
         const removeTeam = () => {
             this
                 .getTeamId(args)
@@ -76,7 +73,7 @@ class TeamsTeamRemoveCommand extends GraphCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to remove the team ${args.options.teamId}?`
+                message: `Are you sure you want to remove the team ${args.options.id ? args.options.id : args.options.name}?`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -99,22 +96,13 @@ _TeamsTeamRemoveCommand_instances = new WeakSet(), _TeamsTeamRemoveCommand_initT
         option: '-i, --id [id]'
     }, {
         option: '-n, --name [name]'
-    }, {
-        option: '--teamId [teamId]'
     }, {
         option: '--confirm'
     });
+}, _TeamsTeamRemoveCommand_initOptionSets = function _TeamsTeamRemoveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 }, _TeamsTeamRemoveCommand_initValidators = function _TeamsTeamRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.id && !args.options.name && !args.options.teamId) {
-            return 'Specify either id or name';
-        }
-        if (args.options.name && (args.options.id || args.options.teamId)) {
-            return 'Specify either id or name but not both';
-        }
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} 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`;
         }

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

@@ -13,7 +13,7 @@ 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 _TeamsTeamSetCommand_instances, _TeamsTeamSetCommand_initTelemetry, _TeamsTeamSetCommand_initOptions, _TeamsTeamSetCommand_initValidators, _TeamsTeamSetCommand_initOptionSets;
+var _TeamsTeamSetCommand_instances, _TeamsTeamSetCommand_initTelemetry, _TeamsTeamSetCommand_initOptions, _TeamsTeamSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,7 +26,6 @@ class TeamsTeamSetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsTeamSetCommand_instances, "m", _TeamsTeamSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsTeamSetCommand_instances, "m", _TeamsTeamSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsTeamSetCommand_instances, "m", _TeamsTeamSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _TeamsTeamSetCommand_instances, "m", _TeamsTeamSetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TEAM_SET;
@@ -54,10 +53,6 @@ class TeamsTeamSetCommand extends GraphCommand_1.default {
         return requestBody;
     }
     commandAction(logger, args, cb) {
-        if (args.options.teamId) {
-            args.options.id = args.options.teamId;
-            this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
-        }
         if (args.options.displayName) {
             args.options.name = args.options.displayName;
             this.warn(logger, `Option 'displayName' is deprecated. Please use 'name' instead.`);
@@ -85,8 +80,6 @@ _TeamsTeamSetCommand_instances = new WeakSet(), _TeamsTeamSetCommand_initTelemet
 }, _TeamsTeamSetCommand_initOptions = function _TeamsTeamSetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id [id]'
-    }, {
-        option: '--teamId [teamId]'
     }, {
         option: '-n, --name [name]'
     }, {
@@ -103,9 +96,6 @@ _TeamsTeamSetCommand_instances = new WeakSet(), _TeamsTeamSetCommand_initTelemet
     });
 }, _TeamsTeamSetCommand_initValidators = function _TeamsTeamSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} 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`;
         }
@@ -116,8 +106,6 @@ _TeamsTeamSetCommand_instances = new WeakSet(), _TeamsTeamSetCommand_initTelemet
         }
         return true;
     }));
-}, _TeamsTeamSetCommand_initOptionSets = function _TeamsTeamSetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'teamId']);
 };
 TeamsTeamSetCommand.props = [
     'displayName',

package/dist/m365/teams/commands/team/team-unarchive.js

@@ -13,7 +13,7 @@ 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 _TeamsTeamUnarchiveCommand_instances, _TeamsTeamUnarchiveCommand_initOptions, _TeamsTeamUnarchiveCommand_initValidators;
+var _TeamsTeamUnarchiveCommand_instances, _TeamsTeamUnarchiveCommand_initOptions, _TeamsTeamUnarchiveCommand_initOptionSets, _TeamsTeamUnarchiveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class TeamsTeamUnarchiveCommand extends GraphCommand_1.default {
         _TeamsTeamUnarchiveCommand_instances.add(this);
         __classPrivateFieldGet(this, _TeamsTeamUnarchiveCommand_instances, "m", _TeamsTeamUnarchiveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsTeamUnarchiveCommand_instances, "m", _TeamsTeamUnarchiveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamUnarchiveCommand_instances, "m", _TeamsTeamUnarchiveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TEAM_UNARCHIVE;
@@ -47,10 +48,6 @@ class TeamsTeamUnarchiveCommand extends GraphCommand_1.default {
         });
     }
     commandAction(logger, args, cb) {
-        if (args.options.teamId) {
-            args.options.id = args.options.teamId;
-            this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
-        }
         const endpoint = `${this.resource}/v1.0`;
         this
             .getTeamId(args)
@@ -73,20 +70,11 @@ _TeamsTeamUnarchiveCommand_instances = new WeakSet(), _TeamsTeamUnarchiveCommand
         option: '-i, --id [id]'
     }, {
         option: '-n, --name [name]'
-    }, {
-        option: '--teamId [teamId]'
     });
+}, _TeamsTeamUnarchiveCommand_initOptionSets = function _TeamsTeamUnarchiveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 }, _TeamsTeamUnarchiveCommand_initValidators = function _TeamsTeamUnarchiveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.id && !args.options.name && !args.options.teamId) {
-            return 'Specify either id or name';
-        }
-        if (args.options.name && (args.options.id || args.options.teamId)) {
-            return 'Specify either id or name but not both';
-        }
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} 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`;
         }

package/dist/m365/teams/commands/user/user-app-add.js

@@ -42,7 +42,7 @@ class TeamsUserAppAddCommand extends GraphCommand_1.default {
             },
             responseType: 'json',
             data: {
-                'teamsApp@odata.bind': `${endpoint}/appCatalogs/teamsApps/${args.options.appId}`
+                'teamsApp@odata.bind': `${endpoint}/appCatalogs/teamsApps/${args.options.id}`
             }
         };
         request_1.default
@@ -52,14 +52,14 @@ class TeamsUserAppAddCommand extends GraphCommand_1.default {
 }
 _TeamsUserAppAddCommand_instances = new WeakSet(), _TeamsUserAppAddCommand_initOptions = function _TeamsUserAppAddCommand_initOptions() {
     this.options.unshift({
-        option: '--appId <appId>'
+        option: '--id <id>'
     }, {
         option: '--userId <userId>'
     });
 }, _TeamsUserAppAddCommand_initValidators = function _TeamsUserAppAddCommand_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 (!utils_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;

package/dist/m365/teams/commands/user/user-app-list.js

@@ -13,7 +13,7 @@ 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 _TeamsUserAppListCommand_instances, _TeamsUserAppListCommand_initTelemetry, _TeamsUserAppListCommand_initOptions, _TeamsUserAppListCommand_initValidators;
+var _TeamsUserAppListCommand_instances, _TeamsUserAppListCommand_initTelemetry, _TeamsUserAppListCommand_initOptions, _TeamsUserAppListCommand_initValidators, _TeamsUserAppListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -26,6 +26,7 @@ class TeamsUserAppListCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsUserAppListCommand_instances, "m", _TeamsUserAppListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsUserAppListCommand_instances, "m", _TeamsUserAppListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsUserAppListCommand_instances, "m", _TeamsUserAppListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsUserAppListCommand_instances, "m", _TeamsUserAppListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.USER_APP_LIST;
@@ -93,12 +94,6 @@ _TeamsUserAppListCommand_instances = new WeakSet(), _TeamsUserAppListCommand_ini
     });
 }, _TeamsUserAppListCommand_initValidators = function _TeamsUserAppListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.userId && !args.options.userName) {
-            return `userId or userName need to be provided`;
-        }
-        if (args.options.userId && args.options.userName) {
-            return `Please specify either userId or userName, not both`;
-        }
         if (args.options.userId && !utils_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
@@ -107,6 +102,8 @@ _TeamsUserAppListCommand_instances = new WeakSet(), _TeamsUserAppListCommand_ini
         }
         return true;
     }));
+}, _TeamsUserAppListCommand_initOptionSets = function _TeamsUserAppListCommand_initOptionSets() {
+    this.optionSets.push(['userId', 'userName']);
 };
 module.exports = new TeamsUserAppListCommand();
 //# sourceMappingURL=user-app-list.js.map

package/dist/m365/teams/commands/user/user-app-remove.js

@@ -38,7 +38,7 @@ class TeamsUserAppRemoveCommand extends GraphCommand_1.default {
         const removeApp = () => {
             const endpoint = `${this.resource}/v1.0`;
             const requestOptions = {
-                url: `${endpoint}/users/${args.options.userId}/teamwork/installedApps/${args.options.appId}`,
+                url: `${endpoint}/users/${args.options.userId}/teamwork/installedApps/${args.options.id}`,
                 headers: {
                     'accept': 'application/json;odata.metadata=none'
                 },
@@ -56,7 +56,7 @@ class TeamsUserAppRemoveCommand extends GraphCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to remove the app with id ${args.options.appId} for user ${args.options.userId}?`
+                message: `Are you sure you want to remove the app with id ${args.options.id} for user ${args.options.userId}?`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -76,7 +76,7 @@ _TeamsUserAppRemoveCommand_instances = new WeakSet(), _TeamsUserAppRemoveCommand
     });
 }, _TeamsUserAppRemoveCommand_initOptions = function _TeamsUserAppRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '--appId <appId>'
+        option: '--id <id>'
     }, {
         option: '--userId <userId>'
     }, {