@pnp/cli-microsoft365 6.0.0-beta.a9609a1 → 6.0.0-beta.aa5918d

package/dist/cli/Cli.js

@@ -202,27 +202,24 @@ class Cli {
             const currentLogger = request_1.default.logger;
             try {
                 yield command.action(logger, args);
-                // restoring the command and logger is done here instead of in a 'finally' because there were issues with the code coverage tool
-                // restore the original command name
-                cli.currentCommandName = parentCommandName;
-                // restore the original logger
-                request_1.default.logger = currentLogger;
                 return ({
                     stdout: log.join(os.EOL),
                     stderr: logErr.join(os.EOL)
                 });
             }
             catch (err) {
-                // restoring the command and logger is done here instead of in a 'finally' because there were issues with the code coverage tool
-                // restore the original command name
-                cli.currentCommandName = parentCommandName;
-                // restore the original logger
-                request_1.default.logger = currentLogger;
                 throw {
                     error: err,
                     stderr: logErr.join(os.EOL)
                 };
             }
+            /* c8 ignore next */
+            finally {
+                // restore the original command name
+                cli.currentCommandName = parentCommandName;
+                // restore the original logger
+                request_1.default.logger = currentLogger;
+            }
         });
     }
     loadAllCommands() {

package/dist/m365/aad/commands/app/app-add.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 _AadAppAddCommand_instances, _AadAppAddCommand_initTelemetry, _AadAppAddCommand_initOptions, _AadAppAddCommand_initValidators;
+var _AadAppAddCommand_instances, _AadAppAddCommand_initTelemetry, _AadAppAddCommand_initOptions, _AadAppAddCommand_initValidators, _AadAppAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const uuid_1 = require("uuid");
@@ -32,6 +32,7 @@ class AadAppAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APP_ADD;
@@ -731,9 +732,6 @@ _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCommand_initTelemetry = f
     });
 }, _AadAppAddCommand_initValidators = function _AadAppAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.manifest && !args.options.name) {
-            return 'Specify either the name of the app to create or the manifest';
-        }
         if (args.options.platform &&
             AadAppAddCommand.aadApplicationPlatform.indexOf(args.options.platform) < 0) {
             return `${args.options.platform} is not a valid value for platform. Allowed values are ${AadAppAddCommand.aadApplicationPlatform.join(', ')}`;
@@ -778,6 +776,8 @@ _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCommand_initTelemetry = f
         }
         return true;
     }));
+}, _AadAppAddCommand_initOptionSets = function _AadAppAddCommand_initOptionSets() {
+    this.optionSets.push(['name', 'manifest']);
 };
 AadAppAddCommand.aadApplicationPlatform = ['spa', 'web', 'publicClient'];
 AadAppAddCommand.aadAppScopeConsentBy = ['admins', 'adminsAndUsers'];

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

@@ -17,6 +17,7 @@ var _AadAppGetCommand_instances, _AadAppGetCommand_initTelemetry, _AadAppGetComm
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 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");
@@ -54,8 +55,8 @@ class AadAppGetCommand extends GraphCommand_1.default {
         }
         const { appId, name } = args.options;
         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/app/app-list.js

@@ -0,0 +1,38 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const odata_1 = require("../../../../utils/odata");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class AadAppListCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.APP_LIST;
+    }
+    get description() {
+        return 'Retrieves a list of Azure AD app registrations';
+    }
+    defaultProperties() {
+        return ['appId', 'id', 'displayName', "signInAudience"];
+    }
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const results = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/applications`);
+                logger.log(results);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+module.exports = new AadAppListCommand();
+//# sourceMappingURL=app-list.js.map

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

@@ -17,6 +17,7 @@ var _AadAppRemoveCommand_instances, _AadAppRemoveCommand_initTelemetry, _AadAppR
 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("../../commands");
@@ -81,8 +82,8 @@ class AadAppRemoveCommand 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/app/app-role-add.js

@@ -17,6 +17,7 @@ var _AadAppRoleAddCommand_instances, _AadAppRoleAddCommand_initTelemetry, _AadAp
 Object.defineProperty(exports, "__esModule", { value: true });
 const uuid_1 = require("uuid");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppRoleAddCommand extends GraphCommand_1.default {
@@ -99,8 +100,8 @@ class AadAppRoleAddCommand 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: {

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadAppRoleListCommand_instances, _AadAppRoleListCommand_initTelemetry, _AadAppRoleListCommand_initOptions, _AadAppRoleListCommand_initOptionSets;
 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");
@@ -57,8 +58,8 @@ class AadAppRoleListCommand 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: {

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

@@ -17,6 +17,7 @@ var _AadAppRoleRemoveCommand_instances, _AadAppRoleRemoveCommand_initTelemetry,
 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("../../commands");
@@ -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: {

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,6 +17,7 @@ var _AadAppRoleAssignmentAddCommand_instances, _AadAppRoleAssignmentAddCommand_i
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 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,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':

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");
@@ -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) => {

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.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':

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)

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.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-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'
                     },

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'
                     },

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'
                         },

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}`,

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}`,

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
         });
     });