@pnp/cli-microsoft365 5.7.0 → 5.8.0-beta.119711d

package/dist/Command.js

@@ -159,24 +159,28 @@ class Command {
         return __awaiter(this, void 0, void 0, function* () {
         });
     }
-    action(logger, args, cb) {
-        Auth_1.default
-            .restoreAuth()
-            .then(() => {
+    action(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield Auth_1.default.restoreAuth();
+            }
+            catch (error) {
+                throw new CommandError(error);
+            }
             this.initAction(args, logger);
             if (!Auth_1.default.service.connected) {
-                cb(new CommandError('Log in to Microsoft 365 first'));
-                return;
+                throw new CommandError('Log in to Microsoft 365 first');
             }
             try {
                 this.loadValuesFromAccessToken(args);
-                this.commandAction(logger, args, cb);
+                yield this.commandAction(logger, args);
             }
             catch (ex) {
-                cb(new CommandError(ex));
+                if (ex instanceof CommandError) {
+                    throw ex;
+                }
+                throw new CommandError(ex);
             }
-        }, (error) => {
-            cb(new CommandError(error));
         });
     }
     validate(args, command) {
@@ -207,86 +211,95 @@ class Command {
         }
         return commandName;
     }
-    handleRejectedODataPromise(rawResponse, logger, callback) {
+    handleRejectedODataPromise(rawResponse) {
         const res = JSON.parse(JSON.stringify(rawResponse));
         if (res.error) {
             try {
                 const err = JSON.parse(res.error);
-                callback(new CommandError(err['odata.error'].message.value));
+                throw new CommandError(err['odata.error'].message.value);
             }
-            catch (_a) {
+            catch (err) {
+                if (err instanceof CommandError) {
+                    throw err;
+                }
                 try {
                     const graphResponseError = res.error;
                     if (graphResponseError.error.code) {
-                        callback(new CommandError(graphResponseError.error.code + " - " + graphResponseError.error.message));
+                        throw new CommandError(graphResponseError.error.code + " - " + graphResponseError.error.message);
                     }
                     else {
-                        callback(new CommandError(graphResponseError.error.message));
+                        throw new CommandError(graphResponseError.error.message);
                     }
                 }
-                catch (_b) {
-                    callback(new CommandError(res.error));
+                catch (err) {
+                    if (err instanceof CommandError) {
+                        throw err;
+                    }
+                    throw new CommandError(res.error);
                 }
             }
         }
         else {
             if (rawResponse instanceof Error) {
-                callback(new CommandError(rawResponse.message));
+                throw new CommandError(rawResponse.message);
             }
             else {
-                callback(new CommandError(rawResponse));
+                throw new CommandError(rawResponse);
             }
         }
     }
-    handleRejectedODataJsonPromise(response, logger, callback) {
+    handleRejectedODataJsonPromise(response) {
         if (response.error &&
             response.error['odata.error'] &&
             response.error['odata.error'].message) {
-            return callback(new CommandError(response.error['odata.error'].message.value));
+            throw new CommandError(response.error['odata.error'].message.value);
         }
         if (!response.error) {
             if (response instanceof Error) {
-                return callback(new CommandError(response.message));
+                throw new CommandError(response.message);
             }
             else {
-                return callback(new CommandError(response));
+                throw new CommandError(response);
             }
         }
         if (response.error.error &&
             response.error.error.message) {
-            return callback(new CommandError(response.error.error.message));
+            throw new CommandError(response.error.error.message);
         }
         if (response.error.message) {
-            return callback(new CommandError(response.error.message));
+            throw new CommandError(response.error.message);
         }
         if (response.error.error_description) {
-            return callback(new CommandError(response.error.error_description));
+            throw new CommandError(response.error.error_description);
         }
         try {
             const error = JSON.parse(response.error);
             if (error &&
                 error.error &&
                 error.error.message) {
-                callback(new CommandError(error.error.message));
+                throw new CommandError(error.error.message);
             }
             else {
-                callback(new CommandError(response.error));
+                throw new CommandError(response.error);
             }
         }
-        catch (_a) {
-            callback(new CommandError(response.error));
+        catch (err) {
+            if (err instanceof CommandError) {
+                throw err;
+            }
+            throw new CommandError(response.error);
         }
     }
-    handleError(rawResponse, logger, callback) {
+    handleError(rawResponse) {
         if (rawResponse instanceof Error) {
-            callback(new CommandError(rawResponse.message));
+            throw new CommandError(rawResponse.message);
         }
         else {
-            callback(new CommandError(rawResponse));
+            throw new CommandError(rawResponse);
         }
     }
-    handleRejectedPromise(rawResponse, logger, callback) {
-        this.handleError(rawResponse, logger, callback);
+    handleRejectedPromise(rawResponse) {
+        this.handleError(rawResponse);
     }
     initAction(args, logger) {
         this.debug = args.options.debug || process.env.CLIMICROSOFT365_DEBUG === '1';

package/dist/cli/Cli.js

@@ -116,7 +116,7 @@ class Cli {
             }
             // if output not specified, set the configured output value (if any)
             if (optionsWithoutShorts.options.output === undefined) {
-                optionsWithoutShorts.options.output = this.getSettingWithDefaultValue(settingsNames_1.settingsNames.output, undefined);
+                optionsWithoutShorts.options.output = this.getSettingWithDefaultValue(settingsNames_1.settingsNames.output, 'json');
             }
             const validationResult = yield this.commandToExecute.command.validate(optionsWithoutShorts, this.commandToExecute);
             if (validationResult !== true) {
@@ -128,7 +128,7 @@ class Cli {
         });
     }
     static executeCommand(command, args) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             const logger = {
                 log: (message) => {
                     const output = Cli.formatOutput(message, args.options);
@@ -145,22 +145,21 @@ class Cli {
             const cli = Cli.getInstance();
             const parentCommandName = cli.currentCommandName;
             cli.currentCommandName = command.getCommandName(cli.currentCommandName);
-            command.action(logger, args, (err) => {
-                // restore the original command name
-                cli.currentCommandName = parentCommandName;
-                if (err) {
-                    return reject(err);
-                }
+            try {
+                yield command.action(logger, args);
                 if (args.options.debug || args.options.verbose) {
                     const chalk = require('chalk');
                     logger.logToStderr(chalk.green('DONE'));
                 }
-                resolve();
-            });
+            }
+            finally {
+                // restore the original command name
+                cli.currentCommandName = parentCommandName;
+            }
         });
     }
     static executeCommandWithOutput(command, args, listener) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             const log = [];
             const logErr = [];
             const logger = {
@@ -199,22 +198,29 @@ class Cli {
             cli.currentCommandName = command.getCommandName();
             // store the current logger if any
             const currentLogger = request_1.default.logger;
-            command.action(logger, args, (err) => {
+            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;
-                if (err) {
-                    return reject({
-                        error: err,
-                        stderr: logErr.join(os.EOL)
-                    });
-                }
-                resolve({
+                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)
+                };
+            }
         });
     }
     loadAllCommands() {
@@ -664,11 +670,11 @@ class Cli {
             console.error(message, ...optionalParams);
         }
     }
-    static prompt(options, cb) {
-        const inquirer = require('inquirer');
-        inquirer
-            .prompt(options)
-            .then(result => cb(result));
+    static prompt(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const inquirer = require('inquirer');
+            return yield inquirer.prompt(options);
+        });
     }
     static removeShortOptions(args) {
         const filteredArgs = JSON.parse(JSON.stringify(args));

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

@@ -38,38 +38,38 @@ class AadAppAddCommand extends GraphCommand_1.default {
     get description() {
         return 'Creates new Azure AD app registration';
     }
-    commandAction(logger, args, cb) {
-        this
-            .resolveApis(args, logger)
-            .then(apis => this.createAppRegistration(args, apis, logger))
-            .then(appInfo => {
-            // based on the assumption that we're adding AAD app to the current
-            // directory. If we in the future extend the command with allowing
-            // users to create AAD app in a different directory, we'll need to
-            // adjust this
-            appInfo.tenantId = utils_1.accessToken.getTenantIdFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
-            return Promise.resolve(appInfo);
-        })
-            .then(appInfo => this.updateAppFromManifest(args, appInfo))
-            .then(appInfo => this.grantAdminConsent(appInfo, args.options.grantAdminConsent, logger))
-            .then(appInfo => this.configureUri(args, appInfo, logger))
-            .then(appInfo => this.configureSecret(args, appInfo, logger))
-            .then(appInfo => this.saveAppInfo(args, appInfo, logger))
-            .then((_appInfo) => {
-            const appInfo = {
-                appId: _appInfo.appId,
-                objectId: _appInfo.id,
-                tenantId: _appInfo.tenantId
-            };
-            if (_appInfo.secret) {
-                appInfo.secret = _appInfo.secret;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const apis = yield this.resolveApis(args, logger);
+                let appInfo = yield this.createAppRegistration(args, apis, logger);
+                // based on the assumption that we're adding AAD app to the current
+                // directory. If we in the future extend the command with allowing
+                // users to create AAD app in a different directory, we'll need to
+                // adjust this
+                appInfo.tenantId = utils_1.accessToken.getTenantIdFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
+                appInfo = yield this.updateAppFromManifest(args, appInfo);
+                appInfo = yield this.grantAdminConsent(appInfo, args.options.grantAdminConsent, logger);
+                appInfo = yield this.configureUri(args, appInfo, logger);
+                appInfo = yield this.configureSecret(args, appInfo, logger);
+                const _appInfo = yield this.saveAppInfo(args, appInfo, logger);
+                appInfo = {
+                    appId: _appInfo.appId,
+                    objectId: _appInfo.id,
+                    tenantId: _appInfo.tenantId
+                };
+                if (_appInfo.secret) {
+                    appInfo.secret = _appInfo.secret;
+                }
+                if (_appInfo.secrets) {
+                    appInfo.secrets = _appInfo.secrets;
+                }
+                logger.log(appInfo);
             }
-            if (_appInfo.secrets) {
-                appInfo.secrets = _appInfo.secrets;
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            logger.log(appInfo);
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        });
     }
     createAppRegistration(args, apis, logger) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/m365/aad/commands/app/app-get.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 _AadAppGetCommand_instances, _AadAppGetCommand_initTelemetry, _AadAppGetCommand_initOptions, _AadAppGetCommand_initValidators;
+var _AadAppGetCommand_instances, _AadAppGetCommand_initTelemetry, _AadAppGetCommand_initOptions, _AadAppGetCommand_initValidators, _AadAppGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const request_1 = require("../../../../request");
@@ -27,6 +27,7 @@ class AadAppGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadAppGetCommand_instances, "m", _AadAppGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadAppGetCommand_instances, "m", _AadAppGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadAppGetCommand_instances, "m", _AadAppGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAppGetCommand_instances, "m", _AadAppGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APP_GET;
@@ -34,15 +35,18 @@ class AadAppGetCommand extends GraphCommand_1.default {
     get description() {
         return 'Gets an Azure AD app registration';
     }
-    commandAction(logger, args, cb) {
-        this
-            .getAppObjectId(args)
-            .then(appObjectId => this.getAppInfo(appObjectId))
-            .then(appInfo => this.saveAppInfo(args, appInfo, logger))
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const appObjectId = yield this.getAppObjectId(args);
+                const appInfo = yield this.getAppInfo(appObjectId);
+                const res = yield this.saveAppInfo(args, appInfo, logger);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getAppObjectId(args) {
         if (args.options.objectId) {
@@ -136,16 +140,6 @@ _AadAppGetCommand_instances = new WeakSet(), _AadAppGetCommand_initTelemetry = f
     this.options.unshift({ option: '--appId [appId]' }, { option: '--objectId [objectId]' }, { option: '--name [name]' }, { option: '--save' });
 }, _AadAppGetCommand_initValidators = function _AadAppGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        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 but not both';
-        }
         if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
@@ -154,6 +148,8 @@ _AadAppGetCommand_instances = new WeakSet(), _AadAppGetCommand_initTelemetry = f
         }
         return true;
     }));
+}, _AadAppGetCommand_initOptionSets = function _AadAppGetCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'objectId', 'name']);
 };
 module.exports = new AadAppGetCommand();
 //# sourceMappingURL=app-get.js.map

package/dist/m365/aad/commands/app/app-remove.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 _AadAppRemoveCommand_instances, _AadAppRemoveCommand_initTelemetry, _AadAppRemoveCommand_initOptions, _AadAppRemoveCommand_initValidators;
+var _AadAppRemoveCommand_instances, _AadAppRemoveCommand_initTelemetry, _AadAppRemoveCommand_initOptions, _AadAppRemoveCommand_initValidators, _AadAppRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -27,6 +27,7 @@ class AadAppRemoveCommand extends GraphCommand_1.default {
         __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;
@@ -37,44 +38,43 @@ class AadAppRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Removes an Azure AD app registration';
     }
-    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* () {
+            this.showDeprecationWarning(logger, commands_1.default.APP_DELETE, commands_1.default.APP_REMOVE);
+            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) {
@@ -121,16 +121,6 @@ _AadAppRemoveCommand_instances = new WeakSet(), _AadAppRemoveCommand_initTelemet
     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 &&
-            !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)) {
             return `${args.options.appId} is not a valid GUID`;
         }
@@ -139,6 +129,8 @@ _AadAppRemoveCommand_instances = new WeakSet(), _AadAppRemoveCommand_initTelemet
         }
         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

@@ -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 _AadAppRoleAddCommand_instances, _AadAppRoleAddCommand_initTelemetry, _AadAppRoleAddCommand_initOptions, _AadAppRoleAddCommand_initValidators;
+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");
@@ -26,6 +26,7 @@ class AadAppRoleAddCommand extends GraphCommand_1.default {
         __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;
@@ -33,33 +34,36 @@ class AadAppRoleAddCommand extends GraphCommand_1.default {
     get description() {
         return 'Adds role to the specified Azure AD app registration';
     }
-    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) {
@@ -132,15 +136,7 @@ _AadAppRoleAddCommand_instances = new WeakSet(), _AadAppRoleAddCommand_initTelem
     }, { option: '-c, --claim <claim>' });
 }, _AadAppRoleAddCommand_initValidators = function _AadAppRoleAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        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`;
-        }
+        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(', ')}`;
         }
@@ -155,6 +151,8 @@ _AadAppRoleAddCommand_instances = new WeakSet(), _AadAppRoleAddCommand_initTelem
         }
         return true;
     }));
+}, _AadAppRoleAddCommand_initOptionSets = function _AadAppRoleAddCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'appObjectId', 'appName']);
 };
 AadAppRoleAddCommand.allowedMembers = ['usersGroups', 'applications', 'both'];
 module.exports = new AadAppRoleAddCommand();