@pnp/cli-microsoft365 6.0.0-beta.5637b93 → 6.0.0-beta.5bdba89

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

@@ -13,13 +13,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _AadAppAddCommand_instances, _AadAppAddCommand_initTelemetry, _AadAppAddCommand_initOptions, _AadAppAddCommand_initValidators;
+var _AadAppAddCommand_instances, _AadAppAddCommand_initTelemetry, _AadAppAddCommand_initOptions, _AadAppAddCommand_initValidators, _AadAppAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const uuid_1 = require("uuid");
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const accessToken_1 = require("../../../../utils/accessToken");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppAddCommand extends GraphCommand_1.default {
@@ -31,6 +32,7 @@ class AadAppAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APP_ADD;
@@ -38,38 +40,35 @@ 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 = accessToken_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.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* () {
@@ -208,8 +207,6 @@ class AadAppAddCommand extends GraphCommand_1.default {
         delete v2Manifest.appId;
         delete v2Manifest.publisherDomain;
         // extract secrets from the manifest. Store them in a separate variable
-        // and remove them from the manifest because we need to create them
-        // separately
         const secrets = this.getSecretsFromManifest(v2Manifest);
         // Azure Portal returns v2 manifest whereas the Graph API expects a v1.6
         if (args.options.apisApplication || args.options.apisDelegated) {
@@ -217,6 +214,33 @@ class AadAppAddCommand extends GraphCommand_1.default {
             // otherwise, they will be skipped in the app update
             v2Manifest.requiredResourceAccess = appInfo.requiredResourceAccess;
         }
+        if (args.options.redirectUris) {
+            // take submitted redirectUris/platform as options
+            // otherwise, they will be removed from the app
+            v2Manifest.replyUrlsWithType = args.options.redirectUris.split(',').map(u => {
+                return {
+                    url: u.trim(),
+                    type: this.translatePlatformToType(args.options.platform)
+                };
+            });
+        }
+        if (args.options.multitenant) {
+            // override manifest setting when using multitenant flag
+            v2Manifest.signInAudience = 'AzureADMultipleOrgs';
+        }
+        if (args.options.implicitFlow) {
+            // remove manifest settings when using implicitFlow flag
+            delete v2Manifest.oauth2AllowIdTokenImplicitFlow;
+            delete v2Manifest.oauth2AllowImplicitFlow;
+        }
+        if (args.options.scopeName) {
+            // override manifest setting when using options.
+            delete v2Manifest.oauth2Permissions;
+        }
+        if (args.options.certificateFile || args.options.certificateBase64Encoded) {
+            // override manifest setting when using options.
+            delete v2Manifest.keyCredentials;
+        }
         const graphManifest = this.transformManifest(v2Manifest);
         const updateAppRequestOptions = {
             url: `${this.resource}/v1.0/myorganization/applications/${appInfo.id}`,
@@ -424,10 +448,9 @@ class AadAppAddCommand extends GraphCommand_1.default {
         if (this.verbose) {
             logger.logToStderr('Resolving requested APIs...');
         }
-        return utils_1.odata
+        return odata_1.odata
             .getAllItems(`${this.resource}/v1.0/myorganization/servicePrincipals?$select=appId,appRoles,id,oauth2PermissionScopes,servicePrincipalNames`)
             .then(servicePrincipals => {
-            var _a;
             let resolvedApis = [];
             try {
                 if (args.options.apisDelegated || args.options.apisApplication) {
@@ -450,17 +473,10 @@ class AadAppAddCommand extends GraphCommand_1.default {
                         }
                     });
                 }
-                if (typeof ((_a = this.manifest) === null || _a === void 0 ? void 0 : _a.requiredResourceAccess) !== 'undefined' && this.manifest.requiredResourceAccess.length > 0) {
+                else {
                     const manifestApis = this.manifest.requiredResourceAccess;
                     manifestApis.forEach(manifestApi => {
-                        const requiredResource = resolvedApis.find(api => api.resourceAppId === manifestApi.resourceAppId);
-                        if (requiredResource) {
-                            // exclude if any duplicate required resources in both manifest and submitted options
-                            requiredResource.resourceAccess.push(...manifestApi.resourceAccess.filter(manRes => !requiredResource.resourceAccess.some(res => res.id === manRes.id)));
-                        }
-                        else {
-                            resolvedApis.push(manifestApi);
-                        }
+                        resolvedApis.push(manifestApi);
                         const app = servicePrincipals.find(servicePrincipals => servicePrincipals.appId === manifestApi.resourceAppId);
                         if (app) {
                             manifestApi.resourceAccess.forEach((res => {
@@ -549,7 +565,7 @@ class AadAppAddCommand extends GraphCommand_1.default {
         }
     }
     configureSecret(args, appInfo, logger) {
-        if (!args.options.withSecret) {
+        if (!args.options.withSecret || (appInfo.secrets && appInfo.secrets.length > 0)) {
             return Promise.resolve(appInfo);
         }
         if (this.verbose) {
@@ -558,7 +574,10 @@ class AadAppAddCommand extends GraphCommand_1.default {
         return this
             .createSecret({ appObjectId: appInfo.id })
             .then(secret => {
-            appInfo.secret = secret.value;
+            if (!appInfo.secrets) {
+                appInfo.secrets = [];
+            }
+            appInfo.secrets.push(secret);
             return Promise.resolve(appInfo);
         });
     }
@@ -642,6 +661,12 @@ class AadAppAddCommand extends GraphCommand_1.default {
         }
         return Promise.resolve(appInfo);
     }
+    translatePlatformToType(platform) {
+        if (platform === 'publicClient') {
+            return 'InstalledClient';
+        }
+        return platform.charAt(0).toUpperCase() + platform.substring(1);
+    }
 }
 _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCommand_initTelemetry = function _AadAppAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -707,9 +732,6 @@ _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCommand_initTelemetry = f
     });
 }, _AadAppAddCommand_initValidators = function _AadAppAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.manifest && !args.options.name) {
-            return 'Specify either the name of the app to create or the manifest';
-        }
         if (args.options.platform &&
             AadAppAddCommand.aadApplicationPlatform.indexOf(args.options.platform) < 0) {
             return `${args.options.platform} is not a valid value for platform. Allowed values are ${AadAppAddCommand.aadApplicationPlatform.join(', ')}`;
@@ -754,6 +776,8 @@ _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCommand_initTelemetry = f
         }
         return true;
     }));
+}, _AadAppAddCommand_initOptionSets = function _AadAppAddCommand_initOptionSets() {
+    this.optionSets.push(['name', 'manifest']);
 };
 AadAppAddCommand.aadApplicationPlatform = ['spa', 'web', 'publicClient'];
 AadAppAddCommand.aadAppScopeConsentBy = ['admins', 'adminsAndUsers'];

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

@@ -13,11 +13,11 @@ 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");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppGetCommand extends GraphCommand_1.default {
@@ -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,24 +140,16 @@ _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)) {
+        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;
     }));
+}, _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-list.js

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

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

@@ -13,11 +13,11 @@ 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 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 {
@@ -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;
@@ -34,43 +35,42 @@ class AadAppRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Removes an Azure AD app registration';
     }
-    commandAction(logger, args, cb) {
-        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) {
@@ -117,24 +117,16 @@ _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)) {
+        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

@@ -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();

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

@@ -13,10 +13,10 @@ 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 _AadAppRoleListCommand_instances, _AadAppRoleListCommand_initTelemetry, _AadAppRoleListCommand_initOptions, _AadAppRoleListCommand_initValidators;
+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 {
@@ -25,7 +25,7 @@ class AadAppRoleListCommand extends GraphCommand_1.default {
         _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_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleListCommand_instances, "m", _AadAppRoleListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APP_ROLE_LIST;
@@ -36,14 +36,17 @@ class AadAppRoleListCommand extends GraphCommand_1.default {
     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) {
@@ -87,19 +90,8 @@ _AadAppRoleListCommand_instances = new WeakSet(), _AadAppRoleListCommand_initTel
     });
 }, _AadAppRoleListCommand_initOptions = function _AadAppRoleListCommand_initOptions() {
     this.options.unshift({ option: '--appId [appId]' }, { option: '--appObjectId [appObjectId]' }, { option: '--appName [appName]' });
-}, _AadAppRoleListCommand_initValidators = function _AadAppRoleListCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        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_initOptionSets = function _AadAppRoleListCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'appObjectId', 'appName']);
 };
 module.exports = new AadAppRoleListCommand();
 //# sourceMappingURL=app-role-list.js.map