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

package/dist/m365/aad/commands/app/app-role-remove.js

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadAppRoleRemoveCommand_instances, _AadAppRoleRemoveCommand_initTelemetry, _AadAppRoleRemoveCommand_initOptions, _AadAppRoleRemoveCommand_initValidators, _AadAppRoleRemoveCommand_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 formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppRoleRemoveCommand extends GraphCommand_1.default {
@@ -49,7 +50,7 @@ class AadAppRoleRemoveCommand extends GraphCommand_1.default {
                 yield deleteAppRole();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -150,8 +151,8 @@ class AadAppRoleRemoveCommand extends GraphCommand_1.default {
             logger.logToStderr(`Retrieving information about Azure AD app ${appId ? appId : appName}...`);
         }
         const filter = appId ?
-            `appId eq '${encodeURIComponent(appId)}'` :
-            `displayName eq '${encodeURIComponent(appName)}'`;
+            `appId eq '${formatting_1.formatting.encodeQueryParameter(appId)}'` :
+            `displayName eq '${formatting_1.formatting.encodeQueryParameter(appName)}'`;
         const requestOptions = {
             url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
             headers: {
@@ -189,7 +190,7 @@ _AadAppRoleRemoveCommand_instances = new WeakSet(), _AadAppRoleRemoveCommand_ini
 }, _AadAppRoleRemoveCommand_initValidators = function _AadAppRoleRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id) {
-            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`;
             }
         }

package/dist/m365/aad/commands/app/app-set.js

@@ -17,6 +17,7 @@ var _AadAppSetCommand_instances, _AadAppSetCommand_initTelemetry, _AadAppSetComm
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppSetCommand extends GraphCommand_1.default {
@@ -56,8 +57,8 @@ class AadAppSetCommand extends GraphCommand_1.default {
             logger.logToStderr(`Retrieving information about Azure AD app ${appId ? appId : name}...`);
         }
         const filter = appId ?
-            `appId eq '${encodeURIComponent(appId)}'` :
-            `displayName eq '${encodeURIComponent(name)}'`;
+            `appId eq '${formatting_1.formatting.encodeQueryParameter(appId)}'` :
+            `displayName eq '${formatting_1.formatting.encodeQueryParameter(name)}'`;
         const requestOptions = {
             url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
             headers: {

package/dist/m365/aad/commands/approleassignment/approleassignment-add.js

@@ -17,7 +17,8 @@ var _AadAppRoleAssignmentAddCommand_instances, _AadAppRoleAssignmentAddCommand_i
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 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 AadAppRoleAssignmentAddCommand extends GraphCommand_1.default {
@@ -40,13 +41,13 @@ class AadAppRoleAssignmentAddCommand extends GraphCommand_1.default {
             let objectId = '';
             let queryFilter = '';
             if (args.options.appId) {
-                queryFilter = `$filter=appId eq '${encodeURIComponent(args.options.appId)}'`;
+                queryFilter = `$filter=appId eq '${formatting_1.formatting.encodeQueryParameter(args.options.appId)}'`;
             }
             else if (args.options.appObjectId) {
-                queryFilter = `$filter=id eq '${encodeURIComponent(args.options.appObjectId)}'`;
+                queryFilter = `$filter=id eq '${formatting_1.formatting.encodeQueryParameter(args.options.appObjectId)}'`;
             }
             else {
-                queryFilter = `$filter=displayName eq '${encodeURIComponent(args.options.appDisplayName)}'`;
+                queryFilter = `$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.appDisplayName)}'`;
             }
             const getServicePrinciplesRequestOptions = {
                 url: `${this.resource}/v1.0/servicePrincipals?${queryFilter}`,
@@ -61,7 +62,7 @@ class AadAppRoleAssignmentAddCommand extends GraphCommand_1.default {
                     throw 'More than one service principal found. Please use the appId or appObjectId option to make sure the right service principal is specified.';
                 }
                 objectId = servicePrincipalResult.value[0].id;
-                let resource = encodeURIComponent(args.options.resource);
+                let resource = formatting_1.formatting.encodeQueryParameter(args.options.resource);
                 // try resolve aliases that the user might enter since these are seen in the Azure portal
                 switch (args.options.resource.toLocaleLowerCase()) {
                     case 'sharepoint':
@@ -76,7 +77,7 @@ class AadAppRoleAssignmentAddCommand extends GraphCommand_1.default {
                 }
                 // will perform resource name, appId or objectId search
                 let filter = `$filter=(displayName eq '${resource}' or startswith(displayName,'${resource}'))`;
-                if (utils_1.validation.isValidGuid(resource)) {
+                if (validation_1.validation.isValidGuid(resource)) {
                     filter += ` or appId eq '${resource}' or id eq '${resource}'`;
                 }
                 const requestOptions = {
@@ -176,10 +177,10 @@ _AadAppRoleAssignmentAddCommand_instances = new WeakSet(), _AadAppRoleAssignment
     });
 }, _AadAppRoleAssignmentAddCommand_initValidators = function _AadAppRoleAssignmentAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        if (args.options.appObjectId && !utils_1.validation.isValidGuid(args.options.appObjectId)) {
+        if (args.options.appObjectId && !validation_1.validation.isValidGuid(args.options.appObjectId)) {
             return `${args.options.appObjectId} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/approleassignment/approleassignment-list.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadAppRoleAssignmentListCommand_instances, _AadAppRoleAssignmentListCommand_initTelemetry, _AadAppRoleAssignmentListCommand_initOptions, _AadAppRoleAssignmentListCommand_initValidators, _AadAppRoleAssignmentListCommand_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 AadAppRoleAssignmentListCommand extends GraphCommand_1.default {
@@ -95,10 +96,10 @@ class AadAppRoleAssignmentListCommand extends GraphCommand_1.default {
                 // Use existing way to get service principal object
                 let spMatchQuery = '';
                 if (argOptions.appId) {
-                    spMatchQuery = `appId eq '${encodeURIComponent(argOptions.appId)}'`;
+                    spMatchQuery = `appId eq '${formatting_1.formatting.encodeQueryParameter(argOptions.appId)}'`;
                 }
                 else {
-                    spMatchQuery = `displayName eq '${encodeURIComponent(argOptions.appDisplayName)}'`;
+                    spMatchQuery = `displayName eq '${formatting_1.formatting.encodeQueryParameter(argOptions.appDisplayName)}'`;
                 }
                 this.getServicePrincipalForApp(spMatchQuery)
                     .then((resp) => {
@@ -162,10 +163,10 @@ _AadAppRoleAssignmentListCommand_instances = new WeakSet(), _AadAppRoleAssignmen
     });
 }, _AadAppRoleAssignmentListCommand_initValidators = function _AadAppRoleAssignmentListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        if (args.options.appObjectId && !utils_1.validation.isValidGuid(args.options.appObjectId)) {
+        if (args.options.appObjectId && !validation_1.validation.isValidGuid(args.options.appObjectId)) {
             return `${args.options.appObjectId} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/approleassignment/approleassignment-remove.js

@@ -16,9 +16,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadAppRoleAssignmentRemoveCommand_instances, _AadAppRoleAssignmentRemoveCommand_initTelemetry, _AadAppRoleAssignmentRemoveCommand_initOptions, _AadAppRoleAssignmentRemoveCommand_initValidators, _AadAppRoleAssignmentRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
-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 AadAppRoleAssignmentRemoveCommand extends GraphCommand_1.default {
@@ -43,13 +44,13 @@ class AadAppRoleAssignmentRemoveCommand extends GraphCommand_1.default {
                 // get the service principal associated with the appId
                 let spMatchQuery = '';
                 if (args.options.appId) {
-                    spMatchQuery = `appId eq '${encodeURIComponent(args.options.appId)}'`;
+                    spMatchQuery = `appId eq '${formatting_1.formatting.encodeQueryParameter(args.options.appId)}'`;
                 }
                 else if (args.options.appObjectId) {
-                    spMatchQuery = `id eq '${encodeURIComponent(args.options.appObjectId)}'`;
+                    spMatchQuery = `id eq '${formatting_1.formatting.encodeQueryParameter(args.options.appObjectId)}'`;
                 }
                 else {
-                    spMatchQuery = `displayName eq '${encodeURIComponent(args.options.appDisplayName)}'`;
+                    spMatchQuery = `displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.appDisplayName)}'`;
                 }
                 try {
                     let resp = yield this.getServicePrincipalForApp(spMatchQuery);
@@ -57,7 +58,7 @@ class AadAppRoleAssignmentRemoveCommand extends GraphCommand_1.default {
                         throw 'app registration not found';
                     }
                     sp = resp.value[0];
-                    let resource = encodeURIComponent(args.options.resource);
+                    let resource = formatting_1.formatting.encodeQueryParameter(args.options.resource);
                     // try resolve aliases that the user might enter since these are seen in the Azure portal
                     switch (args.options.resource.toLocaleLowerCase()) {
                         case 'sharepoint':
@@ -72,7 +73,7 @@ class AadAppRoleAssignmentRemoveCommand extends GraphCommand_1.default {
                     }
                     // will perform resource name, appId or objectId search
                     let filter = `$filter=(displayName eq '${resource}' or startswith(displayName,'${resource}'))`;
-                    if (utils_1.validation.isValidGuid(resource)) {
+                    if (validation_1.validation.isValidGuid(resource)) {
                         filter += ` or appId eq '${resource}' or id eq '${resource}'`;
                     }
                     const requestOptions = {
@@ -122,7 +123,7 @@ class AadAppRoleAssignmentRemoveCommand extends GraphCommand_1.default {
                 yield removeAppRoleAssignment();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -181,10 +182,10 @@ _AadAppRoleAssignmentRemoveCommand_instances = new WeakSet(), _AadAppRoleAssignm
     });
 }, _AadAppRoleAssignmentRemoveCommand_initValidators = function _AadAppRoleAssignmentRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        if (args.options.appObjectId && !utils_1.validation.isValidGuid(args.options.appObjectId)) {
+        if (args.options.appObjectId && !validation_1.validation.isValidGuid(args.options.appObjectId)) {
             return `${args.options.appObjectId} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/group/group-list.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadGroupListCommand_instances, _AadGroupListCommand_initTelemetry, _AadGroupListCommand_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 AadGroupListCommand extends GraphCommand_1.default {
@@ -38,7 +38,7 @@ class AadGroupListCommand extends GraphCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const endpoint = args.options.deleted ? 'directory/deletedItems/microsoft.graph.group' : 'groups';
             try {
-                const groups = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/${endpoint}`);
+                const groups = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/${endpoint}`);
                 if (args.options.output === 'text') {
                     groups.forEach((group) => {
                         if (group.groupTypes && group.groupTypes.length > 0 && group.groupTypes[0] === 'Unified') {

package/dist/m365/aad/commands/groupsetting/groupsetting-add.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadGroupSettingAddCommand_instances, _AadGroupSettingAddCommand_initOptions, _AadGroupSettingAddCommand_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 AadGroupSettingAddCommand extends GraphCommand_1.default {
@@ -102,7 +102,7 @@ _AadGroupSettingAddCommand_instances = new WeakSet(), _AadGroupSettingAddCommand
     });
 }, _AadGroupSettingAddCommand_initValidators = function _AadGroupSettingAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.templateId)) {
+        if (!validation_1.validation.isValidGuid(args.options.templateId)) {
             return `${args.options.templateId} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/groupsetting/groupsetting-get.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadGroupSettingGetCommand_instances, _AadGroupSettingGetCommand_initOptions, _AadGroupSettingGetCommand_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 AadGroupSettingGetCommand extends GraphCommand_1.default {
@@ -57,7 +57,7 @@ _AadGroupSettingGetCommand_instances = new WeakSet(), _AadGroupSettingGetCommand
     });
 }, _AadGroupSettingGetCommand_initValidators = function _AadGroupSettingGetCommand_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`;
         }
         return true;

package/dist/m365/aad/commands/groupsetting/groupsetting-list.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 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 AadGroupSettingListCommand extends GraphCommand_1.default {
@@ -25,7 +25,7 @@ class AadGroupSettingListCommand extends GraphCommand_1.default {
     commandAction(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const groupSettings = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/groupSettings`);
+                const groupSettings = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/groupSettings`);
                 logger.log(groupSettings);
             }
             catch (err) {

package/dist/m365/aad/commands/groupsetting/groupsetting-remove.js

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadGroupSettingRemoveCommand_instances, _AadGroupSettingRemoveCommand_initTelemetry, _AadGroupSettingRemoveCommand_initOptions, _AadGroupSettingRemoveCommand_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 AadGroupSettingRemoveCommand extends GraphCommand_1.default {
@@ -57,7 +57,7 @@ class AadGroupSettingRemoveCommand extends GraphCommand_1.default {
                 yield removeGroupSetting();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -84,7 +84,7 @@ _AadGroupSettingRemoveCommand_instances = new WeakSet(), _AadGroupSettingRemoveC
     });
 }, _AadGroupSettingRemoveCommand_initValidators = function _AadGroupSettingRemoveCommand_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`;
         }
         return true;

package/dist/m365/aad/commands/groupsetting/groupsetting-set.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadGroupSettingSetCommand_instances, _AadGroupSettingSetCommand_initOptions, _AadGroupSettingSetCommand_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 AadGroupSettingSetCommand extends GraphCommand_1.default {
@@ -102,7 +102,7 @@ _AadGroupSettingSetCommand_instances = new WeakSet(), _AadGroupSettingSetCommand
     });
 }, _AadGroupSettingSetCommand_initValidators = function _AadGroupSettingSetCommand_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`;
         }
         return true;

package/dist/m365/aad/commands/groupsettingtemplate/groupsettingtemplate-get.js

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadGroupSettingTemplateGetCommand_instances, _AadGroupSettingTemplateGetCommand_initTelemetry, _AadGroupSettingTemplateGetCommand_initOptions, _AadGroupSettingTemplateGetCommand_initValidators, _AadGroupSettingTemplateGetCommand_initOptionSets;
 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 AadGroupSettingTemplateGetCommand extends GraphCommand_1.default {
@@ -36,7 +37,7 @@ class AadGroupSettingTemplateGetCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const templates = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/groupSettingTemplates`);
+                const templates = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/groupSettingTemplates`);
                 const groupSettingTemplate = templates.filter(t => args.options.id ? t.id === args.options.id : t.displayName === args.options.displayName);
                 if (groupSettingTemplate && groupSettingTemplate.length > 0) {
                     logger.log(groupSettingTemplate.pop());
@@ -67,7 +68,7 @@ _AadGroupSettingTemplateGetCommand_instances = new WeakSet(), _AadGroupSettingTe
 }, _AadGroupSettingTemplateGetCommand_initValidators = function _AadGroupSettingTemplateGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id &&
-            !utils_1.validation.isValidGuid(args.options.id)) {
+            !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/groupsettingtemplate/groupsettingtemplate-list.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 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 AadGroupSettingTemplateListCommand extends GraphCommand_1.default {
@@ -25,7 +25,7 @@ class AadGroupSettingTemplateListCommand extends GraphCommand_1.default {
     commandAction(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const templates = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/groupSettingTemplates`);
+                const templates = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/groupSettingTemplates`);
                 logger.log(templates);
             }
             catch (err) {

package/dist/m365/aad/commands/o365group/o365group-add.js

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 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 AadO365GroupAddCommand extends GraphCommand_1.default {
@@ -146,7 +146,7 @@ class AadO365GroupAddCommand extends GraphCommand_1.default {
         let userIds = [];
         promises = userArr.map(user => {
             const requestOptions = {
-                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${utils_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
+                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${formatting_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
                 headers: {
                     'content-type': 'application/json'
                 },

package/dist/m365/aad/commands/o365group/o365group-conversation-list.js

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadO365GroupConversationListCommand_instances, _AadO365GroupConversationListCommand_initOptions, _AadO365GroupConversationListCommand_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 AadO365GroupConversationListCommand extends GraphCommand_1.default {
@@ -37,7 +38,7 @@ class AadO365GroupConversationListCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const conversations = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/groups/${args.options.groupId}/conversations`);
+                const conversations = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/groups/${args.options.groupId}/conversations`);
                 logger.log(conversations);
             }
             catch (err) {
@@ -52,7 +53,7 @@ _AadO365GroupConversationListCommand_instances = new WeakSet(), _AadO365GroupCon
     });
 }, _AadO365GroupConversationListCommand_initValidators = function _AadO365GroupConversationListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.groupId)) {
+        if (!validation_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/o365group/o365group-conversation-post-list.js

@@ -15,10 +15,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadO365GroupConversationPostListCommand_instances, _AadO365GroupConversationPostListCommand_initTelemetry, _AadO365GroupConversationPostListCommand_initOptions, _AadO365GroupConversationPostListCommand_initValidators, _AadO365GroupConversationPostListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
+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 AadO365GroupConversationPostListCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -41,7 +43,7 @@ class AadO365GroupConversationPostListCommand extends GraphCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const retrievedgroupId = yield this.getGroupId(args);
-                const posts = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/groups/${retrievedgroupId}/threads/${args.options.threadId}/posts`);
+                const posts = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/groups/${retrievedgroupId}/threads/${args.options.threadId}/posts`);
                 logger.log(posts);
             }
             catch (err) {
@@ -51,7 +53,7 @@ class AadO365GroupConversationPostListCommand extends GraphCommand_1.default {
     }
     getGroupId(args) {
         if (args.options.groupId) {
-            return Promise.resolve(encodeURIComponent(args.options.groupId));
+            return Promise.resolve(formatting_1.formatting.encodeQueryParameter(args.options.groupId));
         }
         return aadGroup_1.aadGroup
             .getGroupByDisplayName(args.options.groupDisplayName)
@@ -75,7 +77,7 @@ _AadO365GroupConversationPostListCommand_instances = new WeakSet(), _AadO365Grou
     });
 }, _AadO365GroupConversationPostListCommand_initValidators = function _AadO365GroupConversationPostListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.groupId && !utils_1.validation.isValidGuid(args.options.groupId)) {
+        if (args.options.groupId && !validation_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/o365group/o365group-get.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadO365GroupGetCommand_instances, _AadO365GroupGetCommand_initOptions, _AadO365GroupGetCommand_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");
@@ -65,7 +65,7 @@ _AadO365GroupGetCommand_instances = new WeakSet(), _AadO365GroupGetCommand_initO
     });
 }, _AadO365GroupGetCommand_initValidators = function _AadO365GroupGetCommand_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`;
         }
         return true;

package/dist/m365/aad/commands/o365group/o365group-list.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadO365GroupListCommand_instances, _AadO365GroupListCommand_initTelemetry, _AadO365GroupListCommand_initOptions, _AadO365GroupListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupListCommand extends GraphCommand_1.default {
@@ -39,8 +40,8 @@ class AadO365GroupListCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const groupFilter = `?$filter=groupTypes/any(c:c+eq+'Unified')`;
-            const displayNameFilter = args.options.displayName ? ` and startswith(DisplayName,'${encodeURIComponent(args.options.displayName).replace(/'/g, `''`)}')` : '';
-            const mailNicknameFilter = args.options.mailNickname ? ` and startswith(MailNickname,'${encodeURIComponent(args.options.mailNickname).replace(/'/g, `''`)}')` : '';
+            const displayNameFilter = args.options.displayName ? ` and startswith(DisplayName,'${formatting_1.formatting.encodeQueryParameter(args.options.displayName)}')` : '';
+            const mailNicknameFilter = args.options.mailNickname ? ` and startswith(MailNickname,'${formatting_1.formatting.encodeQueryParameter(args.options.mailNickname)}')` : '';
             const expandOwners = args.options.orphaned ? '&$expand=owners' : '';
             const topCount = '&$top=100';
             let endpoint = `${this.resource}/v1.0/groups${groupFilter}${displayNameFilter}${mailNicknameFilter}${expandOwners}${topCount}`;
@@ -49,7 +50,7 @@ class AadO365GroupListCommand extends GraphCommand_1.default {
             }
             try {
                 let groups = [];
-                groups = yield utils_1.odata.getAllItems(endpoint);
+                groups = yield odata_1.odata.getAllItems(endpoint);
                 if (args.options.orphaned) {
                     const orphanedGroups = [];
                     groups.forEach((group) => {

package/dist/m365/aad/commands/o365group/o365group-recyclebinitem-clear.js

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadO365GroupRecycleBinItemClearCommand_instances, _AadO365GroupRecycleBinItemClearCommand_initTelemetry, _AadO365GroupRecycleBinItemClearCommand_initOptions;
 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 odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupRecycleBinItemClearCommand extends GraphCommand_1.default {
@@ -47,7 +47,7 @@ class AadO365GroupRecycleBinItemClearCommand extends GraphCommand_1.default {
                 yield clearO365GroupRecycleBinItems();
             }
             else {
-                const response = yield cli_1.Cli.prompt({
+                const response = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -63,7 +63,7 @@ class AadO365GroupRecycleBinItemClearCommand extends GraphCommand_1.default {
         const filter = `?$filter=groupTypes/any(c:c+eq+'Unified')`;
         const topCount = '&$top=100';
         const endpoint = `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group${filter}${topCount}`;
-        return utils_1.odata
+        return odata_1.odata
             .getAllItems(endpoint)
             .then((recycleBinItems) => {
             if (recycleBinItems.length === 0) {

package/dist/m365/aad/commands/o365group/o365group-recyclebinitem-list.js

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadO365GroupRecycleBinItemListCommand_instances, _AadO365GroupRecycleBinItemListCommand_initTelemetry, _AadO365GroupRecycleBinItemListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupRecycleBinItemListCommand extends GraphCommand_1.default {
@@ -38,11 +39,11 @@ class AadO365GroupRecycleBinItemListCommand extends GraphCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const filter = `?$filter=groupTypes/any(c:c+eq+'Unified')`;
-                const displayNameFilter = args.options.groupDisplayName ? ` and startswith(DisplayName,'${encodeURIComponent(args.options.groupDisplayName).replace(/'/g, `''`)}')` : '';
-                const mailNicknameFilter = args.options.groupMailNickname ? ` and startswith(MailNickname,'${encodeURIComponent(args.options.groupMailNickname).replace(/'/g, `''`)}')` : '';
+                const displayNameFilter = args.options.groupDisplayName ? ` and startswith(DisplayName,'${formatting_1.formatting.encodeQueryParameter(args.options.groupDisplayName).replace(/'/g, `''`)}')` : '';
+                const mailNicknameFilter = args.options.groupMailNickname ? ` and startswith(MailNickname,'${formatting_1.formatting.encodeQueryParameter(args.options.groupMailNickname).replace(/'/g, `''`)}')` : '';
                 const topCount = '&$top=100';
                 const endpoint = `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group${filter}${displayNameFilter}${mailNicknameFilter}${topCount}`;
-                const recycleBinItems = yield utils_1.odata.getAllItems(endpoint);
+                const recycleBinItems = yield odata_1.odata.getAllItems(endpoint);
                 logger.log(recycleBinItems);
             }
             catch (err) {