@pnp/cli-microsoft365 6.0.0-beta.5637b93 → 6.0.0-beta.66b6874

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

package/dist/m365/aad/commands/approleassignment/approleassignment-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 _AadAppRoleAssignmentListCommand_instances, _AadAppRoleAssignmentListCommand_initTelemetry, _AadAppRoleAssignmentListCommand_initOptions, _AadAppRoleAssignmentListCommand_initValidators;
+var _AadAppRoleAssignmentListCommand_instances, _AadAppRoleAssignmentListCommand_initTelemetry, _AadAppRoleAssignmentListCommand_initOptions, _AadAppRoleAssignmentListCommand_initValidators, _AadAppRoleAssignmentListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppRoleAssignmentListCommand extends GraphCommand_1.default {
@@ -26,6 +26,7 @@ class AadAppRoleAssignmentListCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadAppRoleAssignmentListCommand_instances, "m", _AadAppRoleAssignmentListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadAppRoleAssignmentListCommand_instances, "m", _AadAppRoleAssignmentListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadAppRoleAssignmentListCommand_instances, "m", _AadAppRoleAssignmentListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleAssignmentListCommand_instances, "m", _AadAppRoleAssignmentListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APPROLEASSIGNMENT_LIST;
@@ -36,45 +37,45 @@ class AadAppRoleAssignmentListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['resourceDisplayName', 'roleName'];
     }
-    commandAction(logger, args, cb) {
-        let spAppRoleAssignments;
-        this.getAppRoleAssignments(args.options)
-            .then((appRoleAssignments) => {
-            spAppRoleAssignments = appRoleAssignments;
-            // the role assignment has an appRoleId but no name. To get the name,
-            // we need to get all the roles from the resource. the resource is
-            // a service principal. Multiple roles may have same resource id.
-            const resourceIds = appRoleAssignments.map((item) => item.resourceId);
-            const tasks = [];
-            for (let i = 0; i < resourceIds.length; i++) {
-                tasks.push(this.getServicePrincipal(resourceIds[i]));
-            }
-            return Promise.all(tasks);
-        })
-            .then((resources) => {
-            // loop through all appRoleAssignments for the servicePrincipal
-            // and lookup the appRole.Id in the resources[resourceId].appRoles array...
-            const results = [];
-            spAppRoleAssignments.map((appRoleAssignment) => {
-                const resource = resources.find((r) => r.id === appRoleAssignment.resourceId);
-                if (resource) {
-                    const appRole = resource.appRoles.find((r) => r.id === appRoleAssignment.appRoleId);
-                    if (appRole) {
-                        results.push({
-                            appRoleId: appRoleAssignment.appRoleId,
-                            resourceDisplayName: appRoleAssignment.resourceDisplayName,
-                            resourceId: appRoleAssignment.resourceId,
-                            roleId: appRole.id,
-                            roleName: appRole.value,
-                            created: appRoleAssignment.createdDateTime,
-                            deleted: appRoleAssignment.deletedDateTime
-                        });
-                    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spAppRoleAssignments = yield this.getAppRoleAssignments(args.options);
+                // the role assignment has an appRoleId but no name. To get the name,
+                // we need to get all the roles from the resource. the resource is
+                // a service principal. Multiple roles may have same resource id.
+                const resourceIds = spAppRoleAssignments.map((item) => item.resourceId);
+                const tasks = [];
+                for (let i = 0; i < resourceIds.length; i++) {
+                    tasks.push(this.getServicePrincipal(resourceIds[i]));
                 }
-            });
-            logger.log(results);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+                const resources = yield Promise.all(tasks);
+                // loop through all appRoleAssignments for the servicePrincipal
+                // and lookup the appRole.Id in the resources[resourceId].appRoles array...
+                const results = [];
+                spAppRoleAssignments.map((appRoleAssignment) => {
+                    const resource = resources.find((r) => r.id === appRoleAssignment.resourceId);
+                    if (resource) {
+                        const appRole = resource.appRoles.find((r) => r.id === appRoleAssignment.appRoleId);
+                        if (appRole) {
+                            results.push({
+                                appRoleId: appRoleAssignment.appRoleId,
+                                resourceDisplayName: appRoleAssignment.resourceDisplayName,
+                                resourceId: appRoleAssignment.resourceId,
+                                roleId: appRole.id,
+                                roleName: appRole.value,
+                                created: appRoleAssignment.createdDateTime,
+                                deleted: appRoleAssignment.deletedDateTime
+                            });
+                        }
+                    }
+                });
+                logger.log(results);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getAppRoleAssignments(argOptions) {
         return new Promise((resolve, reject) => {
@@ -161,24 +162,16 @@ _AadAppRoleAssignmentListCommand_instances = new WeakSet(), _AadAppRoleAssignmen
     });
 }, _AadAppRoleAssignmentListCommand_initValidators = function _AadAppRoleAssignmentListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.appId && !args.options.appDisplayName && !args.options.appObjectId) {
-            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`;
         }
-        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';
-        }
         return true;
     }));
+}, _AadAppRoleAssignmentListCommand_initOptionSets = function _AadAppRoleAssignmentListCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'appObjectId', 'appDisplayName']);
 };
 module.exports = new AadAppRoleAssignmentListCommand();
 //# sourceMappingURL=approleassignment-list.js.map

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

@@ -13,12 +13,12 @@ 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 _AadAppRoleAssignmentRemoveCommand_instances, _AadAppRoleAssignmentRemoveCommand_initTelemetry, _AadAppRoleAssignmentRemoveCommand_initOptions, _AadAppRoleAssignmentRemoveCommand_initValidators;
+var _AadAppRoleAssignmentRemoveCommand_instances, _AadAppRoleAssignmentRemoveCommand_initTelemetry, _AadAppRoleAssignmentRemoveCommand_initOptions, _AadAppRoleAssignmentRemoveCommand_initValidators, _AadAppRoleAssignmentRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
-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 AadAppRoleAssignmentRemoveCommand extends GraphCommand_1.default {
@@ -28,6 +28,7 @@ class AadAppRoleAssignmentRemoveCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadAppRoleAssignmentRemoveCommand_instances, "m", _AadAppRoleAssignmentRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadAppRoleAssignmentRemoveCommand_instances, "m", _AadAppRoleAssignmentRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadAppRoleAssignmentRemoveCommand_instances, "m", _AadAppRoleAssignmentRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAppRoleAssignmentRemoveCommand_instances, "m", _AadAppRoleAssignmentRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APPROLEASSIGNMENT_REMOVE;
@@ -35,105 +36,103 @@ class AadAppRoleAssignmentRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Deletes an app role assignment for the specified Azure AD Application Registration';
     }
-    commandAction(logger, args, cb) {
-        const removeAppRoleAssignment = () => {
-            let sp;
-            // get the service principal associated with the appId
-            let spMatchQuery = '';
-            if (args.options.appId) {
-                spMatchQuery = `appId eq '${encodeURIComponent(args.options.appId)}'`;
-            }
-            else if (args.options.appObjectId) {
-                spMatchQuery = `id eq '${encodeURIComponent(args.options.appObjectId)}'`;
-            }
-            else {
-                spMatchQuery = `displayName eq '${encodeURIComponent(args.options.appDisplayName)}'`;
-            }
-            this
-                .getServicePrincipalForApp(spMatchQuery)
-                .then((resp) => {
-                if (!resp.value.length) {
-                    return Promise.reject('app registration not found');
-                }
-                sp = resp.value[0];
-                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 (utils_1.validation.isValidGuid(resource)) {
-                    filter += ` or appId eq '${resource}' or id eq '${resource}'`;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeAppRoleAssignment = () => __awaiter(this, void 0, void 0, function* () {
+                let sp;
+                // get the service principal associated with the appId
+                let spMatchQuery = '';
+                if (args.options.appId) {
+                    spMatchQuery = `appId eq '${encodeURIComponent(args.options.appId)}'`;
                 }
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/servicePrincipals?${filter}`,
-                    headers: {
-                        'accept': 'application/json'
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.get(requestOptions);
-            })
-                .then((resp) => {
-                if (!resp.value.length) {
-                    return Promise.reject('Resource not found');
+                else if (args.options.appObjectId) {
+                    spMatchQuery = `id eq '${encodeURIComponent(args.options.appObjectId)}'`;
                 }
-                const appRolesToBeDeleted = [];
-                const appRolesFound = resp.value[0].appRoles;
-                if (!appRolesFound.length) {
-                    return Promise.reject(`The resource '${args.options.resource}' does not have any application permissions available.`);
+                else {
+                    spMatchQuery = `displayName eq '${encodeURIComponent(args.options.appDisplayName)}'`;
                 }
-                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}`);
+                try {
+                    let resp = yield this.getServicePrincipalForApp(spMatchQuery);
+                    if (!resp.value.length) {
+                        throw 'app registration not found';
                     }
-                    appRolesToBeDeleted.push(existingRoles[0]);
-                }
-                const tasks = [];
-                for (const appRole of appRolesToBeDeleted) {
-                    const appRoleAssignment = sp.appRoleAssignments.filter((role) => role.appRoleId === appRole.id);
-                    if (!appRoleAssignment.length) {
-                        return Promise.reject('App role assignment not found');
+                    sp = resp.value[0];
+                    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;
                     }
-                    tasks.push(this.removeAppRoleAssignmentForServicePrincipal(sp.id, appRoleAssignment[0].id));
-                }
-                return Promise.all(tasks);
-            }).then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeAppRoleAssignment();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the appRoleAssignment with scope ${args.options.scope} for resource ${args.options.resource}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+                    // 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'
+                    };
+                    resp = yield request_1.default.get(requestOptions);
+                    if (!resp.value.length) {
+                        throw 'Resource not found';
+                    }
+                    const appRolesToBeDeleted = [];
+                    const appRolesFound = resp.value[0].appRoles;
+                    if (!appRolesFound.length) {
+                        throw `The resource '${args.options.resource}' does not have any application permissions available.`;
+                    }
+                    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}`;
+                        }
+                        appRolesToBeDeleted.push(existingRoles[0]);
+                    }
+                    const tasks = [];
+                    for (const appRole of appRolesToBeDeleted) {
+                        const appRoleAssignment = sp.appRoleAssignments.filter((role) => role.appRoleId === appRole.id);
+                        if (!appRoleAssignment.length) {
+                            throw 'App role assignment not found';
+                        }
+                        tasks.push(this.removeAppRoleAssignmentForServicePrincipal(sp.id, appRoleAssignment[0].id));
+                    }
+                    yield Promise.all(tasks);
                 }
-                else {
-                    removeAppRoleAssignment();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeAppRoleAssignment();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the appRoleAssignment with scope ${args.options.scope} for resource ${args.options.resource}?`
+                });
+                if (result.continue) {
+                    yield removeAppRoleAssignment();
+                }
+            }
+        });
     }
     getServicePrincipalForApp(filterParam) {
         const spRequestOptions = {
@@ -182,21 +181,16 @@ _AadAppRoleAssignmentRemoveCommand_instances = new WeakSet(), _AadAppRoleAssignm
     });
 }, _AadAppRoleAssignmentRemoveCommand_initValidators = function _AadAppRoleAssignmentRemoveCommand_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;
     }));
+}, _AadAppRoleAssignmentRemoveCommand_initOptionSets = function _AadAppRoleAssignmentRemoveCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'appObjectId', 'appDisplayName']);
 };
 module.exports = new AadAppRoleAssignmentRemoveCommand();
 //# sourceMappingURL=approleassignment-remove.js.map