@pnp/cli-microsoft365 7.3.0-beta.16c6462 → 7.3.0-beta.38bb1d7

package/dist/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { Cli } from './cli/Cli.js';
+import { cli } from './cli/cli.js';
 import { app } from './utils/app.js';
 // required to make console.log() in combination with piped output synchronous
 // on Windows/in PowerShell so that the output is not trimmed by calling
@@ -13,5 +13,5 @@ if (!process.env.CLIMICROSOFT365_NOUPDATE) {
         updateNotifier.default({ pkg: app.packageJson() }).notify({ defer: false });
     });
 }
-Cli.getInstance().execute(process.argv.slice(2));
+cli.execute(process.argv.slice(2));
 //# sourceMappingURL=index.js.map

package/dist/m365/aad/commands/administrativeunit/administrativeunit-member-add.js

@@ -0,0 +1,137 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _AadAdministrativeUnitMemberAddCommand_instances, _AadAdministrativeUnitMemberAddCommand_initTelemetry, _AadAdministrativeUnitMemberAddCommand_initOptions, _AadAdministrativeUnitMemberAddCommand_initValidators, _AadAdministrativeUnitMemberAddCommand_initOptionSets;
+import { aadAdministrativeUnit } from "../../../../utils/aadAdministrativeUnit.js";
+import { aadGroup } from "../../../../utils/aadGroup.js";
+import { aadUser } from "../../../../utils/aadUser.js";
+import { validation } from "../../../../utils/validation.js";
+import GraphCommand from "../../../base/GraphCommand.js";
+import commands from "../../commands.js";
+import request from "../../../../request.js";
+import { aadDevice } from "../../../../utils/aadDevice.js";
+class AadAdministrativeUnitMemberAddCommand extends GraphCommand {
+    get name() {
+        return commands.ADMINISTRATIVEUNIT_MEMBER_ADD;
+    }
+    get description() {
+        return 'Adds a member (user, group, device) to an administrative unit';
+    }
+    constructor() {
+        super();
+        _AadAdministrativeUnitMemberAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitMemberAddCommand_instances, "m", _AadAdministrativeUnitMemberAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitMemberAddCommand_instances, "m", _AadAdministrativeUnitMemberAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitMemberAddCommand_instances, "m", _AadAdministrativeUnitMemberAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitMemberAddCommand_instances, "m", _AadAdministrativeUnitMemberAddCommand_initOptionSets).call(this);
+    }
+    async commandAction(logger, args) {
+        let administrativeUnitId = args.options.administrativeUnitId;
+        let memberType;
+        let memberId;
+        try {
+            if (args.options.administrativeUnitName) {
+                if (this.verbose) {
+                    await logger.logToStderr(`Retrieving Administrative Unit Id...`);
+                }
+                administrativeUnitId = (await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id;
+            }
+            if (args.options.userId || args.options.userName) {
+                memberType = 'users';
+                memberId = args.options.userId;
+                if (args.options.userName) {
+                    if (this.verbose) {
+                        await logger.logToStderr(`Retrieving User Id...`);
+                    }
+                    memberId = await aadUser.getUserIdByUpn(args.options.userName);
+                }
+            }
+            else if (args.options.groupId || args.options.groupName) {
+                memberType = 'groups';
+                memberId = args.options.groupId;
+                if (args.options.groupName) {
+                    if (this.verbose) {
+                        await logger.logToStderr(`Retrieving Group Id...`);
+                    }
+                    memberId = await aadGroup.getGroupIdByDisplayName(args.options.groupName);
+                }
+            }
+            else if (args.options.deviceId || args.options.deviceName) {
+                memberType = 'devices';
+                memberId = args.options.deviceId;
+                if (args.options.deviceName) {
+                    if (this.verbose) {
+                        await logger.logToStderr(`Device with name ${args.options.deviceName} retrieved, returned id: ${memberId}`);
+                    }
+                    memberId = (await aadDevice.getDeviceByDisplayName(args.options.deviceName)).id;
+                }
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/directory/administrativeUnits/${administrativeUnitId}/members/$ref`,
+                headers: {
+                    'accept': 'application/json;odata.metadata=none'
+                },
+                data: {
+                    "@odata.id": `https://graph.microsoft.com/v1.0/${memberType}/${memberId}`
+                }
+            };
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+_AadAdministrativeUnitMemberAddCommand_instances = new WeakSet(), _AadAdministrativeUnitMemberAddCommand_initTelemetry = function _AadAdministrativeUnitMemberAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            groupId: typeof args.options.groupId !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
+            deviceId: typeof args.options.deviceId !== 'undefined',
+            deviceName: typeof args.options.deviceName !== 'undefined'
+        });
+    });
+}, _AadAdministrativeUnitMemberAddCommand_initOptions = function _AadAdministrativeUnitMemberAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --administrativeUnitId [administrativeUnitId]'
+    }, {
+        option: '-n, --administrativeUnitName [administrativeUnitName]'
+    }, {
+        option: "--userId [userId]"
+    }, {
+        option: "--userName [userName]"
+    }, {
+        option: "--groupId [groupId]"
+    }, {
+        option: "--groupName [groupName]"
+    }, {
+        option: "--deviceId [deviceId]"
+    }, {
+        option: "--deviceName [deviceName]"
+    });
+}, _AadAdministrativeUnitMemberAddCommand_initValidators = function _AadAdministrativeUnitMemberAddCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.administrativeUnitId && !validation.isValidGuid(args.options.administrativeUnitId)) {
+            return `${args.options.administrativeUnitId} is not a valid GUID`;
+        }
+        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID`;
+        }
+        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
+            return `${args.options.groupId} is not a valid GUID`;
+        }
+        if (args.options.deviceId && !validation.isValidGuid(args.options.deviceId)) {
+            return `${args.options.deviceId} is not a valid GUID`;
+        }
+        return true;
+    });
+}, _AadAdministrativeUnitMemberAddCommand_initOptionSets = function _AadAdministrativeUnitMemberAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['administrativeUnitId', 'administrativeUnitName'] });
+    this.optionSets.push({ options: ['userId', 'userName', 'groupId', 'groupName', 'deviceId', 'deviceName'] });
+};
+export default new AadAdministrativeUnitMemberAddCommand();
+//# sourceMappingURL=administrativeunit-member-add.js.map

package/dist/m365/aad/commands/administrativeunit/administrativeunit-member-list.js

@@ -0,0 +1,138 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _AadAdministrativeUnitMemberListCommand_instances, _AadAdministrativeUnitMemberListCommand_initTelemetry, _AadAdministrativeUnitMemberListCommand_initOptions, _AadAdministrativeUnitMemberListCommand_initValidators, _AadAdministrativeUnitMemberListCommand_initOptionSets;
+import { odata } from '../../../../utils/odata.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js';
+import { validation } from '../../../../utils/validation.js';
+class AadAdministrativeUnitMemberListCommand extends GraphCommand {
+    get name() {
+        return commands.ADMINISTRATIVEUNIT_MEMBER_LIST;
+    }
+    get description() {
+        return 'Retrieves members (users, groups, or devices) of an administrative unit.';
+    }
+    defaultProperties() {
+        return ['id', 'displayName'];
+    }
+    constructor() {
+        super();
+        _AadAdministrativeUnitMemberListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitMemberListCommand_instances, "m", _AadAdministrativeUnitMemberListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitMemberListCommand_instances, "m", _AadAdministrativeUnitMemberListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitMemberListCommand_instances, "m", _AadAdministrativeUnitMemberListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitMemberListCommand_instances, "m", _AadAdministrativeUnitMemberListCommand_initOptionSets).call(this);
+    }
+    async commandAction(logger, args) {
+        let administrativeUnitId = args.options.administrativeUnitId;
+        try {
+            if (args.options.administrativeUnitName) {
+                administrativeUnitId = (await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id;
+            }
+            let results;
+            const endpoint = this.getRequestUrl(administrativeUnitId, args.options);
+            if (args.options.type) {
+                if (args.options.filter) {
+                    // While using the filter, we need to specify the ConsistencyLevel header.
+                    // Can be refactored when the header is no longer necessary.
+                    const requestOptions = {
+                        url: endpoint,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none',
+                            ConsistencyLevel: 'eventual'
+                        },
+                        responseType: 'json'
+                    };
+                    results = await odata.getAllItems(requestOptions);
+                }
+                else {
+                    results = await odata.getAllItems(endpoint);
+                }
+            }
+            else {
+                results = await odata.getAllItems(endpoint, 'minimal');
+                results.forEach(c => {
+                    const odataType = c['@odata.type'];
+                    if (odataType) {
+                        c.type = odataType.replace('#microsoft.graph.', '');
+                    }
+                    delete c['@odata.type'];
+                });
+            }
+            await logger.log(results);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    getRequestUrl(administrativeUnitId, options) {
+        const queryParameters = [];
+        if (options.properties) {
+            const allProperties = options.properties.split(',');
+            const selectProperties = allProperties.filter(prop => !prop.includes('/'));
+            const expandProperties = allProperties.filter(prop => prop.includes('/'));
+            if (selectProperties.length > 0) {
+                queryParameters.push(`$select=${selectProperties}`);
+            }
+            if (expandProperties.length > 0) {
+                const fieldExpands = expandProperties.map(p => `${p.split('/')[0]}($select=${p.split('/')[1]})`);
+                queryParameters.push(`$expand=${fieldExpands.join(',')}`);
+            }
+        }
+        if (options.filter) {
+            queryParameters.push(`$filter=${options.filter}`);
+            queryParameters.push('$count=true');
+        }
+        const queryString = queryParameters.length > 0
+            ? `?${queryParameters.join('&')}`
+            : '';
+        return options.type
+            ? `${this.resource}/v1.0/directory/administrativeUnits/${administrativeUnitId}/members/microsoft.graph.${options.type}${queryString}`
+            : `${this.resource}/v1.0/directory/administrativeUnits/${administrativeUnitId}/members${queryString}`;
+    }
+}
+_AadAdministrativeUnitMemberListCommand_instances = new WeakSet(), _AadAdministrativeUnitMemberListCommand_initTelemetry = function _AadAdministrativeUnitMemberListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            type: typeof args.options.type !== 'undefined',
+            properties: typeof args.options.properties !== 'undefined',
+            filter: typeof args.options.filter !== 'undefined'
+        });
+    });
+}, _AadAdministrativeUnitMemberListCommand_initOptions = function _AadAdministrativeUnitMemberListCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --administrativeUnitId [administrativeUnitId]'
+    }, {
+        option: '-n, --administrativeUnitName [administrativeUnitName]'
+    }, {
+        option: '-t, --type [type]',
+        autocomplete: ['user', 'group', 'device']
+    }, {
+        option: '-p, --properties [properties]'
+    }, {
+        option: '-f, --filter [filter]'
+    });
+}, _AadAdministrativeUnitMemberListCommand_initValidators = function _AadAdministrativeUnitMemberListCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.administrativeUnitId && !validation.isValidGuid(args.options.administrativeUnitId)) {
+            return `${args.options.administrativeUnitId} is not a valid GUID`;
+        }
+        if (args.options.type) {
+            if (['user', 'group', 'device'].every(type => type !== args.options.type)) {
+                return `${args.options.type} is not a valid type value. Allowed values user|group|device`;
+            }
+        }
+        if (args.options.filter && !args.options.type) {
+            return 'Filter can be specified only if type is set';
+        }
+        return true;
+    });
+}, _AadAdministrativeUnitMemberListCommand_initOptionSets = function _AadAdministrativeUnitMemberListCommand_initOptionSets() {
+    this.optionSets.push({ options: ['administrativeUnitId', 'administrativeUnitName'] });
+};
+export default new AadAdministrativeUnitMemberListCommand();
+//# sourceMappingURL=administrativeunit-member-list.js.map

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

@@ -9,7 +9,7 @@ import { validation } from "../../../../utils/validation.js";
 import request from "../../../../request.js";
 import GraphCommand from "../../../base/GraphCommand.js";
 import commands from "../../commands.js";
-import { Cli } from "../../../../cli/Cli.js";
+import { cli } from "../../../../cli/cli.js";
 class AadAdministrativeUnitRemoveCommand extends GraphCommand {
     get name() {
         return commands.ADMINISTRATIVEUNIT_REMOVE;
@@ -50,7 +50,7 @@ class AadAdministrativeUnitRemoveCommand extends GraphCommand {
             await removeAdministrativeUnit();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove administrative unit '${args.options.id || args.options.displayName}'?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove administrative unit '${args.options.id || args.options.displayName}'?` });
             if (result) {
                 await removeAdministrativeUnit();
             }

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

@@ -10,7 +10,7 @@ import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 class AadAppGetCommand extends GraphCommand {
     get name() {
         return commands.APP_GET;
@@ -61,7 +61,7 @@ class AadAppGetCommand extends GraphCommand {
             throw `No Azure AD application registration with ${applicationIdentifier} found`;
         }
         const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-        const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${name}' found.`, resultAsKeyValuePair);
+        const result = await cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${name}' found.`, resultAsKeyValuePair);
         return result.id;
     }
     async getAppInfo(appObjectId) {

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

@@ -0,0 +1,237 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _AadAppPermissionAddCommand_instances, _AadAppPermissionAddCommand_initTelemetry, _AadAppPermissionAddCommand_initOptions, _AadAppPermissionAddCommand_initValidators, _AadAppPermissionAddCommand_initOptionSets;
+import { odata } from "../../../../utils/odata.js";
+import GraphCommand from "../../../base/GraphCommand.js";
+import commands from "../../commands.js";
+import request from "../../../../request.js";
+import { validation } from "../../../../utils/validation.js";
+var ScopeType;
+(function (ScopeType) {
+    ScopeType["Role"] = "Role";
+    ScopeType["Scope"] = "Scope";
+})(ScopeType || (ScopeType = {}));
+class AadAppPermissionAddCommand extends GraphCommand {
+    get name() {
+        return commands.APP_PERMISSION_ADD;
+    }
+    get description() {
+        return 'Adds the specified application and/or delegated permissions to a specified Entra ID (Azure AD) app';
+    }
+    constructor() {
+        super();
+        _AadAppPermissionAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadAppPermissionAddCommand_instances, "m", _AadAppPermissionAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadAppPermissionAddCommand_instances, "m", _AadAppPermissionAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadAppPermissionAddCommand_instances, "m", _AadAppPermissionAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAppPermissionAddCommand_instances, "m", _AadAppPermissionAddCommand_initOptionSets).call(this);
+    }
+    async commandAction(logger, args) {
+        try {
+            const appObject = await this.getAppObject(args.options);
+            const servicePrincipals = await this.getServicePrincipals();
+            const appPermissions = [];
+            if (args.options.delegatedPermissions) {
+                const delegatedPermissions = await this.getRequiredResourceAccessForApis(servicePrincipals, args.options.delegatedPermissions, ScopeType.Scope, appPermissions, logger);
+                this.addPermissionsToResourceArray(delegatedPermissions, appObject.requiredResourceAccess);
+            }
+            if (args.options.applicationPermissions) {
+                const applicationPermissions = await this.getRequiredResourceAccessForApis(servicePrincipals, args.options.applicationPermissions, ScopeType.Role, appPermissions, logger);
+                this.addPermissionsToResourceArray(applicationPermissions, appObject.requiredResourceAccess);
+            }
+            const addPermissionsRequestOptions = {
+                url: `${this.resource}/v1.0/applications/${appObject.id}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    requiredResourceAccess: appObject.requiredResourceAccess
+                }
+            };
+            await request.patch(addPermissionsRequestOptions);
+            if (args.options.grantAdminConsent) {
+                const appServicePrincipal = servicePrincipals.find(sp => sp.appId === appObject.appId);
+                await this.grantAdminConsent(appServicePrincipal, appPermissions, logger);
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getAppObject(options) {
+        let apps;
+        if (options.appObjectId) {
+            apps = await odata.getAllItems(`${this.resource}/v1.0/applications/${options.appObjectId}?$select=id,appId,requiredResourceAccess`);
+        }
+        else {
+            apps = await odata.getAllItems(`${this.resource}/v1.0/applications(appId='${options.appId}')?$select=id,appId,requiredResourceAccess`);
+        }
+        if (apps.length === 0) {
+            throw `App with ${options.appObjectId ? 'object id' : 'client id'} ${options.appObjectId ? options.appObjectId : options.appId} not found in Entra ID (Azure AD)`;
+        }
+        return apps[0];
+    }
+    async getServicePrincipals() {
+        return await odata.getAllItems(`${this.resource}/v1.0/servicePrincipals?$select=appId,appRoles,id,oauth2PermissionScopes,servicePrincipalNames`);
+    }
+    async grantAdminConsent(servicePrincipal, appPermissions, logger) {
+        for await (const permission of appPermissions) {
+            if (permission.scope.length > 0) {
+                if (this.verbose) {
+                    await logger.logToStderr(`Granting consent for delegated permission(s) with resourceId ${permission.resourceId} and scope(s) ${permission.scope.join(' ')}`);
+                }
+                await this.grantOAuth2Permission(servicePrincipal.id, permission.resourceId, permission.scope.join(' '));
+            }
+            for await (const access of permission.resourceAccess.filter(acc => acc.type === ScopeType.Role)) {
+                if (this.verbose) {
+                    await logger.logToStderr(`Granting consent for application permission with resourceId ${permission.resourceId} and appRoleId ${access.id}`);
+                }
+                await this.addRoleToServicePrincipal(servicePrincipal.id, permission.resourceId, access.id);
+            }
+        }
+    }
+    async grantOAuth2Permission(servicePrincipalId, resourceId, scope) {
+        const grantAdminConsentApplicationRequestOptions = {
+            url: `${this.resource}/v1.0/oauth2PermissionGrants`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json',
+            data: {
+                clientId: servicePrincipalId,
+                consentType: 'AllPrincipals',
+                principalId: null,
+                resourceId: resourceId,
+                scope: scope
+            }
+        };
+        return request.post(grantAdminConsentApplicationRequestOptions);
+    }
+    async addRoleToServicePrincipal(servicePrincipalId, resourceId, appRoleId) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/servicePrincipals/${servicePrincipalId}/appRoleAssignments`,
+            headers: {
+                'content-type': 'application/json;odata.metadata=none'
+            },
+            responseType: 'json',
+            data: {
+                appRoleId: appRoleId,
+                principalId: servicePrincipalId,
+                resourceId: resourceId
+            }
+        };
+        return request.post(requestOptions);
+    }
+    async getRequiredResourceAccessForApis(servicePrincipals, apis, scopeType, appPermissions, logger) {
+        const resolvedApis = [];
+        const requestedApis = apis.split(' ').map(a => a.trim());
+        for await (const api of requestedApis) {
+            const pos = api.lastIndexOf('/');
+            const permissionName = api.substring(pos + 1);
+            const servicePrincipalName = api.substring(0, pos);
+            if (this.verbose) {
+                await logger.logToStderr(`Resolving ${api}...`);
+                await logger.logToStderr(`Permission name: ${permissionName}`);
+                await logger.logToStderr(`Service principal name: ${servicePrincipalName}`);
+            }
+            const servicePrincipal = servicePrincipals.find(sp => (sp.servicePrincipalNames.indexOf(servicePrincipalName) > -1 ||
+                sp.servicePrincipalNames.indexOf(`${servicePrincipalName}/`) > -1));
+            if (!servicePrincipal) {
+                throw `Service principal ${servicePrincipalName} not found`;
+            }
+            let permission = undefined;
+            if (scopeType === ScopeType.Scope) {
+                permission = servicePrincipal.oauth2PermissionScopes.find(scope => scope.value === permissionName);
+            }
+            else if (scopeType === ScopeType.Role) {
+                permission = servicePrincipal.appRoles.find(scope => scope.value === permissionName);
+            }
+            if (!permission) {
+                throw `Permission ${permissionName} for service principal ${servicePrincipalName} not found`;
+            }
+            let resolvedApi = resolvedApis.find(a => a.resourceAppId === servicePrincipal.appId);
+            if (!resolvedApi) {
+                resolvedApi = {
+                    resourceAppId: servicePrincipal.appId,
+                    resourceAccess: []
+                };
+                resolvedApis.push(resolvedApi);
+            }
+            const resourceAccessPermission = {
+                id: permission.id,
+                type: scopeType
+            };
+            resolvedApi.resourceAccess.push(resourceAccessPermission);
+            this.updateAppPermissions(servicePrincipal.id, resourceAccessPermission, permission.value, appPermissions);
+        }
+        return resolvedApis;
+    }
+    updateAppPermissions(spId, resourceAccessPermission, oAuth2PermissionValue, appPermissions) {
+        let existingPermission = appPermissions.find(oauth => oauth.resourceId === spId);
+        if (!existingPermission) {
+            existingPermission = {
+                resourceId: spId,
+                resourceAccess: [],
+                scope: []
+            };
+            appPermissions.push(existingPermission);
+        }
+        if (resourceAccessPermission.type === ScopeType.Scope && oAuth2PermissionValue && !existingPermission.scope.find(scp => scp === oAuth2PermissionValue)) {
+            existingPermission.scope.push(oAuth2PermissionValue);
+        }
+        if (!existingPermission.resourceAccess.find(res => res.id === resourceAccessPermission.id)) {
+            existingPermission.resourceAccess.push(resourceAccessPermission);
+        }
+    }
+    addPermissionsToResourceArray(permissions, existingArray) {
+        permissions.forEach(resolvedRequiredResource => {
+            const requiredResource = existingArray.find(api => api.resourceAppId === resolvedRequiredResource.resourceAppId);
+            if (requiredResource) {
+                // make sure that permission does not yet exist on the app or it will be added twice
+                resolvedRequiredResource.resourceAccess.forEach(resAccess => {
+                    if (!requiredResource.resourceAccess.some(res => res.id === resAccess.id)) {
+                        requiredResource.resourceAccess.push(resAccess);
+                    }
+                });
+            }
+            else {
+                existingArray.push(resolvedRequiredResource);
+            }
+        });
+    }
+}
+_AadAppPermissionAddCommand_instances = new WeakSet(), _AadAppPermissionAddCommand_initTelemetry = function _AadAppPermissionAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            appId: typeof args.options.appId !== 'undefined',
+            appObjectId: typeof args.options.appObjectId !== 'undefined',
+            applicationPermissions: typeof args.options.applicationPermissions !== 'undefined',
+            delegatedPermissions: typeof args.options.delegatedPermissions !== 'undefined',
+            grantAdminConsent: !!args.options.grantAdminConsent
+        });
+    });
+}, _AadAppPermissionAddCommand_initOptions = function _AadAppPermissionAddCommand_initOptions() {
+    this.options.unshift({ option: '-i, --appId [appId]' }, { option: '--appObjectId [appObjectId]' }, { option: '-a, --applicationPermissions [applicationPermissions]' }, { option: '-d, --delegatedPermissions [delegatedPermissions]' }, { option: '--grantAdminConsent' });
+}, _AadAppPermissionAddCommand_initValidators = function _AadAppPermissionAddCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
+            return `${args.options.appId} is not a valid GUID`;
+        }
+        if (args.options.appObjectId && !validation.isValidGuid(args.options.appObjectId)) {
+            return `${args.options.appObjectId} is not a valid GUID`;
+        }
+        return true;
+    });
+}, _AadAppPermissionAddCommand_initOptionSets = function _AadAppPermissionAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['appId', 'appObjectId'] });
+    this.optionSets.push({
+        options: ['applicationPermissions', 'delegatedPermissions'],
+        runsWhen: (args) => args.options.delegatedPermissions === undefined && args.options.applicationPermissions === undefined
+    });
+};
+export default new AadAppPermissionAddCommand();
+//# sourceMappingURL=app-permission-add.js.map

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

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AadAppRemoveCommand_instances, _AadAppRemoveCommand_initTelemetry, _AadAppRemoveCommand_initOptions, _AadAppRemoveCommand_initValidators, _AadAppRemoveCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -49,7 +49,7 @@ class AadAppRemoveCommand extends GraphCommand {
             await deleteApp();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the app?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the app?` });
             if (result) {
                 await deleteApp();
             }
@@ -82,7 +82,7 @@ class AadAppRemoveCommand extends GraphCommand {
             throw `No Azure AD application registration with ${applicationIdentifier} found`;
         }
         const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-        const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${name}' found.`, resultAsKeyValuePair);
+        const result = await cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${name}' found.`, resultAsKeyValuePair);
         return result.id;
     }
 }

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

@@ -9,7 +9,7 @@ import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 class AadAppRoleAddCommand extends GraphCommand {
     get name() {
         return commands.APP_ROLE_ADD;
@@ -106,7 +106,7 @@ class AadAppRoleAddCommand extends GraphCommand {
             throw `No Azure AD application registration with ${applicationIdentifier} found`;
         }
         const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-        const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${appName}' found.`, resultAsKeyValuePair);
+        const result = await cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${appName}' found.`, resultAsKeyValuePair);
         return result.id;
     }
 }

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

@@ -9,7 +9,7 @@ import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 class AadAppRoleListCommand extends GraphCommand {
     get name() {
         return commands.APP_ROLE_LIST;
@@ -64,7 +64,7 @@ class AadAppRoleListCommand extends GraphCommand {
             throw `No Azure AD application registration with ${applicationIdentifier} found`;
         }
         const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-        const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${appName}' found.`, resultAsKeyValuePair);
+        const result = await cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${appName}' found.`, resultAsKeyValuePair);
         return result.id;
     }
 }