@pnp/cli-microsoft365 6.0.0-beta.ff232be → 6.1.0-beta.11542c0

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

@@ -1,7 +1,23 @@
 "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());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _AadO365GroupUserSetCommand_instances, _AadO365GroupUserSetCommand_initTelemetry, _AadO365GroupUserSetCommand_initOptions, _AadO365GroupUserSetCommand_initValidators, _AadO365GroupUserSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../../teams/commands");
 const commands_2 = require("../../commands");
@@ -15,83 +31,83 @@ class AadO365GroupUserSetCommand extends GraphCommand_1.default {
     alias() {
         return [commands_1.default.USER_SET];
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.teamId = typeof args.options.teamId !== 'undefined';
-        telemetryProps.groupId = typeof args.options.groupId !== 'undefined';
-        telemetryProps.role = args.options.role;
-        return telemetryProps;
+    constructor() {
+        super();
+        _AadO365GroupUserSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadO365GroupUserSetCommand_instances, "m", _AadO365GroupUserSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadO365GroupUserSetCommand_instances, "m", _AadO365GroupUserSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadO365GroupUserSetCommand_instances, "m", _AadO365GroupUserSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadO365GroupUserSetCommand_instances, "m", _AadO365GroupUserSetCommand_initOptionSets).call(this);
     }
-    commandAction(logger, args, cb) {
-        const groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
-        let users = [];
-        this
-            .getOwners(logger, groupId)
-            .then((owners) => {
-            users = owners;
-            return this.getMembersAndGuests(logger, groupId);
-        })
-            .then((membersAndGuests) => {
-            users = users.concat(membersAndGuests);
-            // Filter out duplicate added values for owners (as they are returned as members as well)
-            users = users.filter((groupUser, index, self) => index === self.findIndex((t) => (t.id === groupUser.id && t.displayName === groupUser.displayName)));
-            if (this.debug) {
-                logger.logToStderr((typeof args.options.groupId !== 'undefined') ? 'Group owners and members:' : 'Team owners and members:');
-                logger.logToStderr(users);
-                logger.logToStderr('');
-            }
-            if (users.filter(i => args.options.userName.toUpperCase() === i.userPrincipalName.toUpperCase()).length <= 0) {
-                const userNotInGroup = (typeof args.options.groupId !== 'undefined') ?
-                    'The specified user does not belong to the given Microsoft 365 Group. Please use the \'o365group user add\' command to add new users.' :
-                    'The specified user does not belong to the given Microsoft Teams team. Please use the \'graph teams user add\' command to add new users.';
-                throw new Error(userNotInGroup);
-            }
-            if (args.options.role === "Owner") {
-                const foundMember = users.find(e => args.options.userName.toUpperCase() === e.userPrincipalName.toUpperCase() && e.userType === 'Member');
-                if (foundMember !== undefined) {
-                    const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners/$ref`;
-                    const requestOptions = {
-                        url: endpoint,
-                        headers: {
-                            'accept': 'application/json;odata.metadata=none'
-                        },
-                        responseType: 'json',
-                        data: { "@odata.id": "https://graph.microsoft.com/v1.0/directoryObjects/" + foundMember.id }
-                    };
-                    return request_1.default.post(requestOptions);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
+                let users = yield this.getOwners(logger, groupId);
+                const membersAndGuests = yield this.getMembersAndGuests(logger, groupId);
+                users = users.concat(membersAndGuests);
+                // Filter out duplicate added values for owners (as they are returned as members as well)
+                users = users.filter((groupUser, index, self) => index === self.findIndex((t) => (t.id === groupUser.id && t.displayName === groupUser.displayName)));
+                if (this.debug) {
+                    logger.logToStderr((typeof args.options.groupId !== 'undefined') ? 'Group owners and members:' : 'Team owners and members:');
+                    logger.logToStderr(users);
+                    logger.logToStderr('');
                 }
-                else {
-                    const userAlreadyOwner = (typeof args.options.groupId !== 'undefined') ?
-                        'The specified user is already an owner in the specified Microsoft 365 group, and thus cannot be promoted.' :
-                        'The specified user is already an owner in the specified Microsoft Teams team, and thus cannot be promoted.';
-                    throw new Error(userAlreadyOwner);
+                if (users.filter(i => args.options.userName.toUpperCase() === i.userPrincipalName.toUpperCase()).length <= 0) {
+                    const userNotInGroup = (typeof args.options.groupId !== 'undefined') ?
+                        'The specified user does not belong to the given Microsoft 365 Group. Please use the \'o365group user add\' command to add new users.' :
+                        'The specified user does not belong to the given Microsoft Teams team. Please use the \'graph teams user add\' command to add new users.';
+                    throw new Error(userNotInGroup);
                 }
-            }
-            else {
-                const foundOwner = users.find(e => args.options.userName.toUpperCase() === e.userPrincipalName.toUpperCase() && e.userType === 'Owner');
-                if (foundOwner !== undefined) {
-                    const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners/${foundOwner.id}/$ref`;
-                    const requestOptions = {
-                        url: endpoint,
-                        headers: {
-                            'accept': 'application/json;odata.metadata=none'
-                        }
-                    };
-                    return request_1.default.delete(requestOptions);
+                if (args.options.role === "Owner") {
+                    const foundMember = users.find(e => args.options.userName.toUpperCase() === e.userPrincipalName.toUpperCase() && e.userType === 'Member');
+                    if (foundMember !== undefined) {
+                        const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners/$ref`;
+                        const requestOptions = {
+                            url: endpoint,
+                            headers: {
+                                'accept': 'application/json;odata.metadata=none'
+                            },
+                            responseType: 'json',
+                            data: { "@odata.id": "https://graph.microsoft.com/v1.0/directoryObjects/" + foundMember.id }
+                        };
+                        yield request_1.default.post(requestOptions);
+                    }
+                    else {
+                        const userAlreadyOwner = (typeof args.options.groupId !== 'undefined') ?
+                            'The specified user is already an owner in the specified Microsoft 365 group, and thus cannot be promoted.' :
+                            'The specified user is already an owner in the specified Microsoft Teams team, and thus cannot be promoted.';
+                        throw new Error(userAlreadyOwner);
+                    }
                 }
                 else {
-                    const userAlreadyMember = (typeof args.options.groupId !== 'undefined') ?
-                        'The specified user is already a member in the specified Microsoft 365 group, and thus cannot be demoted.' :
-                        'The specified user is already a member in the specified Microsoft Teams team, and thus cannot be demoted.';
-                    throw new Error(userAlreadyMember);
+                    const foundOwner = users.find(e => args.options.userName.toUpperCase() === e.userPrincipalName.toUpperCase() && e.userType === 'Owner');
+                    if (foundOwner !== undefined) {
+                        const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners/${foundOwner.id}/$ref`;
+                        const requestOptions = {
+                            url: endpoint,
+                            headers: {
+                                'accept': 'application/json;odata.metadata=none'
+                            }
+                        };
+                        yield request_1.default.delete(requestOptions);
+                    }
+                    else {
+                        const userAlreadyMember = (typeof args.options.groupId !== 'undefined') ?
+                            'The specified user is already a member in the specified Microsoft 365 group, and thus cannot be demoted.' :
+                            'The specified user is already a member in the specified Microsoft Teams team, and thus cannot be demoted.';
+                        throw new Error(userAlreadyMember);
+                    }
                 }
             }
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getOwners(logger, groupId) {
         const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners?$select=id,displayName,userPrincipalName,userType`;
-        return utils_1.odata
+        return odata_1.odata
             .getAllItems(endpoint)
             .then(users => {
             // Currently there is a bug in the Microsoft Graph that returns Owners as
@@ -104,45 +120,43 @@ class AadO365GroupUserSetCommand extends GraphCommand_1.default {
     }
     getMembersAndGuests(logger, groupId) {
         const endpoint = `${this.resource}/v1.0/groups/${groupId}/members?$select=id,displayName,userPrincipalName,userType`;
-        return utils_1.odata.getAllItems(endpoint);
-    }
-    options() {
-        const options = [
-            {
-                option: "-i, --groupId [groupId]"
-            },
-            {
-                option: "--teamId [teamId]"
-            },
-            {
-                option: '-n, --userName <userName>'
-            },
-            {
-                option: '-r, --role <role>',
-                autocomplete: ['Owner', 'Member']
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        return odata_1.odata.getAllItems(endpoint);
     }
-    validate(args) {
-        if (!args.options.groupId && !args.options.teamId) {
-            return 'Please provide one of the following parameters: groupId or teamId';
-        }
-        if (args.options.groupId && args.options.teamId) {
-            return 'You cannot provide both a groupId and teamId parameter, please provide only one';
-        }
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
+}
+_AadO365GroupUserSetCommand_instances = new WeakSet(), _AadO365GroupUserSetCommand_initTelemetry = function _AadO365GroupUserSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            teamId: typeof args.options.teamId !== 'undefined',
+            groupId: typeof args.options.groupId !== 'undefined',
+            role: args.options.role
+        });
+    });
+}, _AadO365GroupUserSetCommand_initOptions = function _AadO365GroupUserSetCommand_initOptions() {
+    this.options.unshift({
+        option: "-i, --groupId [groupId]"
+    }, {
+        option: "--teamId [teamId]"
+    }, {
+        option: '-n, --userName <userName>'
+    }, {
+        option: '-r, --role <role>',
+        autocomplete: ['Owner', 'Member']
+    });
+}, _AadO365GroupUserSetCommand_initValidators = function _AadO365GroupUserSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.teamId && !validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.groupId && !utils_1.validation.isValidGuid(args.options.groupId)) {
+        if (args.options.groupId && !validation_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         if (['Owner', 'Member'].indexOf(args.options.role) === -1) {
             return `${args.options.role} is not a valid role value. Allowed values Owner|Member`;
         }
         return true;
-    }
-}
+    }));
+}, _AadO365GroupUserSetCommand_initOptionSets = function _AadO365GroupUserSetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['groupId', 'teamId'] });
+};
 module.exports = new AadO365GroupUserSetCommand();
 //# sourceMappingURL=o365group-user-set.js.map

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

@@ -1,7 +1,22 @@
 "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());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _AadOAuth2GrantAddCommand_instances, _AadOAuth2GrantAddCommand_initOptions, _AadOAuth2GrantAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadOAuth2GrantAddCommand extends GraphCommand_1.default {
@@ -11,52 +26,58 @@ class AadOAuth2GrantAddCommand extends GraphCommand_1.default {
     get description() {
         return 'Grant the specified service principal OAuth2 permissions to the specified resource';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Granting the service principal specified permissions...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/oauth2PermissionGrants`,
-            headers: {
-                'content-type': 'application/json;odata.metadata=none'
-            },
-            responseType: 'json',
-            data: {
-                "clientId": args.options.clientId,
-                "consentType": "AllPrincipals",
-                "principalId": null,
-                "resourceId": args.options.resourceId,
-                "scope": args.options.scope
-            }
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+    constructor() {
+        super();
+        _AadOAuth2GrantAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadOAuth2GrantAddCommand_instances, "m", _AadOAuth2GrantAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadOAuth2GrantAddCommand_instances, "m", _AadOAuth2GrantAddCommand_initValidators).call(this);
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --clientId <clientId>'
-            },
-            {
-                option: '-r, --resourceId <resourceId>'
-            },
-            {
-                option: '-s, --scope <scope>'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Granting the service principal specified permissions...`);
+            }
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/oauth2PermissionGrants`,
+                    headers: {
+                        'content-type': 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: {
+                        "clientId": args.options.clientId,
+                        "consentType": "AllPrincipals",
+                        "principalId": null,
+                        "resourceId": args.options.resourceId,
+                        "scope": args.options.scope
+                    }
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    validate(args) {
-        if (!utils_1.validation.isValidGuid(args.options.clientId)) {
+}
+_AadOAuth2GrantAddCommand_instances = new WeakSet(), _AadOAuth2GrantAddCommand_initOptions = function _AadOAuth2GrantAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --clientId <clientId>'
+    }, {
+        option: '-r, --resourceId <resourceId>'
+    }, {
+        option: '-s, --scope <scope>'
+    });
+}, _AadOAuth2GrantAddCommand_initValidators = function _AadOAuth2GrantAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidGuid(args.options.clientId)) {
             return `${args.options.clientId} is not a valid GUID`;
         }
-        if (!utils_1.validation.isValidGuid(args.options.resourceId)) {
+        if (!validation_1.validation.isValidGuid(args.options.resourceId)) {
             return `${args.options.resourceId} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new AadOAuth2GrantAddCommand();
 //# sourceMappingURL=oauth2grant-add.js.map

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

@@ -1,7 +1,23 @@
 "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());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _AadOAuth2GrantListCommand_instances, _AadOAuth2GrantListCommand_initOptions, _AadOAuth2GrantListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadOAuth2GrantListCommand extends GraphCommand_1.default {
@@ -14,41 +30,47 @@ class AadOAuth2GrantListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['objectId', 'resourceId', 'scope'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving list of OAuth grants for the service principal...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/oauth2PermissionGrants?$filter=clientId eq '${encodeURIComponent(args.options.spObjectId)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            if (res.value && res.value.length > 0) {
-                logger.log(res.value);
-            }
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+    constructor() {
+        super();
+        _AadOAuth2GrantListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadOAuth2GrantListCommand_instances, "m", _AadOAuth2GrantListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadOAuth2GrantListCommand_instances, "m", _AadOAuth2GrantListCommand_initValidators).call(this);
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --spObjectId <spObjectId>'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving list of OAuth grants for the service principal...`);
+            }
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/oauth2PermissionGrants?$filter=clientId eq '${formatting_1.formatting.encodeQueryParameter(args.options.spObjectId)}'`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                if (res.value && res.value.length > 0) {
+                    logger.log(res.value);
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    validate(args) {
-        if (!utils_1.validation.isValidGuid(args.options.spObjectId)) {
+}
+_AadOAuth2GrantListCommand_instances = new WeakSet(), _AadOAuth2GrantListCommand_initOptions = function _AadOAuth2GrantListCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --spObjectId <spObjectId>'
+    });
+}, _AadOAuth2GrantListCommand_initValidators = function _AadOAuth2GrantListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidGuid(args.options.spObjectId)) {
             return `${args.options.spObjectId} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new AadOAuth2GrantListCommand();
 //# sourceMappingURL=oauth2grant-list.js.map

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

@@ -1,7 +1,23 @@
 "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());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _AadOAuth2GrantRemoveCommand_instances, _AadOAuth2GrantRemoveCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+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 {
@@ -11,53 +27,54 @@ class AadOAuth2GrantRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Remove specified service principal OAuth2 permissions';
     }
-    commandAction(logger, args, cb) {
-        const removeOauth2Grant = () => {
-            if (this.verbose) {
-                logger.logToStderr(`Removing OAuth2 permissions...`);
-            }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/oauth2PermissionGrants/${encodeURIComponent(args.options.grantId)}`,
-                headers: {
-                    'accept': 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            request_1.default
-                .delete(requestOptions)
-                .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeOauth2Grant();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the OAuth2 permissions for ${args.options.grantId}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    constructor() {
+        super();
+        _AadOAuth2GrantRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadOAuth2GrantRemoveCommand_instances, "m", _AadOAuth2GrantRemoveCommand_initOptions).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeOauth2Grant = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Removing OAuth2 permissions...`);
+                }
+                try {
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/oauth2PermissionGrants/${formatting_1.formatting.encodeQueryParameter(args.options.grantId)}`,
+                        headers: {
+                            'accept': 'application/json;odata.metadata=none'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.delete(requestOptions);
                 }
-                else {
-                    removeOauth2Grant();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
-    }
-    options() {
-        const options = [
-            {
-                option: '-i, --grantId <grantId>'
-            },
-            {
-                option: '--confirm'
+            if (args.options.confirm) {
+                yield removeOauth2Grant();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the OAuth2 permissions for ${args.options.grantId}?`
+                });
+                if (result.continue) {
+                    yield removeOauth2Grant();
+                }
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
 }
+_AadOAuth2GrantRemoveCommand_instances = new WeakSet(), _AadOAuth2GrantRemoveCommand_initOptions = function _AadOAuth2GrantRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --grantId <grantId>'
+    }, {
+        option: '--confirm'
+    });
+};
 module.exports = new AadOAuth2GrantRemoveCommand();
 //# sourceMappingURL=oauth2grant-remove.js.map