@pnp/cli-microsoft365 6.0.0-beta.8352f49 → 6.0.0-beta.9e3459d

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

@@ -1,66 +1,76 @@
 "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 _AadAppRemoveCommand_instances, _AadAppRemoveCommand_initTelemetry, _AadAppRemoveCommand_initOptions, _AadAppRemoveCommand_initValidators, _AadAppRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppRemoveCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadAppRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadAppRemoveCommand_instances, "m", _AadAppRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadAppRemoveCommand_instances, "m", _AadAppRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadAppRemoveCommand_instances, "m", _AadAppRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAppRemoveCommand_instances, "m", _AadAppRemoveCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.APP_REMOVE;
     }
-    alias() {
-        return [commands_1.default.APP_DELETE];
-    }
     get description() {
         return 'Removes an Azure AD app registration';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.appId = typeof args.options.appId !== 'undefined';
-        telemetryProps.objectId = typeof args.options.objectId !== 'undefined';
-        telemetryProps.name = typeof args.options.name !== 'undefined';
-        telemetryProps.confirm = (!(!args.options.confirm)).toString();
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        this.showDeprecationWarning(logger, commands_1.default.APP_DELETE, commands_1.default.APP_REMOVE);
-        const deleteApp = () => {
-            this
-                .getObjectId(args, logger)
-                .then((objectId) => {
-                if (this.verbose) {
-                    logger.logToStderr(`Deleting Azure AD app ${objectId}...`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const deleteApp = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const objectId = yield this.getObjectId(args, logger);
+                    if (this.verbose) {
+                        logger.logToStderr(`Deleting Azure AD app ${objectId}...`);
+                    }
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/myorganization/applications/${objectId}`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.delete(requestOptions);
                 }
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/myorganization/applications/${objectId}`,
-                    headers: {
-                        accept: 'application/json;odata.metadata=none'
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.delete(requestOptions);
-            })
-                .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
-        };
-        if (args.options.confirm) {
-            deleteApp();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the app?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
-                }
-                else {
-                    deleteApp();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield deleteApp();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the app?`
+                });
+                if (result.continue) {
+                    yield deleteApp();
+                }
+            }
+        });
     }
     getObjectId(args, logger) {
         if (args.options.objectId) {
@@ -93,35 +103,30 @@ class AadAppRemoveCommand extends GraphCommand_1.default {
             return Promise.reject(`Multiple Azure AD application registration with name ${name} found. Please choose one of the object IDs: ${res.value.map(a => a.id).join(', ')}`);
         });
     }
-    options() {
-        const options = [
-            { option: '--appId [appId]' },
-            { option: '--objectId [objectId]' },
-            { option: '--name [name]' },
-            { option: '--confirm' }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (!args.options.appId &&
-            !args.options.objectId &&
-            !args.options.name) {
-            return 'Specify either appId, objectId, or name';
-        }
-        if ((args.options.appId && args.options.objectId) ||
-            (args.options.appId && args.options.name) ||
-            (args.options.objectId && args.options.name)) {
-            return 'Specify either appId, objectId, or name';
-        }
-        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
+}
+_AadAppRemoveCommand_instances = new WeakSet(), _AadAppRemoveCommand_initTelemetry = function _AadAppRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            appId: typeof args.options.appId !== 'undefined',
+            objectId: typeof args.options.objectId !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _AadAppRemoveCommand_initOptions = function _AadAppRemoveCommand_initOptions() {
+    this.options.unshift({ option: '--appId [appId]' }, { option: '--objectId [objectId]' }, { option: '--name [name]' }, { option: '--confirm' });
+}, _AadAppRemoveCommand_initValidators = function _AadAppRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        if (args.options.objectId && !utils_1.validation.isValidGuid(args.options.objectId)) {
+        if (args.options.objectId && !validation_1.validation.isValidGuid(args.options.objectId)) {
             return `${args.options.objectId} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+}, _AadAppRemoveCommand_initOptionSets = function _AadAppRemoveCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'objectId', 'name']);
+};
 module.exports = new AadAppRemoveCommand();
 //# sourceMappingURL=app-remove.js.map

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

@@ -1,50 +1,69 @@
 "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 _AadAppRoleAddCommand_instances, _AadAppRoleAddCommand_initTelemetry, _AadAppRoleAddCommand_initOptions, _AadAppRoleAddCommand_initValidators, _AadAppRoleAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const uuid_1 = require("uuid");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppRoleAddCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadAppRoleAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadAppRoleAddCommand_instances, "m", _AadAppRoleAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleAddCommand_instances, "m", _AadAppRoleAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleAddCommand_instances, "m", _AadAppRoleAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleAddCommand_instances, "m", _AadAppRoleAddCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.APP_ROLE_ADD;
     }
     get description() {
         return 'Adds role to the specified Azure AD app registration';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.appId = typeof args.options.appId !== 'undefined';
-        telemetryProps.appObjectId = typeof args.options.appObjectId !== 'undefined';
-        telemetryProps.appName = typeof args.options.appName !== 'undefined';
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        this
-            .getAppObjectId(args, logger)
-            .then((appId) => this.getAppInfo(appId, logger))
-            .then((appInfo) => {
-            if (this.verbose) {
-                logger.logToStderr(`Adding role ${args.options.name} to Azure AD app ${appInfo.id}...`);
-            }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/myorganization/applications/${appInfo.id}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json',
-                data: {
-                    appRoles: appInfo.appRoles.concat({
-                        displayName: args.options.name,
-                        description: args.options.description,
-                        id: (0, uuid_1.v4)(),
-                        value: args.options.claim,
-                        allowedMemberTypes: this.getAllowedMemberTypes(args)
-                    })
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const appId = yield this.getAppObjectId(args, logger);
+                const appInfo = yield this.getAppInfo(appId, logger);
+                if (this.verbose) {
+                    logger.logToStderr(`Adding role ${args.options.name} to Azure AD app ${appInfo.id}...`);
                 }
-            };
-            return request_1.default.patch(requestOptions);
-        })
-            .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/myorganization/applications/${appInfo.id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: {
+                        appRoles: appInfo.appRoles.concat({
+                            displayName: args.options.name,
+                            description: args.options.description,
+                            id: (0, uuid_1.v4)(),
+                            value: args.options.claim,
+                            allowedMemberTypes: this.getAllowedMemberTypes(args)
+                        })
+                    }
+                };
+                yield request_1.default.patch(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getAppInfo(appId, logger) {
         if (this.verbose) {
@@ -102,29 +121,22 @@ class AadAppRoleAddCommand extends GraphCommand_1.default {
             return Promise.reject(`Multiple Azure AD application registration with name ${appName} found. Please disambiguate (app object IDs): ${res.value.map(a => a.id).join(', ')}`);
         });
     }
-    options() {
-        const options = [
-            { option: '--appId [appId]' },
-            { option: '--appObjectId [appObjectId]' },
-            { option: '--appName [appName]' },
-            { option: '-n, --name <name>' },
-            { option: '-d, --description <description>' },
-            { option: '-m, --allowedMembers <allowedMembers>', autocomplete: AadAppRoleAddCommand.allowedMembers },
-            { option: '-c, --claim <claim>' }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        const { appId, appObjectId, appName, allowedMembers, claim } = args.options;
-        if ((appId && appObjectId) ||
-            (appId && appName) ||
-            (appObjectId && appName)) {
-            return `Specify either appId, appObjectId or appName but not multiple`;
-        }
-        if (!appId && !appObjectId && !appName) {
-            return `Specify either appId, appObjectId or appName`;
-        }
+}
+_AadAppRoleAddCommand_instances = new WeakSet(), _AadAppRoleAddCommand_initTelemetry = function _AadAppRoleAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            appId: typeof args.options.appId !== 'undefined',
+            appObjectId: typeof args.options.appObjectId !== 'undefined',
+            appName: typeof args.options.appName !== 'undefined'
+        });
+    });
+}, _AadAppRoleAddCommand_initOptions = function _AadAppRoleAddCommand_initOptions() {
+    this.options.unshift({ option: '--appId [appId]' }, { option: '--appObjectId [appObjectId]' }, { option: '--appName [appName]' }, { option: '-n, --name <name>' }, { option: '-d, --description <description>' }, {
+        option: '-m, --allowedMembers <allowedMembers>', autocomplete: AadAppRoleAddCommand.allowedMembers
+    }, { option: '-c, --claim <claim>' });
+}, _AadAppRoleAddCommand_initValidators = function _AadAppRoleAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const { allowedMembers, claim } = args.options;
         if (AadAppRoleAddCommand.allowedMembers.indexOf(allowedMembers) < 0) {
             return `${allowedMembers} is not a valid value for allowedMembers. Valid values are ${AadAppRoleAddCommand.allowedMembers.join(', ')}`;
         }
@@ -138,8 +150,10 @@ class AadAppRoleAddCommand extends GraphCommand_1.default {
             return `Claim can contain only the following characters a-z, A-Z, 0-9, :!#$%&'()*+,-./:;<=>?@[]^+_\`{|}~]+`;
         }
         return true;
-    }
-}
+    }));
+}, _AadAppRoleAddCommand_initOptionSets = function _AadAppRoleAddCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'appObjectId', 'appName']);
+};
 AadAppRoleAddCommand.allowedMembers = ['usersGroups', 'applications', 'both'];
 module.exports = new AadAppRoleAddCommand();
 //# sourceMappingURL=app-role-add.js.map

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

@@ -1,34 +1,52 @@
 "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 _AadAppRoleListCommand_instances, _AadAppRoleListCommand_initTelemetry, _AadAppRoleListCommand_initOptions, _AadAppRoleListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppRoleListCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadAppRoleListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadAppRoleListCommand_instances, "m", _AadAppRoleListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleListCommand_instances, "m", _AadAppRoleListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleListCommand_instances, "m", _AadAppRoleListCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.APP_ROLE_LIST;
     }
     get description() {
         return 'Gets Azure AD app registration roles';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.appId = typeof args.options.appId !== 'undefined';
-        telemetryProps.appObjectId = typeof args.options.appObjectId !== 'undefined';
-        telemetryProps.appName = typeof args.options.appName !== 'undefined';
-        return telemetryProps;
-    }
     defaultProperties() {
         return ['displayName', 'description', 'id'];
     }
-    commandAction(logger, args, cb) {
-        this
-            .getAppObjectId(args, logger)
-            .then(objectId => utils_1.odata.getAllItems(`${this.resource}/v1.0/myorganization/applications/${objectId}/appRoles`))
-            .then(appRoles => {
-            logger.log(appRoles);
-            cb();
-        }, rawRes => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const objectId = yield this.getAppObjectId(args, logger);
+                const appRoles = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/myorganization/applications/${objectId}/appRoles`);
+                logger.log(appRoles);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getAppObjectId(args, logger) {
         if (args.options.appObjectId) {
@@ -61,27 +79,19 @@ class AadAppRoleListCommand extends GraphCommand_1.default {
             return Promise.reject(`Multiple Azure AD application registration with name ${appName} found. Please disambiguate (app object IDs): ${res.value.map(a => a.id).join(', ')}`);
         });
     }
-    options() {
-        const options = [
-            { option: '--appId [appId]' },
-            { option: '--appObjectId [appObjectId]' },
-            { option: '--appName [appName]' }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        const { appId, appObjectId, appName } = args.options;
-        if ((appId && appObjectId) ||
-            (appId && appName) ||
-            (appObjectId && appName)) {
-            return `Specify either appId, appObjectId or appName but not multiple`;
-        }
-        if (!appId && !appObjectId && !appName) {
-            return `Specify either appId, appObjectId or appName`;
-        }
-        return true;
-    }
 }
+_AadAppRoleListCommand_instances = new WeakSet(), _AadAppRoleListCommand_initTelemetry = function _AadAppRoleListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            appId: typeof args.options.appId !== 'undefined',
+            appObjectId: typeof args.options.appObjectId !== 'undefined',
+            appName: typeof args.options.appName !== 'undefined'
+        });
+    });
+}, _AadAppRoleListCommand_initOptions = function _AadAppRoleListCommand_initOptions() {
+    this.options.unshift({ option: '--appId [appId]' }, { option: '--appObjectId [appObjectId]' }, { option: '--appName [appName]' });
+}, _AadAppRoleListCommand_initOptionSets = function _AadAppRoleListCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'appObjectId', 'appName']);
+};
 module.exports = new AadAppRoleListCommand();
 //# sourceMappingURL=app-role-list.js.map

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

@@ -1,55 +1,65 @@
 "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 _AadAppRoleRemoveCommand_instances, _AadAppRoleRemoveCommand_initTelemetry, _AadAppRoleRemoveCommand_initOptions, _AadAppRoleRemoveCommand_initValidators, _AadAppRoleRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppRoleRemoveCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadAppRoleRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadAppRoleRemoveCommand_instances, "m", _AadAppRoleRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleRemoveCommand_instances, "m", _AadAppRoleRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleRemoveCommand_instances, "m", _AadAppRoleRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleRemoveCommand_instances, "m", _AadAppRoleRemoveCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.APP_ROLE_REMOVE;
     }
     get description() {
         return 'Removes role from the specified Azure AD app registration';
     }
-    alias() {
-        return [commands_1.default.APP_ROLE_DELETE];
-    }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.appId = typeof args.options.appId !== 'undefined';
-        telemetryProps.appObjectId = typeof args.options.appObjectId !== 'undefined';
-        telemetryProps.appName = typeof args.options.appName !== 'undefined';
-        telemetryProps.claim = typeof args.options.claim !== 'undefined';
-        telemetryProps.name = typeof args.options.name !== 'undefined';
-        telemetryProps.id = typeof args.options.id !== 'undefined';
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        this.showDeprecationWarning(logger, commands_1.default.APP_ROLE_DELETE, commands_1.default.APP_ROLE_REMOVE);
-        const deleteAppRole = () => {
-            this
-                .processAppRoleDelete(logger, args)
-                .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
-        };
-        if (args.options.confirm) {
-            deleteAppRole();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the app role ?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const deleteAppRole = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    yield this.processAppRoleDelete(logger, args);
                 }
-                else {
-                    deleteAppRole();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield deleteAppRole();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the app role ?`
+                });
+                if (result.continue) {
+                    yield deleteAppRole();
+                }
+            }
+        });
     }
     processAppRoleDelete(logger, args) {
         return this
@@ -162,48 +172,31 @@ class AadAppRoleRemoveCommand extends GraphCommand_1.default {
             return Promise.reject(`Multiple Azure AD application registration with name ${appName} found. Please disambiguate using app object IDs: ${res.value.map(a => a.id).join(', ')}`);
         });
     }
-    options() {
-        const options = [
-            { option: '--appId [appId]' },
-            { option: '--appObjectId [appObjectId]' },
-            { option: '--appName [appName]' },
-            { option: '-n, --name [name]' },
-            { option: '-i, --id [id]' },
-            { option: '-c, --claim [claim]' },
-            { option: '--confirm' }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        const { appId, appObjectId, appName, name, id, claim } = args.options;
-        if ((appId && appObjectId) ||
-            (appId && appName) ||
-            (appObjectId && appName)) {
-            return `Specify either appId, appObjectId or appName but not multiple`;
-        }
-        if ((name && claim) ||
-            (name && id) ||
-            (claim && id)) {
-            return `Specify either name, claim or id of the role but not multiple`;
-        }
-        if (!appId &&
-            !appObjectId &&
-            !appName) {
-            return `Specify either appId, appObjectId or appName`;
-        }
-        if (!name &&
-            !claim &&
-            !id) {
-            return `Specify either name, claim or id of the role`;
-        }
+}
+_AadAppRoleRemoveCommand_instances = new WeakSet(), _AadAppRoleRemoveCommand_initTelemetry = function _AadAppRoleRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            appId: typeof args.options.appId !== 'undefined',
+            appObjectId: typeof args.options.appObjectId !== 'undefined',
+            appName: typeof args.options.appName !== 'undefined',
+            claim: typeof args.options.claim !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            id: typeof args.options.id !== 'undefined'
+        });
+    });
+}, _AadAppRoleRemoveCommand_initOptions = function _AadAppRoleRemoveCommand_initOptions() {
+    this.options.unshift({ option: '--appId [appId]' }, { option: '--appObjectId [appObjectId]' }, { option: '--appName [appName]' }, { option: '-n, --name [name]' }, { option: '-i, --id [id]' }, { option: '-c, --claim [claim]' }, { option: '--confirm' });
+}, _AadAppRoleRemoveCommand_initValidators = function _AadAppRoleRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id) {
-            if (!utils_1.validation.isValidGuid(args.options.id)) {
+            if (!validation_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
             }
         }
         return true;
-    }
-}
+    }));
+}, _AadAppRoleRemoveCommand_initOptionSets = function _AadAppRoleRemoveCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'appObjectId', 'appName'], ['name', 'claim', 'id']);
+};
 module.exports = new AadAppRoleRemoveCommand();
 //# sourceMappingURL=app-role-remove.js.map