@pnp/cli-microsoft365 5.9.0 → 6.0.0-beta.063a75a

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

@@ -16,6 +16,7 @@ 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 formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -79,8 +80,8 @@ class AadAppRoleAssignmentListCommand extends GraphCommand_1.default {
     }
     getAppRoleAssignments(argOptions) {
         return new Promise((resolve, reject) => {
-            if (argOptions.objectId) {
-                this.getSPAppRoleAssignments(argOptions.objectId)
+            if (argOptions.appObjectId) {
+                this.getSPAppRoleAssignments(argOptions.appObjectId)
                     .then((spAppRoleAssignments) => {
                     if (!spAppRoleAssignments.value.length) {
                         reject('no app role assignments found');
@@ -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.displayName)}'`;
+                    spMatchQuery = `displayName eq '${formatting_1.formatting.encodeQueryParameter(argOptions.appDisplayName)}'`;
                 }
                 this.getServicePrincipalForApp(spMatchQuery)
                     .then((resp) => {
@@ -148,30 +149,30 @@ _AadAppRoleAssignmentListCommand_instances = new WeakSet(), _AadAppRoleAssignmen
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: typeof args.options.appId !== 'undefined',
-            displayName: typeof args.options.displayName !== 'undefined',
-            objectId: typeof args.options.objectId !== 'undefined'
+            appDisplayName: typeof args.options.appDisplayName !== 'undefined',
+            appObjectId: typeof args.options.appObjectId !== 'undefined'
         });
     });
 }, _AadAppRoleAssignmentListCommand_initOptions = function _AadAppRoleAssignmentListCommand_initOptions() {
     this.options.unshift({
         option: '-i, --appId [appId]'
     }, {
-        option: '-n, --displayName [displayName]'
+        option: '-n, --appDisplayName [appDisplayName]'
     }, {
-        option: '--objectId [objectId]'
+        option: '--appObjectId [appObjectId]'
     });
 }, _AadAppRoleAssignmentListCommand_initValidators = function _AadAppRoleAssignmentListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        if (args.options.objectId && !validation_1.validation.isValidGuid(args.options.objectId)) {
-            return `${args.options.objectId} is not a valid GUID`;
+        if (args.options.appObjectId && !validation_1.validation.isValidGuid(args.options.appObjectId)) {
+            return `${args.options.appObjectId} is not a valid GUID`;
         }
         return true;
     }));
 }, _AadAppRoleAssignmentListCommand_initOptionSets = function _AadAppRoleAssignmentListCommand_initOptionSets() {
-    this.optionSets.push(['appId', 'objectId', 'displayName']);
+    this.optionSets.push({ options: ['appId', 'appObjectId', 'appDisplayName'] });
 };
 module.exports = new AadAppRoleAssignmentListCommand();
 //# sourceMappingURL=approleassignment-list.js.map

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

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -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.objectId) {
-                    spMatchQuery = `id eq '${encodeURIComponent(args.options.objectId)}'`;
+                else if (args.options.appObjectId) {
+                    spMatchQuery = `id eq '${formatting_1.formatting.encodeQueryParameter(args.options.appObjectId)}'`;
                 }
                 else {
-                    spMatchQuery = `displayName eq '${encodeURIComponent(args.options.displayName)}'`;
+                    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':
@@ -159,8 +160,8 @@ _AadAppRoleAssignmentRemoveCommand_instances = new WeakSet(), _AadAppRoleAssignm
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: typeof args.options.appId !== 'undefined',
-            displayName: typeof args.options.displayName !== 'undefined',
-            objectId: typeof args.options.objectId !== 'undefined',
+            appDisplayName: typeof args.options.appDisplayName !== 'undefined',
+            appObjectId: typeof args.options.appObjectId !== 'undefined',
             confirm: (!!args.options.confirm).toString()
         });
     });
@@ -168,9 +169,9 @@ _AadAppRoleAssignmentRemoveCommand_instances = new WeakSet(), _AadAppRoleAssignm
     this.options.unshift({
         option: '--appId [appId]'
     }, {
-        option: '--objectId [objectId]'
+        option: '--appObjectId [appObjectId]'
     }, {
-        option: '--displayName [displayName]'
+        option: '--appDisplayName [appDisplayName]'
     }, {
         option: '-r, --resource <resource>',
         autocomplete: ['Microsoft Graph', 'SharePoint', 'OneNote', 'Exchange', 'Microsoft Forms', 'Azure Active Directory Graph', 'Skype for Business']
@@ -184,13 +185,13 @@ _AadAppRoleAssignmentRemoveCommand_instances = new WeakSet(), _AadAppRoleAssignm
         if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        if (args.options.objectId && !validation_1.validation.isValidGuid(args.options.objectId)) {
-            return `${args.options.objectId} is not a valid GUID`;
+        if (args.options.appObjectId && !validation_1.validation.isValidGuid(args.options.appObjectId)) {
+            return `${args.options.appObjectId} is not a valid GUID`;
         }
         return true;
     }));
 }, _AadAppRoleAssignmentRemoveCommand_initOptionSets = function _AadAppRoleAssignmentRemoveCommand_initOptionSets() {
-    this.optionSets.push(['appId', 'objectId', 'displayName']);
+    this.optionSets.push({ options: ['appId', 'appObjectId', 'appDisplayName'] });
 };
 module.exports = new AadAppRoleAssignmentRemoveCommand();
 //# sourceMappingURL=approleassignment-remove.js.map

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

@@ -74,7 +74,7 @@ _AadGroupSettingTemplateGetCommand_instances = new WeakSet(), _AadGroupSettingTe
         return true;
     }));
 }, _AadGroupSettingTemplateGetCommand_initOptionSets = function _AadGroupSettingTemplateGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'displayName']);
+    this.optionSets.push({ options: ['id', 'displayName'] });
 };
 module.exports = new AadGroupSettingTemplateGetCommand();
 //# sourceMappingURL=groupsettingtemplate-get.js.map

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

@@ -72,7 +72,7 @@ class AadO365GroupAddCommand extends GraphCommand_1.default {
                     mailNickname: args.options.mailNickname,
                     resourceBehaviorOptions: resourceBehaviorOptionsCollection,
                     securityEnabled: false,
-                    visibility: args.options.isPrivate === 'true' ? 'Private' : 'Public'
+                    visibility: args.options.isPrivate ? 'Private' : 'Public'
                 }
             };
             try {
@@ -217,7 +217,7 @@ _AadO365GroupAddCommand_instances = new WeakSet(), _AadO365GroupAddCommand_initT
     }, {
         option: '--members [members]'
     }, {
-        option: '--isPrivate [isPrivate]'
+        option: '--isPrivate'
     }, {
         option: '--allowMembersToPost [allowMembersToPost]'
     }, {
@@ -247,11 +247,6 @@ _AadO365GroupAddCommand_instances = new WeakSet(), _AadO365GroupAddCommand_initT
                 }
             }
         }
-        if (typeof args.options.isPrivate !== 'undefined' &&
-            args.options.isPrivate !== 'true' &&
-            args.options.isPrivate !== 'false') {
-            return `${args.options.isPrivate} is not a valid boolean value`;
-        }
         if (args.options.logoPath) {
             const fullPath = path.resolve(args.options.logoPath);
             if (!fs.existsSync(fullPath)) {

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

@@ -20,6 +20,7 @@ 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();
@@ -52,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)
@@ -82,7 +83,7 @@ _AadO365GroupConversationPostListCommand_instances = new WeakSet(), _AadO365Grou
         return true;
     }));
 }, _AadO365GroupConversationPostListCommand_initOptionSets = function _AadO365GroupConversationPostListCommand_initOptionSets() {
-    this.optionSets.push(['groupId', 'groupDisplayName']);
+    this.optionSets.push({ options: ['groupId', 'groupDisplayName'] });
 };
 module.exports = new AadO365GroupConversationPostListCommand();
 //# sourceMappingURL=o365group-conversation-post-list.js.map

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

@@ -16,6 +16,7 @@ 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 formatting_1 = require("../../../../utils/formatting");
 const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -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}`;

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

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadO365GroupRecycleBinItemListCommand_instances, _AadO365GroupRecycleBinItemListCommand_initTelemetry, _AadO365GroupRecycleBinItemListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
+const formatting_1 = require("../../../../utils/formatting");
 const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -38,8 +39,8 @@ 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.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.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 odata_1.odata.getAllItems(endpoint);
@@ -54,15 +55,15 @@ class AadO365GroupRecycleBinItemListCommand extends GraphCommand_1.default {
 _AadO365GroupRecycleBinItemListCommand_instances = new WeakSet(), _AadO365GroupRecycleBinItemListCommand_initTelemetry = function _AadO365GroupRecycleBinItemListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            displayName: typeof args.options.displayName !== 'undefined',
-            mailNickname: typeof args.options.mailNickname !== 'undefined'
+            groupDisplayName: typeof args.options.groupDisplayName !== 'undefined',
+            groupMailNickname: typeof args.options.groupMailNickname !== 'undefined'
         });
     });
 }, _AadO365GroupRecycleBinItemListCommand_initOptions = function _AadO365GroupRecycleBinItemListCommand_initOptions() {
     this.options.unshift({
-        option: '-d, --displayName [displayName]'
+        option: '-d, --groupDisplayName [groupDisplayName]'
     }, {
-        option: '-m, --mailNickname [mailNickname]'
+        option: '-m, --groupMailNickname [groupMailNickname]'
     });
 };
 module.exports = new AadO365GroupRecycleBinItemListCommand();

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

@@ -129,7 +129,7 @@ _AadO365GroupRecycleBinItemRemoveCommand_instances = new WeakSet(), _AadO365Grou
         return true;
     }));
 }, _AadO365GroupRecycleBinItemRemoveCommand_initOptionSets = function _AadO365GroupRecycleBinItemRemoveCommand_initOptionSets() {
-    this.optionSets.push(['id', 'displayName', 'mailNickname']);
+    this.optionSets.push({ options: ['id', 'displayName', 'mailNickname'] });
 };
 module.exports = new AadO365GroupRecycleBinItemRemoveCommand();
 //# sourceMappingURL=o365group-recyclebinitem-remove.js.map

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

@@ -35,9 +35,6 @@ class AadO365GroupRecycleBinItemRestoreCommand extends GraphCommand_1.default {
     get description() {
         return 'Restores a deleted Microsoft 365 Group';
     }
-    alias() {
-        return [commands_1.default.O365GROUP_RESTORE];
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
@@ -117,7 +114,7 @@ _AadO365GroupRecycleBinItemRestoreCommand_instances = new WeakSet(), _AadO365Gro
         return true;
     }));
 }, _AadO365GroupRecycleBinItemRestoreCommand_initOptionSets = function _AadO365GroupRecycleBinItemRestoreCommand_initOptionSets() {
-    this.optionSets.push(['id', 'displayName', 'mailNickname']);
+    this.optionSets.push({ options: ['id', 'displayName', 'mailNickname'] });
 };
 module.exports = new AadO365GroupRecycleBinItemRestoreCommand();
 //# sourceMappingURL=o365group-recyclebinitem-restore.js.map

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadO365GroupTeamifyCommand_instances, _AadO365GroupTeamifyCommand_initTelemetry, _AadO365GroupTeamifyCommand_initOptions, _AadO365GroupTeamifyCommand_initValidators, _AadO365GroupTeamifyCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -35,11 +36,11 @@ class AadO365GroupTeamifyCommand extends GraphCommand_1.default {
         return 'Creates a new Microsoft Teams team under existing Microsoft 365 group';
     }
     getGroupId(args) {
-        if (args.options.groupId) {
-            return Promise.resolve(args.options.groupId);
+        if (args.options.id) {
+            return Promise.resolve(args.options.id);
         }
         const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=mailNickname eq '${encodeURIComponent(args.options.mailNickname)}'`,
+            url: `${this.resource}/v1.0/groups?$filter=mailNickname eq '${formatting_1.formatting.encodeQueryParameter(args.options.mailNickname)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -77,7 +78,7 @@ class AadO365GroupTeamifyCommand extends GraphCommand_1.default {
                 };
                 const groupId = yield this.getGroupId(args);
                 const requestOptions = {
-                    url: `${this.resource}/v1.0/groups/${encodeURIComponent(groupId)}/team`,
+                    url: `${this.resource}/v1.0/groups/${formatting_1.formatting.encodeQueryParameter(groupId)}/team`,
                     headers: {
                         accept: 'application/json;odata.metadata=none'
                     },
@@ -95,25 +96,25 @@ class AadO365GroupTeamifyCommand extends GraphCommand_1.default {
 _AadO365GroupTeamifyCommand_instances = new WeakSet(), _AadO365GroupTeamifyCommand_initTelemetry = function _AadO365GroupTeamifyCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            groupId: typeof args.options.groupId !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
             mailNickname: typeof args.options.mailNickname !== 'undefined'
         });
     });
 }, _AadO365GroupTeamifyCommand_initOptions = function _AadO365GroupTeamifyCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --groupId [groupId]'
+        option: '-i, --id [id]'
     }, {
         option: '--mailNickname [mailNickname]'
     });
 }, _AadO365GroupTeamifyCommand_initValidators = function _AadO365GroupTeamifyCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.groupId && !validation_1.validation.isValidGuid(args.options.groupId)) {
-            return `${args.options.groupId} is not a valid GUID`;
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));
 }, _AadO365GroupTeamifyCommand_initOptionSets = function _AadO365GroupTeamifyCommand_initOptionSets() {
-    this.optionSets.push(['groupId', 'mailNickname']);
+    this.optionSets.push({ options: ['id', 'mailNickname'] });
 };
 module.exports = new AadO365GroupTeamifyCommand();
 //# sourceMappingURL=o365group-teamify.js.map

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadO365GroupUserAddCommand_instances, _AadO365GroupUserAddCommand_initTelemetry, _AadO365GroupUserAddCommand_initOptions, _AadO365GroupUserAddCommand_initValidators, _AadO365GroupUserAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../../teams/commands");
@@ -43,7 +44,7 @@ class AadO365GroupUserAddCommand extends GraphCommand_1.default {
             try {
                 const providedGroupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
                 let requestOptions = {
-                    url: `${this.resource}/v1.0/users/${encodeURIComponent(args.options.userName)}/id`,
+                    url: `${this.resource}/v1.0/users/${formatting_1.formatting.encodeQueryParameter(args.options.userName)}/id`,
                     headers: {
                         accept: 'application/json;odata.metadata=none'
                     },
@@ -102,7 +103,7 @@ _AadO365GroupUserAddCommand_instances = new WeakSet(), _AadO365GroupUserAddComma
         return true;
     }));
 }, _AadO365GroupUserAddCommand_initOptionSets = function _AadO365GroupUserAddCommand_initOptionSets() {
-    this.optionSets.push(['groupId', 'teamId']);
+    this.optionSets.push({ options: ['groupId', 'teamId'] });
 };
 module.exports = new AadO365GroupUserAddCommand();
 //# sourceMappingURL=o365group-user-add.js.map

package/dist/m365/aad/commands/o365group/o365group-user-remove.js

@@ -17,6 +17,7 @@ var _AadO365GroupUserRemoveCommand_instances, _AadO365GroupUserRemoveCommand_ini
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../../teams/commands");
@@ -46,7 +47,7 @@ class AadO365GroupUserRemoveCommand extends GraphCommand_1.default {
                 try {
                     // retrieve user
                     const user = yield request_1.default.get({
-                        url: `${this.resource}/v1.0/users/${encodeURIComponent(args.options.userName)}/id`,
+                        url: `${this.resource}/v1.0/users/${formatting_1.formatting.encodeQueryParameter(args.options.userName)}/id`,
                         headers: {
                             accept: 'application/json;odata.metadata=none'
                         },
@@ -140,7 +141,7 @@ _AadO365GroupUserRemoveCommand_instances = new WeakSet(), _AadO365GroupUserRemov
         return true;
     }));
 }, _AadO365GroupUserRemoveCommand_initOptionSets = function _AadO365GroupUserRemoveCommand_initOptionSets() {
-    this.optionSets.push(['groupId', 'teamId']);
+    this.optionSets.push({ options: ['groupId', 'teamId'] });
 };
 module.exports = new AadO365GroupUserRemoveCommand();
 //# sourceMappingURL=o365group-user-remove.js.map

package/dist/m365/aad/commands/o365group/o365group-user-set.js

@@ -156,7 +156,7 @@ _AadO365GroupUserSetCommand_instances = new WeakSet(), _AadO365GroupUserSetComma
         return true;
     }));
 }, _AadO365GroupUserSetCommand_initOptionSets = function _AadO365GroupUserSetCommand_initOptionSets() {
-    this.optionSets.push(['groupId', 'teamId']);
+    this.optionSets.push({ options: ['groupId', 'teamId'] });
 };
 module.exports = new AadO365GroupUserSetCommand();
 //# sourceMappingURL=o365group-user-set.js.map

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadOAuth2GrantListCommand_instances, _AadOAuth2GrantListCommand_initOptions, _AadOAuth2GrantListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -42,7 +43,7 @@ class AadOAuth2GrantListCommand extends GraphCommand_1.default {
             }
             try {
                 const requestOptions = {
-                    url: `${this.resource}/v1.0/oauth2PermissionGrants?$filter=clientId eq '${encodeURIComponent(args.options.spObjectId)}'`,
+                    url: `${this.resource}/v1.0/oauth2PermissionGrants?$filter=clientId eq '${formatting_1.formatting.encodeQueryParameter(args.options.spObjectId)}'`,
                     headers: {
                         accept: 'application/json;odata.metadata=none'
                     },

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

@@ -17,6 +17,7 @@ var _AadOAuth2GrantRemoveCommand_instances, _AadOAuth2GrantRemoveCommand_initOpt
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadOAuth2GrantRemoveCommand extends GraphCommand_1.default {
@@ -39,7 +40,7 @@ class AadOAuth2GrantRemoveCommand extends GraphCommand_1.default {
                 }
                 try {
                     const requestOptions = {
-                        url: `${this.resource}/v1.0/oauth2PermissionGrants/${encodeURIComponent(args.options.grantId)}`,
+                        url: `${this.resource}/v1.0/oauth2PermissionGrants/${formatting_1.formatting.encodeQueryParameter(args.options.grantId)}`,
                         headers: {
                             'accept': 'application/json;odata.metadata=none'
                         },

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadOAuth2GrantSetCommand_instances, _AadOAuth2GrantSetCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadOAuth2GrantSetCommand extends GraphCommand_1.default {
@@ -37,7 +38,7 @@ class AadOAuth2GrantSetCommand extends GraphCommand_1.default {
             }
             try {
                 const requestOptions = {
-                    url: `${this.resource}/v1.0/oauth2PermissionGrants/${encodeURIComponent(args.options.grantId)}`,
+                    url: `${this.resource}/v1.0/oauth2PermissionGrants/${formatting_1.formatting.encodeQueryParameter(args.options.grantId)}`,
                     headers: {
                         'content-type': 'application/json'
                     },

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

@@ -46,7 +46,7 @@ class AadPolicyListCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const policyType = args.options.policyType ? args.options.policyType.toLowerCase() : 'all';
+            const policyType = args.options.type ? args.options.type.toLowerCase() : 'all';
             try {
                 if (policyType && policyType !== "all") {
                     const policies = yield this.getPolicies(policyType);
@@ -92,20 +92,20 @@ class AadPolicyListCommand extends GraphCommand_1.default {
 _AadPolicyListCommand_instances = new WeakSet(), _AadPolicyListCommand_initTelemetry = function _AadPolicyListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            policyType: args.options.policyType || 'all'
+            policyType: args.options.type || 'all'
         });
     });
 }, _AadPolicyListCommand_initOptions = function _AadPolicyListCommand_initOptions() {
     this.options.unshift({
-        option: '-p, --policyType [policyType]',
+        option: '-t, --type [type]',
         autocomplete: AadPolicyListCommand.supportedPolicyTypes
     });
 }, _AadPolicyListCommand_initValidators = function _AadPolicyListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.policyType) {
-            const policyType = args.options.policyType.toLowerCase();
+        if (args.options.type) {
+            const policyType = args.options.type.toLowerCase();
             if (!AadPolicyListCommand.supportedPolicyTypes.find(p => p.toLowerCase() === policyType)) {
-                return `${args.options.policyType} is not a valid policyType. Allowed values are ${AadPolicyListCommand.supportedPolicyTypes.join(', ')}`;
+                return `${args.options.type} is not a valid type. Allowed values are ${AadPolicyListCommand.supportedPolicyTypes.join(', ')}`;
             }
         }
         return true;

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadSpAddCommand_instances, _AadSpAddCommand_initTelemetry, _AadSpAddCommand_initOptions, _AadSpAddCommand_initValidators, _AadSpAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -40,10 +41,10 @@ class AadSpAddCommand extends GraphCommand_1.default {
         }
         let spMatchQuery = '';
         if (args.options.appName) {
-            spMatchQuery = `displayName eq '${encodeURIComponent(args.options.appName)}'`;
+            spMatchQuery = `displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.appName)}'`;
         }
         else if (args.options.objectId) {
-            spMatchQuery = `id eq '${encodeURIComponent(args.options.objectId)}'`;
+            spMatchQuery = `id eq '${formatting_1.formatting.encodeQueryParameter(args.options.objectId)}'`;
         }
         const appIdRequestOptions = {
             url: `${this.resource}/v1.0/applications?$filter=${spMatchQuery}`,
@@ -116,7 +117,7 @@ _AadSpAddCommand_instances = new WeakSet(), _AadSpAddCommand_initTelemetry = fun
         return true;
     }));
 }, _AadSpAddCommand_initOptionSets = function _AadSpAddCommand_initOptionSets() {
-    this.optionSets.push(['appId', 'appName', 'objectId']);
+    this.optionSets.push({ options: ['appId', 'appName', 'objectId'] });
 };
 module.exports = new AadSpAddCommand();
 //# sourceMappingURL=sp-add.js.map

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadSpGetCommand_instances, _AadSpGetCommand_initTelemetry, _AadSpGetCommand_initOptions, _AadSpGetCommand_initValidators, _AadSpGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -35,15 +36,15 @@ class AadSpGetCommand extends GraphCommand_1.default {
         return 'Gets information about the specific service principal';
     }
     getSpId(args) {
-        if (args.options.objectId) {
-            return Promise.resolve(args.options.objectId);
+        if (args.options.appObjectId) {
+            return Promise.resolve(args.options.appObjectId);
         }
         let spMatchQuery = '';
-        if (args.options.displayName) {
-            spMatchQuery = `displayName eq '${encodeURIComponent(args.options.displayName)}'`;
+        if (args.options.appDisplayName) {
+            spMatchQuery = `displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.appDisplayName)}'`;
         }
         else if (args.options.appId) {
-            spMatchQuery = `appId eq '${encodeURIComponent(args.options.appId)}'`;
+            spMatchQuery = `appId eq '${formatting_1.formatting.encodeQueryParameter(args.options.appId)}'`;
         }
         const idRequestOptions = {
             url: `${this.resource}/v1.0/servicePrincipals?$filter=${spMatchQuery}`,
@@ -60,7 +61,7 @@ class AadSpGetCommand extends GraphCommand_1.default {
                 return Promise.reject(`The specified Azure AD app does not exist`);
             }
             if (response.value.length > 1) {
-                return Promise.reject(`Multiple Azure AD apps with name ${args.options.displayName} found: ${response.value.map(x => x.id)}`);
+                return Promise.reject(`Multiple Azure AD apps with name ${args.options.appDisplayName} found: ${response.value.map(x => x.id)}`);
             }
             return Promise.resolve(spItem.id);
         });
@@ -93,30 +94,30 @@ _AadSpGetCommand_instances = new WeakSet(), _AadSpGetCommand_initTelemetry = fun
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: (!(!args.options.appId)).toString(),
-            displayName: (!(!args.options.displayName)).toString(),
-            objectId: (!(!args.options.objectId)).toString()
+            appDisplayName: (!(!args.options.appDisplayName)).toString(),
+            appObjectId: (!(!args.options.appObjectId)).toString()
         });
     });
 }, _AadSpGetCommand_initOptions = function _AadSpGetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --appId [appId]'
     }, {
-        option: '-n, --displayName [displayName]'
+        option: '-n, --appDisplayName [appDisplayName]'
     }, {
-        option: '--objectId [objectId]'
+        option: '--appObjectId [appObjectId]'
     });
 }, _AadSpGetCommand_initValidators = function _AadSpGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid appId GUID`;
         }
-        if (args.options.objectId && !validation_1.validation.isValidGuid(args.options.objectId)) {
-            return `${args.options.objectId} is not a valid objectId GUID`;
+        if (args.options.appObjectId && !validation_1.validation.isValidGuid(args.options.appObjectId)) {
+            return `${args.options.appObjectId} is not a valid objectId GUID`;
         }
         return true;
     }));
 }, _AadSpGetCommand_initOptionSets = function _AadSpGetCommand_initOptionSets() {
-    this.optionSets.push(['appId', 'displayName', 'objectId']);
+    this.optionSets.push({ options: ['appId', 'appDisplayName', 'appObjectId'] });
 };
 module.exports = new AadSpGetCommand();
 //# sourceMappingURL=sp-get.js.map