@pnp/cli-microsoft365 6.0.0-beta.566a6b8 → 6.0.0-beta.636d726

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

@@ -16,7 +16,7 @@ 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 validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsReportDirectroutingcallsCommand extends GraphCommand_1.default {
@@ -70,11 +70,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,7 @@ 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 validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsReportPstncallsCommand extends GraphCommand_1.default {
@@ -70,11 +70,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,7 @@ 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 validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsTabAddCommand extends GraphCommand_1.default {
@@ -121,10 +121,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,7 +16,7 @@ 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");
@@ -142,13 +142,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,8 @@ 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 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 {
@@ -38,7 +39,7 @@ class TeamsTabListCommand extends GraphCommand_1.default {
         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`;
             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 +59,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,9 @@ 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 validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsTabRemoveCommand extends GraphCommand_1.default {
@@ -55,7 +55,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 +86,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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsTeamArchiveCommand_instances, _TeamsTeamArchiveCommand_initTelemetry, _TeamsTeamArchiveCommand_initOptions, _TeamsTeamArchiveCommand_initValidators;
 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");
@@ -95,7 +95,7 @@ _TeamsTeamArchiveCommand_instances = new WeakSet(), _TeamsTeamArchiveCommand_ini
         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;

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

@@ -16,7 +16,7 @@ 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 validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsTeamCloneCommand extends GraphCommand_1.default {
@@ -110,7 +110,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,7 +16,7 @@ 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");
@@ -83,7 +83,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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsTeamRemoveCommand_instances, _TeamsTeamRemoveCommand_initTelemetry, _TeamsTeamRemoveCommand_initOptions, _TeamsTeamRemoveCommand_initOptionSets, _TeamsTeamRemoveCommand_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 validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -71,7 +71,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,
@@ -102,7 +102,7 @@ _TeamsTeamRemoveCommand_instances = new WeakSet(), _TeamsTeamRemoveCommand_initT
     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;

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 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");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsTeamSetCommand extends GraphCommand_1.default {
@@ -54,10 +54,6 @@ class TeamsTeamSetCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.displayName) {
-                args.options.name = args.options.displayName;
-                this.warn(logger, `Option 'displayName' is deprecated. Please use 'name' instead.`);
-            }
             const data = this.mapRequestBody(args.options);
             const requestOptions = {
                 url: `${this.resource}/v1.0/groups/${encodeURIComponent(args.options.id)}`,
@@ -87,8 +83,6 @@ _TeamsTeamSetCommand_instances = new WeakSet(), _TeamsTeamSetCommand_initTelemet
         option: '-i, --id [id]'
     }, {
         option: '-n, --name [name]'
-    }, {
-        option: '--displayName [displayName]'
     }, {
         option: '--description [description]'
     }, {
@@ -101,7 +95,7 @@ _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.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`;
         }
         if (args.options.visibility) {
@@ -113,7 +107,6 @@ _TeamsTeamSetCommand_instances = new WeakSet(), _TeamsTeamSetCommand_initTelemet
     }));
 };
 TeamsTeamSetCommand.props = [
-    'displayName',
     'description',
     'mailNickName',
     'classification',

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 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");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -78,7 +78,7 @@ _TeamsTeamUnarchiveCommand_instances = new WeakSet(), _TeamsTeamUnarchiveCommand
     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 && !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/user/user-app-add.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsUserAppAddCommand_instances, _TeamsUserAppAddCommand_initOptions, _TeamsUserAppAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsUserAppAddCommand extends GraphCommand_1.default {
@@ -63,10 +63,10 @@ _TeamsUserAppAddCommand_instances = new WeakSet(), _TeamsUserAppAddCommand_initO
     });
 }, _TeamsUserAppAddCommand_initValidators = function _TeamsUserAppAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        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`;
         }
-        if (!utils_1.validation.isValidGuid(args.options.userId)) {
+        if (!validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
         return true;

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 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");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsUserAppListCommand extends GraphCommand_1.default {
@@ -39,7 +40,7 @@ class TeamsUserAppListCommand extends GraphCommand_1.default {
             try {
                 const userId = (yield this.getUserId(args)).value;
                 const endpoint = `${this.resource}/v1.0/users/${encodeURIComponent(userId)}/teamwork/installedApps?$expand=teamsAppDefinition`;
-                const items = yield utils_1.odata.getAllItems(endpoint);
+                const items = yield odata_1.odata.getAllItems(endpoint);
                 items.forEach(i => {
                     const userAppId = Buffer.from(i.id, 'base64').toString('ascii');
                     const appId = userAppId.substr(userAppId.indexOf("##") + 2, userAppId.length - userId.length - 2);
@@ -93,10 +94,10 @@ _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 && !utils_1.validation.isValidGuid(args.options.userId)) {
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
-        if (args.options.userName && !utils_1.validation.isValidUserPrincipalName(args.options.userName)) {
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
             return `${args.options.userName} is not a valid userName`;
         }
         return true;

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsUserAppRemoveCommand_instances, _TeamsUserAppRemoveCommand_initTelemetry, _TeamsUserAppRemoveCommand_initOptions, _TeamsUserAppRemoveCommand_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 validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsUserAppRemoveCommand extends GraphCommand_1.default {
@@ -56,7 +56,7 @@ class TeamsUserAppRemoveCommand extends GraphCommand_1.default {
                 yield removeApp();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -85,7 +85,7 @@ _TeamsUserAppRemoveCommand_instances = new WeakSet(), _TeamsUserAppRemoveCommand
     });
 }, _TeamsUserAppRemoveCommand_initValidators = function _TeamsUserAppRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.userId)) {
+        if (!validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
         return true;

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

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsUserListCommand_instances, _TeamsUserListCommand_initTelemetry, _TeamsUserListCommand_initOptions, _TeamsUserListCommand_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 TeamsUserListCommand extends GraphCommand_1.default {
@@ -54,7 +55,7 @@ class TeamsUserListCommand extends GraphCommand_1.default {
     }
     getOwners(logger, groupId) {
         const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners?$select=id,displayName,userPrincipalName,userType`;
-        return utils_1.odata.getAllItems(endpoint).then((items) => {
+        return odata_1.odata.getAllItems(endpoint).then((items) => {
             this.items = this.items.concat(items);
             // Currently there is a bug in the Microsoft Graph that returns Owners as
             // userType 'member'. We therefore update all returned user as owner
@@ -65,7 +66,7 @@ class TeamsUserListCommand extends GraphCommand_1.default {
     }
     getMembersAndGuests(logger, groupId) {
         const endpoint = `${this.resource}/v1.0/groups/${groupId}/members?$select=id,displayName,userPrincipalName,userType`;
-        return utils_1.odata.getAllItems(endpoint);
+        return odata_1.odata.getAllItems(endpoint);
     }
 }
 _TeamsUserListCommand_instances = new WeakSet(), _TeamsUserListCommand_initTelemetry = function _TeamsUserListCommand_initTelemetry() {
@@ -83,7 +84,7 @@ _TeamsUserListCommand_instances = new WeakSet(), _TeamsUserListCommand_initTelem
     });
 }, _TeamsUserListCommand_initValidators = function _TeamsUserListCommand_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 (args.options.role) {

package/dist/m365/tenant/commands/id/id-get.js

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const Command_1 = require("../../../../Command");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const accessToken_1 = require("../../../../utils/accessToken");
 const commands_1 = require("../../commands");
 class TenantIdGetCommand extends Command_1.default {
     constructor() {
@@ -37,7 +37,7 @@ class TenantIdGetCommand extends Command_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             let domainName = args.options.domainName;
             if (!domainName) {
-                const userName = utils_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
+                const userName = accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
                 domainName = userName.split('@')[1];
             }
             const requestOptions = {

package/dist/m365/tenant/commands/report/report-office365activationcounts.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TenantReportOffice365ActivationCountsCommand extends GraphCommand_1.default {
@@ -40,7 +40,7 @@ class TenantReportOffice365ActivationCountsCommand extends GraphCommand_1.defaul
                 let content = '';
                 const cleanResponse = this.removeEmptyLines(res);
                 if (output && output.toLowerCase() === 'json') {
-                    content = utils_1.formatting.parseCsvToJson(cleanResponse);
+                    content = formatting_1.formatting.parseCsvToJson(cleanResponse);
                 }
                 else {
                     content = cleanResponse;

package/dist/m365/tenant/commands/report/report-office365activationsusercounts.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TenantReportOffice365ActivationsUserCountsCommand extends GraphCommand_1.default {
@@ -40,7 +40,7 @@ class TenantReportOffice365ActivationsUserCountsCommand extends GraphCommand_1.d
                 let content = '';
                 const cleanResponse = this.removeEmptyLines(res);
                 if (output && output.toLowerCase() === 'json') {
-                    content = utils_1.formatting.parseCsvToJson(cleanResponse);
+                    content = formatting_1.formatting.parseCsvToJson(cleanResponse);
                 }
                 else {
                     content = cleanResponse;

package/dist/m365/tenant/commands/report/report-office365activationsuserdetail.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TenantReportOffice365ActivationsUserDetailCommand extends GraphCommand_1.default {
@@ -40,7 +40,7 @@ class TenantReportOffice365ActivationsUserDetailCommand extends GraphCommand_1.d
                 let content = '';
                 const cleanResponse = this.removeEmptyLines(res);
                 if (output && output.toLowerCase() === 'json') {
-                    content = utils_1.formatting.parseCsvToJson(cleanResponse);
+                    content = formatting_1.formatting.parseCsvToJson(cleanResponse);
                 }
                 else {
                     content = cleanResponse;

package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-healthissue-list.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TenantServiceAnnouncementHealthIssueListCommand_instances, _TenantServiceAnnouncementHealthIssueListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TenantServiceAnnouncementHealthIssueListCommand extends GraphCommand_1.default {
@@ -40,7 +40,7 @@ class TenantServiceAnnouncementHealthIssueListCommand extends GraphCommand_1.def
                 endpoint += `?$filter=service eq '${encodeURIComponent(args.options.service)}'`;
             }
             try {
-                const items = yield utils_1.odata.getAllItems(endpoint);
+                const items = yield odata_1.odata.getAllItems(endpoint);
                 logger.log(items);
             }
             catch (err) {

package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-message-list.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TenantServiceAnnouncementMessageListCommand_instances, _TenantServiceAnnouncementMessageListCommand_initTelemetry, _TenantServiceAnnouncementMessageListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TenantServiceAnnouncementMessageListCommand extends GraphCommand_1.default {
@@ -41,7 +41,7 @@ class TenantServiceAnnouncementMessageListCommand extends GraphCommand_1.default
                 endpoint += `?$filter=services/any(c:c+eq+'${encodeURIComponent(args.options.service)}')`;
             }
             try {
-                const items = yield utils_1.odata.getAllItems(endpoint);
+                const items = yield odata_1.odata.getAllItems(endpoint);
                 logger.log(items);
             }
             catch (err) {