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

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.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 odata_1.odata.getAllItems(endpoint);

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

@@ -114,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");
@@ -39,7 +40,7 @@ class AadO365GroupTeamifyCommand extends GraphCommand_1.default {
             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'
                     },
@@ -113,7 +114,7 @@ _AadO365GroupTeamifyCommand_instances = new WeakSet(), _AadO365GroupTeamifyComma
         return true;
     }));
 }, _AadO365GroupTeamifyCommand_initOptionSets = function _AadO365GroupTeamifyCommand_initOptionSets() {
-    this.optionSets.push(['id', '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/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");
@@ -40,10 +41,10 @@ class AadSpGetCommand extends GraphCommand_1.default {
         }
         let spMatchQuery = '';
         if (args.options.appDisplayName) {
-            spMatchQuery = `displayName eq '${encodeURIComponent(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}`,
@@ -116,7 +117,7 @@ _AadSpGetCommand_instances = new WeakSet(), _AadSpGetCommand_initTelemetry = fun
         return true;
     }));
 }, _AadSpGetCommand_initOptionSets = function _AadSpGetCommand_initOptionSets() {
-    this.optionSets.push(['appId', 'appDisplayName', 'appObjectId']);
+    this.optionSets.push({ options: ['appId', 'appDisplayName', 'appObjectId'] });
 };
 module.exports = new AadSpGetCommand();
 //# sourceMappingURL=sp-get.js.map

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadUserGetCommand_instances, _AadUserGetCommand_initTelemetry, _AadUserGetCommand_initOptions, _AadUserGetCommand_initValidators, _AadUserGetCommand_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");
@@ -37,17 +38,17 @@ class AadUserGetCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const properties = args.options.properties ?
-                `&$select=${args.options.properties.split(',').map(p => encodeURIComponent(p.trim())).join(',')}` :
+                `&$select=${args.options.properties.split(',').map(p => formatting_1.formatting.encodeQueryParameter(p.trim())).join(',')}` :
                 '';
             let requestUrl = `${this.resource}/v1.0/users`;
             if (args.options.id) {
-                requestUrl += `?$filter=id eq '${encodeURIComponent(args.options.id)}'${properties}`;
+                requestUrl += `?$filter=id eq '${formatting_1.formatting.encodeQueryParameter(args.options.id)}'${properties}`;
             }
             else if (args.options.userName) {
-                requestUrl += `?$filter=userPrincipalName eq '${encodeURIComponent(args.options.userName)}'${properties}`;
+                requestUrl += `?$filter=userPrincipalName eq '${formatting_1.formatting.encodeQueryParameter(args.options.userName)}'${properties}`;
             }
             else if (args.options.email) {
-                requestUrl += `?$filter=mail eq '${encodeURIComponent(args.options.email)}'${properties}`;
+                requestUrl += `?$filter=mail eq '${formatting_1.formatting.encodeQueryParameter(args.options.email)}'${properties}`;
             }
             const requestOptions = {
                 url: requestUrl,
@@ -80,6 +81,7 @@ _AadUserGetCommand_instances = new WeakSet(), _AadUserGetCommand_initTelemetry =
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
             userName: typeof args.options.userName !== 'undefined',
+            email: typeof args.options.email !== 'undefined',
             properties: args.options.properties
         });
     });
@@ -102,7 +104,7 @@ _AadUserGetCommand_instances = new WeakSet(), _AadUserGetCommand_initTelemetry =
         return true;
     }));
 }, _AadUserGetCommand_initOptionSets = function _AadUserGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'userName', 'email']);
+    this.optionSets.push({ options: ['id', 'userName', 'email'] });
 };
 module.exports = new AadUserGetCommand();
 //# sourceMappingURL=user-get.js.map

package/dist/m365/aad/commands/user/user-hibp.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadUserHibpCommand_instances, _AadUserHibpCommand_initTelemetry, _AadUserHibpCommand_initOptions, _AadUserHibpCommand_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 AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
@@ -37,7 +38,7 @@ class AadUserHibpCommand extends AnonymousCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const requestOptions = {
-                    url: `https://haveibeenpwned.com/api/v3/breachedaccount/${encodeURIComponent(args.options.userName)}${(args.options.domain ? `?domain=${encodeURIComponent(args.options.domain)}` : '')}`,
+                    url: `https://haveibeenpwned.com/api/v3/breachedaccount/${formatting_1.formatting.encodeQueryParameter(args.options.userName)}${(args.options.domain ? `?domain=${formatting_1.formatting.encodeQueryParameter(args.options.domain)}` : '')}`,
                     headers: {
                         'accept': 'application/json',
                         'hibp-api-key': args.options.apiKey,

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

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadUserListCommand_instances, _AadUserListCommand_initTelemetry, _AadUserListCommand_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");
@@ -76,7 +77,7 @@ class AadUserListCommand extends GraphCommand_1.default {
                 if (typeof options[key] === 'boolean') {
                     throw `Specify value for the ${key} property`;
                 }
-                filters[key] = encodeURIComponent(options[key].toString().replace(/'/g, `''`));
+                filters[key] = formatting_1.formatting.encodeQueryParameter(options[key].toString());
             }
         });
         let filter = Object.keys(filters).map(key => `startsWith(${key}, '${filters[key]}')`).join(' and ');

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadUserSetCommand_instances, _AadUserSetCommand_initTelemetry, _AadUserSetCommand_initOptions, _AadUserSetCommand_initValidators, _AadUserSetCommand_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");
@@ -42,7 +43,7 @@ class AadUserSetCommand extends GraphCommand_1.default {
             try {
                 const manifest = this.mapRequestBody(args.options);
                 const requestOptions = {
-                    url: `${this.resource}/v1.0/users/${encodeURIComponent(args.options.objectId ? args.options.objectId : args.options.userPrincipalName)}`,
+                    url: `${this.resource}/v1.0/users/${formatting_1.formatting.encodeQueryParameter(args.options.objectId ? args.options.objectId : args.options.userPrincipalName)}`,
                     headers: {
                         accept: 'application/json'
                     },
@@ -104,7 +105,7 @@ _AadUserSetCommand_instances = new WeakSet(), _AadUserSetCommand_initTelemetry =
         return true;
     }));
 }, _AadUserSetCommand_initOptionSets = function _AadUserSetCommand_initOptionSets() {
-    this.optionSets.push(['objectId', 'userPrincipalName']);
+    this.optionSets.push({ options: ['objectId', 'userPrincipalName'] });
 };
 module.exports = new AadUserSetCommand();
 //# sourceMappingURL=user-set.js.map

package/dist/m365/aad/commands/user/user-signin-list.js

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadUserSigninListCommand_instances, _AadUserSigninListCommand_initTelemetry, _AadUserSigninListCommand_initOptions, _AadUserSigninListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const formatting_1 = require("../../../../utils/formatting");
 const odata_1 = require("../../../../utils/odata");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -43,14 +44,14 @@ class AadUserSigninListCommand extends GraphCommand_1.default {
                 let filter = "";
                 if (args.options.userName || args.options.userId) {
                     filter = args.options.userId ?
-                        `?$filter=userId eq '${encodeURIComponent(args.options.userId)}'` :
-                        `?$filter=userPrincipalName eq '${encodeURIComponent(args.options.userName)}'`;
+                        `?$filter=userId eq '${formatting_1.formatting.encodeQueryParameter(args.options.userId)}'` :
+                        `?$filter=userPrincipalName eq '${formatting_1.formatting.encodeQueryParameter(args.options.userName)}'`;
                 }
                 if (args.options.appId || args.options.appDisplayName) {
                     filter += filter ? " and " : "?$filter=";
                     filter += args.options.appId ?
-                        `appId eq '${encodeURIComponent(args.options.appId)}'` :
-                        `appDisplayName eq '${encodeURIComponent(args.options.appDisplayName)}'`;
+                        `appId eq '${formatting_1.formatting.encodeQueryParameter(args.options.appId)}'` :
+                        `appDisplayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.appDisplayName)}'`;
                 }
                 endpoint += filter;
                 const signins = yield odata_1.odata.getAllItems(endpoint);

package/dist/m365/aad/commands.js

@@ -4,6 +4,7 @@ const prefix = 'aad';
 exports.default = {
     APP_ADD: `${prefix} app add`,
     APP_GET: `${prefix} app get`,
+    APP_LIST: `${prefix} app list`,
     APP_REMOVE: `${prefix} app remove`,
     APP_ROLE_ADD: `${prefix} app role add`,
     APP_ROLE_LIST: `${prefix} app role list`,

package/dist/m365/adaptivecard/commands/adaptivecard-send.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _AdaptiveCardSendCommand_instances, _AdaptiveCardSendCommand_initTelemetry, _AdaptiveCardSendCommand_initOptions, _AdaptiveCardSendCommand_initValidators;
+var _AdaptiveCardSendCommand_instances, _AdaptiveCardSendCommand_initTelemetry, _AdaptiveCardSendCommand_initOptions, _AdaptiveCardSendCommand_initValidators, _AdaptiveCardSendCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../request");
 const AnonymousCommand_1 = require("../../base/AnonymousCommand");
@@ -25,6 +25,7 @@ class AdaptiveCardSendCommand extends AnonymousCommand_1.default {
         __classPrivateFieldGet(this, _AdaptiveCardSendCommand_instances, "m", _AdaptiveCardSendCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AdaptiveCardSendCommand_instances, "m", _AdaptiveCardSendCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AdaptiveCardSendCommand_instances, "m", _AdaptiveCardSendCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AdaptiveCardSendCommand_instances, "m", _AdaptiveCardSendCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.SEND;
@@ -206,9 +207,6 @@ _AdaptiveCardSendCommand_instances = new WeakSet(), _AdaptiveCardSendCommand_ini
     });
 }, _AdaptiveCardSendCommand_initValidators = function _AdaptiveCardSendCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.card && !args.options.title) {
-            return 'Specify either the title or the card to send';
-        }
         if (args.options.card) {
             try {
                 JSON.parse(args.options.card);
@@ -227,6 +225,8 @@ _AdaptiveCardSendCommand_instances = new WeakSet(), _AdaptiveCardSendCommand_ini
         }
         return true;
     }));
+}, _AdaptiveCardSendCommand_initOptionSets = function _AdaptiveCardSendCommand_initOptionSets() {
+    this.optionSets.push({ options: ['title', 'card'] });
 };
 module.exports = new AdaptiveCardSendCommand();
 //# sourceMappingURL=adaptivecard-send.js.map

package/dist/m365/base/DateAndPeriodBasedReport.js

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _DateAndPeriodBasedReport_instances, _DateAndPeriodBasedReport_initTelemetry, _DateAndPeriodBasedReport_initOptions, _DateAndPeriodBasedReport_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const formatting_1 = require("../../utils/formatting");
 const PeriodBasedReport_1 = require("./PeriodBasedReport");
 class DateAndPeriodBasedReport extends PeriodBasedReport_1.default {
     constructor() {
@@ -26,8 +27,8 @@ class DateAndPeriodBasedReport extends PeriodBasedReport_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const periodParameter = args.options.period ? `${this.usageEndpoint}(period='${encodeURIComponent(args.options.period)}')` : '';
-            const dateParameter = args.options.date ? `${this.usageEndpoint}(date=${encodeURIComponent(args.options.date)})` : '';
+            const periodParameter = args.options.period ? `${this.usageEndpoint}(period='${formatting_1.formatting.encodeQueryParameter(args.options.period)}')` : '';
+            const dateParameter = args.options.date ? `${this.usageEndpoint}(date=${formatting_1.formatting.encodeQueryParameter(args.options.date)})` : '';
             const endpoint = `${this.resource}/v1.0/reports/${(args.options.period ? periodParameter : dateParameter)}`;
             yield this.executeReport(endpoint, logger, args.options.output);
         });

package/dist/m365/base/PeriodBasedReport.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PeriodBasedReport_instances, _PeriodBasedReport_initOptions, _PeriodBasedReport_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../request");
+const formatting_1 = require("../../utils/formatting");
 const GraphCommand_1 = require("./GraphCommand");
 class PeriodBasedReport extends GraphCommand_1.default {
     constructor() {
@@ -26,7 +27,7 @@ class PeriodBasedReport extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const endpoint = `${this.resource}/v1.0/reports/${this.usageEndpoint}(period='${encodeURIComponent(args.options.period)}')`;
+            const endpoint = `${this.resource}/v1.0/reports/${this.usageEndpoint}(period='${formatting_1.formatting.encodeQueryParameter(args.options.period)}')`;
             yield this.executeReport(endpoint, logger, args.options.output);
         });
     }

package/dist/m365/base/SpoCommand.js

@@ -24,23 +24,24 @@ class SpoCommand extends Command_1.default {
     getNamesOfOptionsWithUrls() {
         const namesOfOptionsWithUrls = [
             'appCatalogUrl',
-            'siteUrl',
-            'webUrl',
-            'origin',
-            'url',
-            'imageUrl',
             'actionUrl',
-            'logoUrl',
+            'imageUrl',
             'libraryUrl',
-            'thumbnailUrl',
-            'targetUrl',
+            'logoUrl',
             'newSiteUrl',
-            'previewImageUrl',
             'NoAccessRedirectUrl',
-            'StartASiteFormUrl',
             'OrgNewsSiteUrl',
+            'origin',
+            'parentUrl',
             'parentWebUrl',
-            'siteLogoUrl'
+            'previewImageUrl',
+            'siteLogoUrl',
+            'siteUrl',
+            'StartASiteFormUrl',
+            'targetUrl',
+            'thumbnailUrl',
+            'url',
+            'webUrl'
         ];
         const excludedOptionsWithUrls = this.getExcludedOptionsWithUrls();
         if (!excludedOptionsWithUrls) {

package/dist/m365/booking/commands/business/business-get.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _BookingBusinessGetCommand_instances, _BookingBusinessGetCommand_initTelemetry, _BookingBusinessGetCommand_initOptions, _BookingBusinessGetCommand_initOptionSets;
 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 BookingBusinessGetCommand extends GraphCommand_1.default {
@@ -40,7 +41,7 @@ class BookingBusinessGetCommand extends GraphCommand_1.default {
             try {
                 const businessId = yield this.getBusinessId(args.options);
                 const requestOptions = {
-                    url: `${this.resource}/v1.0/solutions/bookingBusinesses/${encodeURIComponent(businessId)}`,
+                    url: `${this.resource}/v1.0/solutions/bookingBusinesses/${formatting_1.formatting.encodeQueryParameter(businessId)}`,
                     headers: {
                         accept: 'application/json;odata.metadata=none'
                     },
@@ -90,7 +91,7 @@ _BookingBusinessGetCommand_instances = new WeakSet(), _BookingBusinessGetCommand
 }, _BookingBusinessGetCommand_initOptions = function _BookingBusinessGetCommand_initOptions() {
     this.options.unshift({ option: '-i, --id [id]' }, { option: '-n, --name [name]' });
 }, _BookingBusinessGetCommand_initOptionSets = function _BookingBusinessGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 module.exports = new BookingBusinessGetCommand();
 //# sourceMappingURL=business-get.js.map

package/dist/m365/cli/commands/config/config-set.js

@@ -43,6 +43,7 @@ class CliConfigSetCommand extends AnonymousCommand_1.default {
                 case settingsNames_1.settingsNames.csvQuoted:
                 case settingsNames_1.settingsNames.csvQuotedEmpty:
                 case settingsNames_1.settingsNames.printErrorsAsPlainText:
+                case settingsNames_1.settingsNames.prompt:
                 case settingsNames_1.settingsNames.showHelpOnFailure:
                     value = args.options.value === 'true';
                     break;
@@ -80,6 +81,10 @@ _CliConfigSetCommand_instances = new WeakSet(), _CliConfigSetCommand_initTelemet
             allowedErrorOutputs.indexOf(args.options.value) === -1) {
             return `${args.options.value} is not a valid value for the option ${args.options.key}. Allowed values: ${allowedErrorOutputs.join(', ')}`;
         }
+        if (args.options.key === settingsNames_1.settingsNames.helpMode &&
+            Cli_1.Cli.helpModes.indexOf(args.options.value) === -1) {
+            return `${args.options.value} is not a valid value for the option ${args.options.key}. Allowed values: ${Cli_1.Cli.helpModes.join(', ')}`;
+        }
         return true;
     }));
 };

package/dist/m365/commands/login.js

@@ -120,7 +120,7 @@ _LoginCommand_instances = new WeakSet(), _LoginCommand_initTelemetry = function
 }, _LoginCommand_initOptions = function _LoginCommand_initOptions() {
     this.options.unshift({
         option: '-t, --authType [authType]',
-        autocomplete: ['certificate', 'deviceCode', 'password', 'identity', 'browser']
+        autocomplete: LoginCommand.allowedAuthTypes
     }, {
         option: '-u, --userName [userName]'
     }, {
@@ -161,6 +161,10 @@ _LoginCommand_instances = new WeakSet(), _LoginCommand_initTelemetry = function
                 }
             }
         }
+        if (args.options.authType &&
+            LoginCommand.allowedAuthTypes.indexOf(args.options.authType) < 0) {
+            return `'${args.options.authType}' is not a valid authentication type. Allowed authentication types are ${LoginCommand.allowedAuthTypes.join(', ')}`;
+        }
         if (args.options.authType === 'secret') {
             if (!args.options.secret) {
                 return 'Required option secret missing';
@@ -169,5 +173,6 @@ _LoginCommand_instances = new WeakSet(), _LoginCommand_initTelemetry = function
         return true;
     }));
 };
+LoginCommand.allowedAuthTypes = ['certificate', 'deviceCode', 'password', 'identity', 'browser', 'secret'];
 module.exports = new LoginCommand();
 //# sourceMappingURL=login.js.map

package/dist/m365/file/commands/file-list.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _FileListCommand_instances, _FileListCommand_initTelemetry, _FileListCommand_initOptions, _FileListCommand_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 validation_1 = require("../../../utils/validation");
 const GraphCommand_1 = require("../../base/GraphCommand");
@@ -74,7 +75,7 @@ class FileListCommand extends GraphCommand_1.default {
         }
         const url = new URL(webUrl);
         const requestOptions = {
-            url: `${this.resource}/v1.0/sites/${encodeURIComponent(url.host)}:${url.pathname}?$select=id`,
+            url: `${this.resource}/v1.0/sites/${formatting_1.formatting.encodeQueryParameter(url.host)}:${url.pathname}?$select=id`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },

package/dist/m365/flow/commands/environment/environment-get.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _FlowEnvironmentGetCommand_instances, _FlowEnvironmentGetCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
 const commands_1 = require("../../commands");
 class FlowEnvironmentGetCommand extends AzmgmtCommand_1.default {
@@ -39,7 +40,7 @@ class FlowEnvironmentGetCommand extends AzmgmtCommand_1.default {
                 logger.logToStderr(`Retrieving information about Microsoft Flow environment ${args.options.name}...`);
             }
             const requestOptions = {
-                url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
+                url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${formatting_1.formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },