@pnp/cli-microsoft365 6.0.0-beta.37b9374 → 6.0.0-beta.38e141b

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

package/dist/m365/aad/commands/app/app-role-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 _AadAppRoleRemoveCommand_instances, _AadAppRoleRemoveCommand_initTelemetry, _AadAppRoleRemoveCommand_initOptions, _AadAppRoleRemoveCommand_initValidators;
+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 {
@@ -27,6 +27,7 @@ class AadAppRoleRemoveCommand extends GraphCommand_1.default {
         __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;
@@ -34,30 +35,31 @@ class AadAppRoleRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Removes role from the specified Azure AD app registration';
     }
-    commandAction(logger, args, cb) {
-        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
@@ -186,34 +188,15 @@ _AadAppRoleRemoveCommand_instances = new WeakSet(), _AadAppRoleRemoveCommand_ini
     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* () {
-        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`;
-        }
         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

package/dist/m365/aad/commands/app/app-set.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 _AadAppSetCommand_instances, _AadAppSetCommand_initTelemetry, _AadAppSetCommand_initOptions, _AadAppSetCommand_initValidators;
+var _AadAppSetCommand_instances, _AadAppSetCommand_initTelemetry, _AadAppSetCommand_initOptions, _AadAppSetCommand_initValidators, _AadAppSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const request_1 = require("../../../../request");
@@ -26,6 +26,7 @@ class AadAppSetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadAppSetCommand_instances, "m", _AadAppSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadAppSetCommand_instances, "m", _AadAppSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadAppSetCommand_instances, "m", _AadAppSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAppSetCommand_instances, "m", _AadAppSetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APP_SET;
@@ -33,13 +34,18 @@ class AadAppSetCommand extends GraphCommand_1.default {
     get description() {
         return 'Updates Azure AD app registration';
     }
-    commandAction(logger, args, cb) {
-        this
-            .getAppObjectId(args, logger)
-            .then(objectId => this.configureUri(args, objectId, logger))
-            .then(objectId => this.configureRedirectUris(args, objectId, logger))
-            .then(objectId => this.configureCertificate(args, objectId, logger))
-            .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let objectId = yield this.getAppObjectId(args, logger);
+                objectId = yield this.configureUri(args, objectId, logger);
+                objectId = yield this.configureRedirectUris(args, objectId, logger);
+                yield this.configureCertificate(args, objectId, logger);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getAppObjectId(args, logger) {
         if (args.options.objectId) {
@@ -269,16 +275,6 @@ _AadAppSetCommand_instances = new WeakSet(), _AadAppSetCommand_initTelemetry = f
     }, { option: '--redirectUrisToRemove [redirectUrisToRemove]' });
 }, _AadAppSetCommand_initValidators = function _AadAppSetCommand_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.certificateFile && args.options.certificateBase64Encoded) {
             return 'Specify either certificateFile or certificateBase64Encoded but not both';
         }
@@ -297,6 +293,8 @@ _AadAppSetCommand_instances = new WeakSet(), _AadAppSetCommand_initTelemetry = f
         }
         return true;
     }));
+}, _AadAppSetCommand_initOptionSets = function _AadAppSetCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'objectId', 'name']);
 };
 AadAppSetCommand.aadApplicationPlatform = ['spa', 'web', 'publicClient'];
 module.exports = new AadAppSetCommand();

package/dist/m365/aad/commands/approleassignment/approleassignment-add.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 _AadAppRoleAssignmentAddCommand_instances, _AadAppRoleAssignmentAddCommand_initTelemetry, _AadAppRoleAssignmentAddCommand_initOptions, _AadAppRoleAssignmentAddCommand_initValidators;
+var _AadAppRoleAssignmentAddCommand_instances, _AadAppRoleAssignmentAddCommand_initTelemetry, _AadAppRoleAssignmentAddCommand_initOptions, _AadAppRoleAssignmentAddCommand_initValidators, _AadAppRoleAssignmentAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 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 AadAppRoleAssignmentAddCommand extends GraphCommand_1.default {
@@ -27,6 +27,7 @@ class AadAppRoleAssignmentAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadAppRoleAssignmentAddCommand_instances, "m", _AadAppRoleAssignmentAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadAppRoleAssignmentAddCommand_instances, "m", _AadAppRoleAssignmentAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadAppRoleAssignmentAddCommand_instances, "m", _AadAppRoleAssignmentAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleAssignmentAddCommand_instances, "m", _AadAppRoleAssignmentAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APPROLEASSIGNMENT_ADD;
@@ -34,111 +35,107 @@ class AadAppRoleAssignmentAddCommand extends GraphCommand_1.default {
     get description() {
         return 'Adds service principal permissions also known as scopes and app role assignments for specified Azure AD application registration';
     }
-    commandAction(logger, args, cb) {
-        let objectId = '';
-        let queryFilter = '';
-        if (args.options.appId) {
-            queryFilter = `$filter=appId eq '${encodeURIComponent(args.options.appId)}'`;
-        }
-        else if (args.options.appObjectId) {
-            queryFilter = `$filter=id eq '${encodeURIComponent(args.options.appObjectId)}'`;
-        }
-        else {
-            queryFilter = `$filter=displayName eq '${encodeURIComponent(args.options.appDisplayName)}'`;
-        }
-        const getServicePrinciplesRequestOptions = {
-            url: `${this.resource}/v1.0/servicePrincipals?${queryFilter}`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(getServicePrinciplesRequestOptions)
-            .then((servicePrincipalResult) => {
-            if (servicePrincipalResult.value.length > 1) {
-                return Promise.reject('More than one service principal found. Please use the appId or appObjectId option to make sure the right service principal is specified.');
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let objectId = '';
+            let queryFilter = '';
+            if (args.options.appId) {
+                queryFilter = `$filter=appId eq '${encodeURIComponent(args.options.appId)}'`;
             }
-            objectId = servicePrincipalResult.value[0].id;
-            let resource = encodeURIComponent(args.options.resource);
-            // try resolve aliases that the user might enter since these are seen in the Azure portal
-            switch (args.options.resource.toLocaleLowerCase()) {
-                case 'sharepoint':
-                    resource = 'Office 365 SharePoint Online';
-                    break;
-                case 'intune':
-                    resource = 'Microsoft Intune API';
-                    break;
-                case 'exchange':
-                    resource = 'Office 365 Exchange Online';
-                    break;
+            else if (args.options.appObjectId) {
+                queryFilter = `$filter=id eq '${encodeURIComponent(args.options.appObjectId)}'`;
             }
-            // will perform resource name, appId or objectId search
-            let filter = `$filter=(displayName eq '${resource}' or startswith(displayName,'${resource}'))`;
-            if (utils_1.validation.isValidGuid(resource)) {
-                filter += ` or appId eq '${resource}' or id eq '${resource}'`;
+            else {
+                queryFilter = `$filter=displayName eq '${encodeURIComponent(args.options.appDisplayName)}'`;
             }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/servicePrincipals?${filter}`,
+            const getServicePrinciplesRequestOptions = {
+                url: `${this.resource}/v1.0/servicePrincipals?${queryFilter}`,
                 headers: {
-                    'accept': 'application/json'
+                    accept: 'application/json'
                 },
                 responseType: 'json'
             };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            const result = [];
-            // flatten the app roles found
-            const appRolesFound = [];
-            for (const servicePrincipal of res.value) {
-                for (const role of servicePrincipal.appRoles) {
-                    appRolesFound.push({
-                        resourceId: servicePrincipal.id,
-                        objectId: role.id,
-                        value: role.value
+            try {
+                const servicePrincipalResult = yield request_1.default.get(getServicePrinciplesRequestOptions);
+                if (servicePrincipalResult.value.length > 1) {
+                    throw 'More than one service principal found. Please use the appId or appObjectId option to make sure the right service principal is specified.';
+                }
+                objectId = servicePrincipalResult.value[0].id;
+                let resource = encodeURIComponent(args.options.resource);
+                // try resolve aliases that the user might enter since these are seen in the Azure portal
+                switch (args.options.resource.toLocaleLowerCase()) {
+                    case 'sharepoint':
+                        resource = 'Office 365 SharePoint Online';
+                        break;
+                    case 'intune':
+                        resource = 'Microsoft Intune API';
+                        break;
+                    case 'exchange':
+                        resource = 'Office 365 Exchange Online';
+                        break;
+                }
+                // will perform resource name, appId or objectId search
+                let filter = `$filter=(displayName eq '${resource}' or startswith(displayName,'${resource}'))`;
+                if (validation_1.validation.isValidGuid(resource)) {
+                    filter += ` or appId eq '${resource}' or id eq '${resource}'`;
+                }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/servicePrincipals?${filter}`,
+                    headers: {
+                        'accept': 'application/json'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                const appRoles = [];
+                // flatten the app roles found
+                const appRolesFound = [];
+                for (const servicePrincipal of res.value) {
+                    for (const role of servicePrincipal.appRoles) {
+                        appRolesFound.push({
+                            resourceId: servicePrincipal.id,
+                            objectId: role.id,
+                            value: role.value
+                        });
+                    }
+                }
+                if (!appRolesFound.length) {
+                    throw `The resource '${args.options.resource}' does not have any application permissions available.`;
+                }
+                // search for match between the found app roles and the specified scope option value
+                for (const scope of args.options.scope.split(',')) {
+                    const existingRoles = appRolesFound.filter((role) => {
+                        return role.value.toLocaleLowerCase() === scope.toLocaleLowerCase().trim();
                     });
+                    if (!existingRoles.length) {
+                        // the role specified in the scope option does not belong to the found service principles
+                        // throw an error and show list with available roles (scopes)
+                        let availableRoles = '';
+                        appRolesFound.map((r) => availableRoles += `${os.EOL}${r.value}`);
+                        throw `The scope value '${scope}' you have specified does not exist for ${args.options.resource}. ${os.EOL}Available scopes (application permissions) are: ${availableRoles}`;
+                    }
+                    appRoles.push(existingRoles[0]);
                 }
-            }
-            if (!appRolesFound.length) {
-                return Promise.reject(`The resource '${args.options.resource}' does not have any application permissions available.`);
-            }
-            // search for match between the found app roles and the specified scope option value
-            for (const scope of args.options.scope.split(',')) {
-                const existingRoles = appRolesFound.filter((role) => {
-                    return role.value.toLocaleLowerCase() === scope.toLocaleLowerCase().trim();
-                });
-                if (!existingRoles.length) {
-                    // the role specified in the scope option does not belong to the found service principles
-                    // throw an error and show list with available roles (scopes)
-                    let availableRoles = '';
-                    appRolesFound.map((r) => availableRoles += `${os.EOL}${r.value}`);
-                    return Promise.reject(`The scope value '${scope}' you have specified does not exist for ${args.options.resource}. ${os.EOL}Available scopes (application permissions) are: ${availableRoles}`);
+                const tasks = [];
+                for (const appRole of appRoles) {
+                    tasks.push(this.addRoleToServicePrincipal(objectId, appRole));
+                }
+                const rolesAddedResponse = yield Promise.all(tasks);
+                if (args.options.output && args.options.output.toLowerCase() === 'json') {
+                    logger.log(rolesAddedResponse);
+                }
+                else {
+                    logger.log(rolesAddedResponse.map((result) => ({
+                        objectId: result.id,
+                        principalDisplayName: result.principalDisplayName,
+                        resourceDisplayName: result.resourceDisplayName
+                    })));
                 }
-                result.push(existingRoles[0]);
-            }
-            return Promise.resolve(result);
-        })
-            .then((appRoles) => {
-            const tasks = [];
-            for (const appRole of appRoles) {
-                tasks.push(this.addRoleToServicePrincipal(objectId, appRole));
-            }
-            return Promise.all(tasks);
-        })
-            .then((rolesAddedResponse) => {
-            if (args.options.output && args.options.output.toLowerCase() === 'json') {
-                logger.log(rolesAddedResponse);
             }
-            else {
-                logger.log(rolesAddedResponse.map((result) => ({
-                    objectId: result.id,
-                    principalDisplayName: result.principalDisplayName,
-                    resourceDisplayName: result.resourceDisplayName
-                })));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        });
     }
     addRoleToServicePrincipal(objectId, appRole) {
         const requestOptions = {
@@ -179,21 +176,16 @@ _AadAppRoleAssignmentAddCommand_instances = new WeakSet(), _AadAppRoleAssignment
     });
 }, _AadAppRoleAssignmentAddCommand_initValidators = function _AadAppRoleAssignmentAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        let optionsSpecified = 0;
-        optionsSpecified += args.options.appId ? 1 : 0;
-        optionsSpecified += args.options.appDisplayName ? 1 : 0;
-        optionsSpecified += args.options.appObjectId ? 1 : 0;
-        if (optionsSpecified !== 1) {
-            return 'Specify either appId, appObjectId or appDisplayName';
-        }
-        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.appObjectId && !utils_1.validation.isValidGuid(args.options.appObjectId)) {
+        if (args.options.appObjectId && !validation_1.validation.isValidGuid(args.options.appObjectId)) {
             return `${args.options.appObjectId} is not a valid GUID`;
         }
         return true;
     }));
+}, _AadAppRoleAssignmentAddCommand_initOptionSets = function _AadAppRoleAssignmentAddCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'appObjectId', 'appDisplayName']);
 };
 module.exports = new AadAppRoleAssignmentAddCommand();
 //# sourceMappingURL=approleassignment-add.js.map