@pnp/cli-microsoft365 6.0.0-beta.566a6b8 → 6.0.0-beta.5ea1353

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

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsMessageListCommand_instances, _TeamsMessageListCommand_initTelemetry, _TeamsMessageListCommand_initOptions, _TeamsMessageListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsMessageListCommand extends GraphCommand_1.default {
@@ -40,7 +41,7 @@ class TeamsMessageListCommand extends GraphCommand_1.default {
             const deltaExtension = args.options.since !== undefined ? `/delta?$filter=lastModifiedDateTime gt ${args.options.since}` : '';
             const endpoint = `${this.resource}/v1.0/teams/${args.options.teamId}/channels/${args.options.channelId}/messages${deltaExtension}`;
             try {
-                const items = yield utils_1.odata.getAllItems(endpoint);
+                const items = yield odata_1.odata.getAllItems(endpoint);
                 if (args.options.output !== 'json') {
                     items.forEach(i => {
                         i.body = i.body.content;
@@ -70,16 +71,16 @@ _TeamsMessageListCommand_instances = new WeakSet(), _TeamsMessageListCommand_ini
     });
 }, _TeamsMessageListCommand_initValidators = function _TeamsMessageListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (!validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (!utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
+        if (!validation_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams ChannelId`;
         }
-        if (args.options.since && !utils_1.validation.isValidISODateDashOnly(args.options.since)) {
+        if (args.options.since && !validation_1.validation.isValidISODateDashOnly(args.options.since)) {
             return `${args.options.since} is not a valid ISO Date (with dash separator)`;
         }
-        if (args.options.since && !utils_1.validation.isDateInRange(args.options.since, 8)) {
+        if (args.options.since && !validation_1.validation.isDateInRange(args.options.since, 8)) {
             return `${args.options.since} is not in the last 8 months (for delta messages)`;
         }
         return true;

package/dist/m365/teams/commands/message/message-reply-list.js

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsMessageReplyListCommand_instances, _TeamsMessageReplyListCommand_initOptions, _TeamsMessageReplyListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsMessageReplyListCommand extends GraphCommand_1.default {
@@ -38,7 +39,7 @@ class TeamsMessageReplyListCommand extends GraphCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const endpoint = `${this.resource}/v1.0/teams/${args.options.teamId}/channels/${args.options.channelId}/messages/${args.options.messageId}/replies`;
             try {
-                const items = yield utils_1.odata.getAllItems(endpoint);
+                const items = yield odata_1.odata.getAllItems(endpoint);
                 if (args.options.output !== 'json') {
                     items.forEach(i => {
                         i.body = i.body.content;
@@ -62,10 +63,10 @@ _TeamsMessageReplyListCommand_instances = new WeakSet(), _TeamsMessageReplyListC
     });
 }, _TeamsMessageReplyListCommand_initValidators = function _TeamsMessageReplyListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (!validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (!utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
+        if (!validation_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams ChannelId`;
         }
         return true;

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsMessagingSettingsListCommand_instances, _TeamsMessagingSettingsListCommand_initOptions, _TeamsMessagingSettingsListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsMessagingSettingsListCommand extends GraphCommand_1.default {
@@ -35,7 +36,7 @@ class TeamsMessagingSettingsListCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const requestOptions = {
-                url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}?$select=messagingSettings`,
+                url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(args.options.teamId)}?$select=messagingSettings`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -57,7 +58,7 @@ _TeamsMessagingSettingsListCommand_instances = new WeakSet(), _TeamsMessagingSet
     });
 }, _TeamsMessagingSettingsListCommand_initValidators = function _TeamsMessagingSettingsListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (!validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
         return true;

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsMessagingSettingsSetCommand_instances, _TeamsMessagingSettingsSetCommand_initTelemetry, _TeamsMessagingSettingsSetCommand_initOptions, _TeamsMessagingSettingsSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsMessagingSettingsSetCommand extends GraphCommand_1.default {
@@ -44,7 +45,7 @@ class TeamsMessagingSettingsSetCommand extends GraphCommand_1.default {
                 }
             });
             const requestOptions = {
-                url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}`,
+                url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(args.options.teamId)}`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -82,7 +83,7 @@ _TeamsMessagingSettingsSetCommand_instances = new WeakSet(), _TeamsMessagingSett
     });
 }, _TeamsMessagingSettingsSetCommand_initValidators = function _TeamsMessagingSettingsSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (!validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
         let hasDuplicate = false;
@@ -101,7 +102,7 @@ _TeamsMessagingSettingsSetCommand_instances = new WeakSet(), _TeamsMessagingSett
         TeamsMessagingSettingsSetCommand.props.every((p) => {
             property = p;
             value = args.options[p];
-            isValid = typeof value === 'undefined' || utils_1.validation.isValidBoolean(value);
+            isValid = typeof value === 'undefined' || validation_1.validation.isValidBoolean(value);
             return isValid;
         });
         if (!isValid) {

package/dist/m365/teams/commands/report/report-directroutingcalls.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsReportDirectroutingcallsCommand_instances, _TeamsReportDirectroutingcallsCommand_initTelemetry, _TeamsReportDirectroutingcallsCommand_initOptions, _TeamsReportDirectroutingcallsCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsReportDirectroutingcallsCommand extends GraphCommand_1.default {
@@ -38,9 +39,9 @@ class TeamsReportDirectroutingcallsCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const toDateTimeParameter = encodeURIComponent(args.options.toDateTime ? args.options.toDateTime : new Date().toISOString());
+            const toDateTimeParameter = formatting_1.formatting.encodeQueryParameter(args.options.toDateTime ? args.options.toDateTime : new Date().toISOString());
             const requestOptions = {
-                url: `${this.resource}/v1.0/communications/callRecords/getDirectRoutingCalls(fromDateTime=${encodeURIComponent(args.options.fromDateTime)},toDateTime=${toDateTimeParameter})`,
+                url: `${this.resource}/v1.0/communications/callRecords/getDirectRoutingCalls(fromDateTime=${formatting_1.formatting.encodeQueryParameter(args.options.fromDateTime)},toDateTime=${toDateTimeParameter})`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -70,11 +71,11 @@ _TeamsReportDirectroutingcallsCommand_instances = new WeakSet(), _TeamsReportDir
     });
 }, _TeamsReportDirectroutingcallsCommand_initValidators = function _TeamsReportDirectroutingcallsCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidISODateDashOnly(args.options.fromDateTime)) {
+        if (!validation_1.validation.isValidISODateDashOnly(args.options.fromDateTime)) {
             return 'The fromDateTime is not a valid ISO date string (YYYY-MM-DD)';
         }
         if (args.options.toDateTime &&
-            !utils_1.validation.isValidISODateDashOnly(args.options.toDateTime)) {
+            !validation_1.validation.isValidISODateDashOnly(args.options.toDateTime)) {
             return 'The toDateTime is not a valid ISO date string (YYYY-MM-DD)';
         }
         if (Math.ceil((new Date(args.options.toDateTime || new Date().toISOString()).getTime() - new Date(args.options.fromDateTime).getTime()) / (1000 * 3600 * 24)) > 90) {

package/dist/m365/teams/commands/report/report-pstncalls.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsReportPstncallsCommand_instances, _TeamsReportPstncallsCommand_initTelemetry, _TeamsReportPstncallsCommand_initOptions, _TeamsReportPstncallsCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsReportPstncallsCommand extends GraphCommand_1.default {
@@ -38,9 +39,9 @@ class TeamsReportPstncallsCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const toDateTimeParameter = encodeURIComponent(args.options.toDateTime ? args.options.toDateTime : new Date().toISOString());
+            const toDateTimeParameter = formatting_1.formatting.encodeQueryParameter(args.options.toDateTime ? args.options.toDateTime : new Date().toISOString());
             const requestOptions = {
-                url: `${this.resource}/v1.0/communications/callRecords/getPstnCalls(fromDateTime=${encodeURIComponent(args.options.fromDateTime)},toDateTime=${toDateTimeParameter})`,
+                url: `${this.resource}/v1.0/communications/callRecords/getPstnCalls(fromDateTime=${formatting_1.formatting.encodeQueryParameter(args.options.fromDateTime)},toDateTime=${toDateTimeParameter})`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -70,11 +71,11 @@ _TeamsReportPstncallsCommand_instances = new WeakSet(), _TeamsReportPstncallsCom
     });
 }, _TeamsReportPstncallsCommand_initValidators = function _TeamsReportPstncallsCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidISODateDashOnly(args.options.fromDateTime)) {
+        if (!validation_1.validation.isValidISODateDashOnly(args.options.fromDateTime)) {
             return 'The fromDateTime is not a valid ISO date string (YYYY-MM-DD)';
         }
         if (args.options.toDateTime &&
-            !utils_1.validation.isValidISODateDashOnly(args.options.toDateTime)) {
+            !validation_1.validation.isValidISODateDashOnly(args.options.toDateTime)) {
             return 'The toDateTime is not a valid ISO date string (YYYY-MM-DD)';
         }
         if (Math.ceil((new Date(args.options.toDateTime || new Date().toISOString()).getTime() - new Date(args.options.fromDateTime).getTime()) / (1000 * 3600 * 24)) > 90) {

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsTabAddCommand_instances, _TeamsTabAddCommand_initTelemetry, _TeamsTabAddCommand_initOptions, _TeamsTabAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsTabAddCommand extends GraphCommand_1.default {
@@ -40,7 +41,7 @@ class TeamsTabAddCommand extends GraphCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const data = this.mapRequestBody(args.options);
             const requestOptions = {
-                url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels/${args.options.channelId}/tabs`,
+                url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(args.options.teamId)}/channels/${args.options.channelId}/tabs`,
                 headers: {
                     accept: 'application/json;odata.metadata=none',
                     'content-type': 'application/json;odata=nometadata'
@@ -121,10 +122,10 @@ _TeamsTabAddCommand_instances = new WeakSet(), _TeamsTabAddCommand_initTelemetry
     });
 }, _TeamsTabAddCommand_initValidators = function _TeamsTabAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (!validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (!utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
+        if (!validation_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams ChannelId`;
         }
         return true;

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

@@ -16,10 +16,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 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");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsTabGetCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -55,7 +56,7 @@ class TeamsTabGetCommand extends GraphCommand_1.default {
             return Promise.resolve(args.options.channelId);
         }
         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/${formatting_1.formatting.encodeQueryParameter(this.teamId)}/channels?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.channelName)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -76,7 +77,7 @@ class TeamsTabGetCommand extends GraphCommand_1.default {
             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.name)}'`,
+            url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(this.teamId)}/channels/${formatting_1.formatting.encodeQueryParameter(this.channelId)}/tabs?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -98,7 +99,7 @@ class TeamsTabGetCommand extends GraphCommand_1.default {
                 this.teamId = yield this.getTeamId(args);
                 this.channelId = yield this.getChannelId(args);
                 const tabId = yield this.getTabId(args);
-                const endpoint = `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels/${encodeURIComponent(this.channelId)}/tabs/${encodeURIComponent(tabId)}`;
+                const endpoint = `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(this.teamId)}/channels/${formatting_1.formatting.encodeQueryParameter(this.channelId)}/tabs/${formatting_1.formatting.encodeQueryParameter(tabId)}`;
                 const requestOptions = {
                     url: endpoint,
                     headers: {
@@ -142,13 +143,13 @@ _TeamsTabGetCommand_instances = new WeakSet(), _TeamsTabGetCommand_initTelemetry
     });
 }, _TeamsTabGetCommand_initValidators = function _TeamsTabGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.channelId && !utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
+        if (args.options.channelId && !validation_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams channel id`;
         }
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.tabId} is not a valid GUID`;
         }
         return true;

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

@@ -15,7 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsTabListCommand_instances, _TeamsTabListCommand_initOptions, _TeamsTabListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsTabListCommand extends GraphCommand_1.default {
@@ -36,9 +38,9 @@ class TeamsTabListCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const endpoint = `${this.resource}/v1.0/teams/${args.options.teamId}/channels/${encodeURIComponent(args.options.channelId)}/tabs?$expand=teamsApp`;
+            const endpoint = `${this.resource}/v1.0/teams/${args.options.teamId}/channels/${formatting_1.formatting.encodeQueryParameter(args.options.channelId)}/tabs?$expand=teamsApp`;
             try {
-                const items = yield utils_1.odata.getAllItems(endpoint);
+                const items = yield odata_1.odata.getAllItems(endpoint);
                 items.forEach(i => {
                     i.teamsAppTabId = i.teamsApp.id;
                 });
@@ -58,10 +60,10 @@ _TeamsTabListCommand_instances = new WeakSet(), _TeamsTabListCommand_initOptions
     });
 }, _TeamsTabListCommand_initValidators = function _TeamsTabListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (!validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (!utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
+        if (!validation_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams ChannelId`;
         }
         return true;

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

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsTabRemoveCommand_instances, _TeamsTabRemoveCommand_initTelemetry, _TeamsTabRemoveCommand_initOptions, _TeamsTabRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsTabRemoveCommand extends GraphCommand_1.default {
@@ -38,7 +39,7 @@ class TeamsTabRemoveCommand extends GraphCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const removeTab = () => __awaiter(this, void 0, void 0, function* () {
                 const requestOptions = {
-                    url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels/${args.options.channelId}/tabs/${encodeURIComponent(args.options.id)}`,
+                    url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(args.options.teamId)}/channels/${args.options.channelId}/tabs/${formatting_1.formatting.encodeQueryParameter(args.options.id)}`,
                     headers: {
                         accept: "application/json;odata.metadata=none"
                     },
@@ -55,7 +56,7 @@ class TeamsTabRemoveCommand extends GraphCommand_1.default {
                 yield removeTab();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -86,13 +87,13 @@ _TeamsTabRemoveCommand_instances = new WeakSet(), _TeamsTabRemoveCommand_initTel
     });
 }, _TeamsTabRemoveCommand_initValidators = function _TeamsTabRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (!validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (!utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
+        if (!validation_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams ChannelId`;
         }
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_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

@@ -13,13 +13,14 @@ 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 _TeamsTeamArchiveCommand_instances, _TeamsTeamArchiveCommand_initTelemetry, _TeamsTeamArchiveCommand_initOptions, _TeamsTeamArchiveCommand_initValidators;
+var _TeamsTeamArchiveCommand_instances, _TeamsTeamArchiveCommand_initTelemetry, _TeamsTeamArchiveCommand_initOptions, _TeamsTeamArchiveCommand_initValidators, _TeamsTeamArchiveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsTeamArchiveCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -27,6 +28,7 @@ class TeamsTeamArchiveCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsTeamArchiveCommand_instances, "m", _TeamsTeamArchiveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsTeamArchiveCommand_instances, "m", _TeamsTeamArchiveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsTeamArchiveCommand_instances, "m", _TeamsTeamArchiveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsTeamArchiveCommand_instances, "m", _TeamsTeamArchiveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TEAM_ARCHIVE;
@@ -53,7 +55,7 @@ class TeamsTeamArchiveCommand extends GraphCommand_1.default {
             try {
                 const teamId = yield this.getTeamId(args);
                 const requestOptions = {
-                    url: `${this.resource}/v1.0/teams/${encodeURIComponent(teamId)}/archive`,
+                    url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(teamId)}/archive`,
                     headers: {
                         'content-type': 'application/json;odata=nometadata',
                         'accept': 'application/json;odata.metadata=none'
@@ -89,17 +91,13 @@ _TeamsTeamArchiveCommand_instances = new WeakSet(), _TeamsTeamArchiveCommand_ini
     });
 }, _TeamsTeamArchiveCommand_initValidators = function _TeamsTeamArchiveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.id && !args.options.name) {
-            return 'Specify either id or name';
-        }
-        if (args.options.name && args.options.id) {
-            return 'Specify either id or name but not both';
-        }
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));
+}, _TeamsTeamArchiveCommand_initOptionSets = function _TeamsTeamArchiveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 };
 module.exports = new TeamsTeamArchiveCommand();
 //# sourceMappingURL=team-archive.js.map

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsTeamCloneCommand_instances, _TeamsTeamCloneCommand_initTelemetry, _TeamsTeamCloneCommand_initOptions, _TeamsTeamCloneCommand_initValidators, _TeamsTeamCloneCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsTeamCloneCommand extends GraphCommand_1.default {
@@ -51,7 +52,7 @@ class TeamsTeamCloneCommand extends GraphCommand_1.default {
                 data.visibility = args.options.visibility;
             }
             const requestOptions = {
-                url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.id)}/clone`,
+                url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(args.options.id)}/clone`,
                 headers: {
                     "content-type": "application/json",
                     accept: 'application/json;odata.metadata=none'
@@ -110,7 +111,7 @@ _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.id && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         const partsToClone = args.options.partsToClone.replace(/\s/g, '').split(',');

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

@@ -16,10 +16,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 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");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsTeamGetCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -53,7 +54,7 @@ class TeamsTeamGetCommand extends GraphCommand_1.default {
             try {
                 const teamId = yield this.getTeamId(args);
                 const requestOptions = {
-                    url: `${this.resource}/v1.0/teams/${encodeURIComponent(teamId)}`,
+                    url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(teamId)}`,
                     headers: {
                         accept: 'application/json;odata.metadata=none'
                     },
@@ -83,7 +84,7 @@ _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 && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsTeamListCommand_instances, _TeamsTeamListCommand_initTelemetry, _TeamsTeamListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsTeamListCommand extends GraphCommand_1.default {
@@ -39,7 +39,7 @@ class TeamsTeamListCommand extends GraphCommand_1.default {
                 endpoint = `${this.resource}/v1.0/me/joinedTeams`;
             }
             try {
-                const items = yield utils_1.odata.getAllItems(endpoint);
+                const items = yield odata_1.odata.getAllItems(endpoint);
                 if (args.options.joined) {
                     logger.log(items);
                 }

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

@@ -13,14 +13,15 @@ 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_initOptionSets, _TeamsTeamRemoveCommand_initValidators;
+var _TeamsTeamRemoveCommand_instances, _TeamsTeamRemoveCommand_initTelemetry, _TeamsTeamRemoveCommand_initOptions, _TeamsTeamRemoveCommand_initValidators, _TeamsTeamRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsTeamRemoveCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -55,7 +56,7 @@ class TeamsTeamRemoveCommand extends GraphCommand_1.default {
                 try {
                     const teamId = yield this.getTeamId(args);
                     const requestOptions = {
-                        url: `${this.resource}/v1.0/groups/${encodeURIComponent(teamId)}`,
+                        url: `${this.resource}/v1.0/groups/${formatting_1.formatting.encodeQueryParameter(teamId)}`,
                         headers: {
                             accept: 'application/json;odata.metadata=none'
                         },
@@ -71,7 +72,7 @@ class TeamsTeamRemoveCommand extends GraphCommand_1.default {
                 yield removeTeam();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -98,15 +99,15 @@ _TeamsTeamRemoveCommand_instances = new WeakSet(), _TeamsTeamRemoveCommand_initT
     }, {
         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 && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));
+}, _TeamsTeamRemoveCommand_initOptionSets = function _TeamsTeamRemoveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 };
 module.exports = new TeamsTeamRemoveCommand();
 //# sourceMappingURL=team-remove.js.map