@pnp/cli-microsoft365 10.0.0-beta.48e9f7d → 10.0.0-beta.a868b81

package/dist/m365/spo/commands/page/page-section-add.js

@@ -3,13 +3,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoPageSectionAddCommand_instances, _a, _SpoPageSectionAddCommand_initTelemetry, _SpoPageSectionAddCommand_initOptions, _SpoPageSectionAddCommand_initValidators;
+var _SpoPageSectionAddCommand_instances, _SpoPageSectionAddCommand_initTelemetry, _SpoPageSectionAddCommand_initOptions, _SpoPageSectionAddCommand_initValidators, _SpoPageSectionAddCommand_initTypes;
+import { v4 } from 'uuid';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import { CanvasSectionTemplate, ZoneEmphasis } from './clientsidepages.js';
+import { CanvasSectionTemplate } from './clientsidepages.js';
 class SpoPageSectionAddCommand extends SpoCommand {
     get name() {
         return commands.PAGE_SECTION_ADD;
@@ -20,13 +21,18 @@ class SpoPageSectionAddCommand extends SpoCommand {
     constructor() {
         super();
         _SpoPageSectionAddCommand_instances.add(this);
+        this.sectionTemplate = ['OneColumn', 'OneColumnFullWidth', 'TwoColumn', 'ThreeColumn', 'TwoColumnLeft', 'TwoColumnRight', 'Vertical'];
+        this.zoneEmphasis = ['None', 'Neutral', 'Soft', 'Strong', 'Image', 'Gradient'];
+        this.iconAlignment = ['Left', 'Right'];
+        this.fillMode = ['ScaleToFill', 'ScaleToFit', 'Tile', 'OriginalSize'];
         __classPrivateFieldGet(this, _SpoPageSectionAddCommand_instances, "m", _SpoPageSectionAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoPageSectionAddCommand_instances, "m", _SpoPageSectionAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoPageSectionAddCommand_instances, "m", _SpoPageSectionAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoPageSectionAddCommand_instances, "m", _SpoPageSectionAddCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         let pageFullName = args.options.pageName.toLowerCase();
-        if (pageFullName.indexOf('.aspx') < 0) {
+        if (!pageFullName.endsWith('.aspx')) {
             pageFullName += '.aspx';
         }
         let canvasContent;
@@ -66,11 +72,22 @@ class SpoPageSectionAddCommand extends SpoCommand {
                 .sort();
             // zoneIndex for the new section to add
             const zoneIndex = this.getSectionIndex(zoneIndices, args.options.order);
+            let zoneId;
+            let backgroundControlToAdd = undefined;
+            if (args.options.zoneEmphasis && ['image', 'gradient'].includes(args.options.zoneEmphasis.toLowerCase())) {
+                zoneId = v4();
+                // get background control based on control type 14
+                const backgroundControl = canvasContent.find(c => c.controlType === 14);
+                backgroundControlToAdd = this.setBackgroundControl(zoneId, backgroundControl, args);
+                if (!backgroundControl) {
+                    canvasContent.push(backgroundControlToAdd);
+                }
+            }
             // get the list of columns to insert based on the selected template
-            const columnsToAdd = this.getColumns(zoneIndex, args.options.sectionTemplate, args.options.zoneEmphasis, args.options.isLayoutReflowOnTop);
+            const columnsToAdd = this.getColumns(zoneIndex, args, zoneId);
             // insert the column in the right place in the array so that
             // it stays sorted ascending by zoneIndex
-            let pos = canvasContent.findIndex(c => typeof c.controlType === 'undefined' && c.position.zoneIndex > zoneIndex);
+            let pos = canvasContent.findIndex(c => typeof c.controlType === 'undefined' && c.position && c.position.zoneIndex > zoneIndex);
             if (pos === -1) {
                 pos = canvasContent.length - 1;
             }
@@ -107,71 +124,146 @@ class SpoPageSectionAddCommand extends SpoCommand {
         }
         return zoneIndices[order - 2] + ((zoneIndices[order - 1] - zoneIndices[order - 2]) / 2);
     }
-    getColumns(zoneIndex, sectionTemplate, zoneEmphasis, isLayoutReflowOnTop) {
+    getColumns(zoneIndex, args, zoneId) {
         const columns = [];
         let sectionIndex = 1;
-        switch (sectionTemplate) {
+        switch (args.options.sectionTemplate) {
             case 'OneColumnFullWidth':
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 0, zoneEmphasis));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 0, args, zoneId));
                 break;
             case 'TwoColumn':
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 6, zoneEmphasis));
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 6, zoneEmphasis));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 6, args, zoneId));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 6, args, zoneId));
                 break;
             case 'ThreeColumn':
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, zoneEmphasis));
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, zoneEmphasis));
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, zoneEmphasis));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, args, zoneId));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, args, zoneId));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, args, zoneId));
                 break;
             case 'TwoColumnLeft':
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 8, zoneEmphasis));
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, zoneEmphasis));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 8, args, zoneId));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, args, zoneId));
                 break;
             case 'TwoColumnRight':
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, zoneEmphasis));
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 8, zoneEmphasis));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, args, zoneId));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 8, args, zoneId));
                 break;
             case 'Vertical':
-                columns.push(this.getVerticalColumn(zoneEmphasis, isLayoutReflowOnTop));
+                columns.push(this.getVerticalColumn(args, zoneId));
                 break;
             case 'OneColumn':
             default:
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 12, zoneEmphasis));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 12, args, zoneId));
                 break;
         }
         return columns;
     }
-    getColumn(zoneIndex, sectionIndex, sectionFactor, zoneEmphasis) {
+    getColumn(zoneIndex, sectionIndex, sectionFactor, args, zoneId) {
+        const { zoneEmphasis, isCollapsibleSection, isExpanded, showDivider, iconAlignment } = args.options;
         const columnValue = {
             displayMode: 2,
             position: {
                 zoneIndex: zoneIndex,
                 sectionIndex: sectionIndex,
                 sectionFactor: sectionFactor,
-                layoutIndex: 1
+                layoutIndex: 1,
+                zoneId: zoneId
             },
             emphasis: {}
         };
-        if (zoneEmphasis) {
-            const zoneEmphasisValue = ZoneEmphasis[zoneEmphasis];
+        if (zoneEmphasis && ['none', 'neutral', 'soft', 'strong'].includes(zoneEmphasis?.toLocaleLowerCase())) {
+            // Just these zoneEmphasis values should be added to column emphasis
+            const zoneEmphasisValue = ['none', 'neutral', 'soft', 'strong'].indexOf(zoneEmphasis.toLocaleLowerCase());
             columnValue.emphasis = { zoneEmphasis: zoneEmphasisValue };
         }
+        if (isCollapsibleSection) {
+            columnValue.zoneGroupMetadata = {
+                type: 1,
+                isExpanded: !!isExpanded,
+                showDividerLine: !!showDivider,
+                iconAlignment: iconAlignment && iconAlignment.toLocaleLowerCase() === "right" ? "right" : "left"
+            };
+        }
         return columnValue;
     }
-    getVerticalColumn(zoneEmphasis, isLayoutReflowOnTop) {
-        const columnValue = this.getColumn(1, 1, 12, zoneEmphasis);
-        columnValue.position.isLayoutReflowOnTop = isLayoutReflowOnTop !== undefined ? true : false;
+    getVerticalColumn(args, zoneId) {
+        const columnValue = this.getColumn(1, 1, 12, args, zoneId);
+        columnValue.position.isLayoutReflowOnTop = args.options.isLayoutReflowOnTop !== undefined;
         columnValue.position.layoutIndex = 2;
         columnValue.position.controlIndex = 1;
         return columnValue;
     }
+    setBackgroundControl(zoneId, backgroundControl, args) {
+        const { overlayColor, overlayOpacity, useLightText, imageUrl } = args.options;
+        const backgroundDetails = this.getBackgroundDetails(args);
+        if (!backgroundControl) {
+            backgroundControl = {
+                controlType: 14,
+                webPartData: {
+                    properties: {
+                        zoneBackground: {}
+                    },
+                    serverProcessedContent: {
+                        htmlStrings: {},
+                        searchablePlainTexts: {},
+                        imageSources: {},
+                        links: {}
+                    },
+                    dataVersion: "1.0"
+                }
+            };
+        }
+        backgroundControl.webPartData.properties.zoneBackground[zoneId] = {
+            ...backgroundDetails,
+            useLightText: !!useLightText,
+            overlay: {
+                color: overlayColor ? overlayColor : "#FFFFFF",
+                opacity: overlayOpacity ? overlayOpacity : 60
+            }
+        };
+        if (imageUrl && backgroundControl.webPartData.serverProcessedContent.imageSources) {
+            backgroundControl.webPartData.serverProcessedContent.imageSources[`zoneBackground.${zoneId}.imageData.url`] = imageUrl;
+        }
+        return backgroundControl;
+    }
+    getBackgroundDetails(args) {
+        const { gradientText, imageUrl, imageHeight, imageWidth, fillMode } = args.options;
+        const backgroundDetails = {};
+        if (gradientText) {
+            backgroundDetails.type = "gradient";
+            backgroundDetails.gradient = gradientText;
+        }
+        if (imageUrl) {
+            backgroundDetails.type = "image";
+            backgroundDetails.imageData = {
+                source: 2,
+                fileName: "sectionbackground.jpg",
+                height: imageHeight ? imageHeight : 955,
+                width: imageWidth ? imageWidth : 555
+            };
+            backgroundDetails.fillMode = fillMode ? this.fillMode.indexOf(fillMode) : 0;
+        }
+        return backgroundDetails;
+    }
 }
-_a = SpoPageSectionAddCommand, _SpoPageSectionAddCommand_instances = new WeakSet(), _SpoPageSectionAddCommand_initTelemetry = function _SpoPageSectionAddCommand_initTelemetry() {
+_SpoPageSectionAddCommand_instances = new WeakSet(), _SpoPageSectionAddCommand_initTelemetry = function _SpoPageSectionAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             order: typeof args.options.order !== 'undefined',
             zoneEmphasis: typeof args.options.zoneEmphasis !== 'undefined',
-            isLayoutReflowOnTop: !!args.options.isLayoutReflowOnTop
+            isLayoutReflowOnTop: !!args.options.isLayoutReflowOnTop,
+            isCollapsibleSection: !!args.options.isCollapsibleSection,
+            showDivider: !!typeof args.options.showDivider,
+            iconAlignment: typeof args.options.iconAlignment !== 'undefined',
+            isExpanded: !!args.options.isExpanded,
+            gradientText: typeof args.options.gradientText !== 'undefined',
+            imageUrl: typeof args.options.imageUrl !== 'undefined',
+            imageHeight: typeof args.options.imageHeight !== 'undefined',
+            imageWidth: typeof args.options.imageWidth !== 'undefined',
+            fillMode: typeof args.options.fillMode !== 'undefined',
+            useLightText: !!args.options.useLightText,
+            overlayColor: typeof args.options.overlayColor !== 'undefined',
+            overlayOpacity: typeof args.options.overlayOpacity !== 'undefined'
         });
     });
 }, _SpoPageSectionAddCommand_initOptions = function _SpoPageSectionAddCommand_initOptions() {
@@ -181,14 +273,40 @@ _a = SpoPageSectionAddCommand, _SpoPageSectionAddCommand_instances = new WeakSet
         option: '-u, --webUrl <webUrl>'
     }, {
         option: '-t, --sectionTemplate <sectionTemplate>',
-        autocomplete: _a.SectionTemplate
+        autocomplete: this.sectionTemplate
     }, {
         option: '--order [order]'
     }, {
         option: '--zoneEmphasis [zoneEmphasis]',
-        autocomplete: _a.ZoneEmphasis
+        autocomplete: this.zoneEmphasis
     }, {
         option: '--isLayoutReflowOnTop'
+    }, {
+        option: '--isCollapsibleSection'
+    }, {
+        option: '--showDivider'
+    }, {
+        option: '--iconAlignment [iconAlignment]',
+        autocomplete: this.iconAlignment
+    }, {
+        option: '--isExpanded'
+    }, {
+        option: '--gradientText [gradientText]'
+    }, {
+        option: '--imageUrl [imageUrl]'
+    }, {
+        option: '--imageHeight [imageHeight]'
+    }, {
+        option: '--imageWidth [imageWidth]'
+    }, {
+        option: '--fillMode [fillMode]',
+        autocomplete: this.fillMode
+    }, {
+        option: '--useLightText'
+    }, {
+        option: '--overlayColor [overlayColor]'
+    }, {
+        option: '--overlayOpacity [overlayOpacity]'
     });
 }, _SpoPageSectionAddCommand_initValidators = function _SpoPageSectionAddCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -201,8 +319,8 @@ _a = SpoPageSectionAddCommand, _SpoPageSectionAddCommand_instances = new WeakSet
             }
         }
         if (typeof args.options.zoneEmphasis !== 'undefined') {
-            if (!(args.options.zoneEmphasis in ZoneEmphasis)) {
-                return 'The value of parameter zoneEmphasis must be None|Neutral|Soft|Strong';
+            if (!this.zoneEmphasis.some(zoneEmphasisValue => zoneEmphasisValue.toLocaleLowerCase() === args.options.zoneEmphasis?.toLowerCase())) {
+                return `The value of parameter zoneEmphasis must be ${this.zoneEmphasis.join(', ')}`;
             }
         }
         if (typeof args.options.isLayoutReflowOnTop !== 'undefined') {
@@ -210,10 +328,43 @@ _a = SpoPageSectionAddCommand, _SpoPageSectionAddCommand_instances = new WeakSet
                 return 'Specify isLayoutReflowOnTop when the sectionTemplate is set to Vertical.';
             }
         }
+        if (typeof args.options.iconAlignment !== 'undefined') {
+            if (!this.iconAlignment.some(iconAlignmentValue => iconAlignmentValue.toLocaleLowerCase() === args.options.iconAlignment?.toLowerCase())) {
+                return `The value of parameter iconAlignment must be ${this.iconAlignment.join(', ')}`;
+            }
+        }
+        if (typeof args.options.fillMode !== 'undefined') {
+            if (!this.fillMode.some(fillModeValue => fillModeValue.toLocaleLowerCase() === args.options.fillMode?.toLowerCase())) {
+                return `The value of parameter fillMode must be ${this.fillMode.join(', ')}`;
+            }
+        }
+        if (args.options.zoneEmphasis?.toLocaleLowerCase() !== 'image' && (args.options.imageUrl || args.options.imageWidth ||
+            args.options.imageHeight || args.options.fillMode)) {
+            return 'Specify imageUrl, imageWidth, imageHeight or fillMode only when zoneEmphasis is set to Image';
+        }
+        if (args.options.zoneEmphasis?.toLocaleLowerCase() === 'image' && !args.options.imageUrl) {
+            return 'Specify imageUrl when zoneEmphasis is set to Image';
+        }
+        if (args.options.zoneEmphasis?.toLowerCase() !== 'gradient' && args.options.gradientText) {
+            return 'Specify gradientText only when zoneEmphasis is set to Gradient';
+        }
+        if (args.options.zoneEmphasis?.toLowerCase() === 'gradient' && !args.options.gradientText) {
+            return 'Specify gradientText when zoneEmphasis is set to Gradient';
+        }
+        if (args.options.overlayOpacity && (args.options.overlayOpacity < 0 || args.options.overlayOpacity > 100)) {
+            return 'The value of parameter overlayOpacity must be between 0 and 100';
+        }
+        if (args.options.overlayColor && !/^#[0-9a-f]{6}$/i.test(args.options.overlayColor)) {
+            return 'The value of parameter overlayColor must be a valid hex color';
+        }
+        if (!(args.options.zoneEmphasis && ['image', 'gradient'].includes(args.options.zoneEmphasis.toLowerCase())) && (args.options.overlayColor || args.options.overlayOpacity || args.options.useLightText)) {
+            return 'Specify overlayColor or overlayOpacity only when zoneEmphasis is set to Image or Gradient';
+        }
         return validation.isValidSharePointUrl(args.options.webUrl);
     });
+}, _SpoPageSectionAddCommand_initTypes = function _SpoPageSectionAddCommand_initTypes() {
+    this.types.string = ['pageName', 'webUrl', 'sectionTemplate', 'zoneEmphasis', 'iconAlignment', 'gradientText', 'imageUrl', 'fillMode', 'overlayColor'];
+    this.types.boolean = ['isLayoutReflowOnTop', 'isCollapsibleSection', 'showDivider', 'isExpanded', 'useLightText'];
 };
-SpoPageSectionAddCommand.SectionTemplate = ['OneColumn', 'OneColumnFullWidth', 'TwoColumn', 'ThreeColumn', 'TwoColumnLeft', 'TwoColumnRight', 'Vertical'];
-SpoPageSectionAddCommand.ZoneEmphasis = ['None', 'Neutral', 'Soft', 'Strong'];
 export default new SpoPageSectionAddCommand();
 //# sourceMappingURL=page-section-add.js.map

package/dist/settingsNames.js

@@ -1,6 +1,11 @@
 const settingsNames = {
     authType: 'authType',
     autoOpenLinksInBrowser: 'autoOpenLinksInBrowser',
+    clientId: 'clientId',
+    clientSecret: 'clientSecret',
+    clientCertificateFile: 'clientCertificateFile',
+    clientCertificateBase64Encoded: 'clientCertificateBase64Encoded',
+    clientCertificatePassword: 'clientCertificatePassword',
     copyDeviceCodeToClipboard: 'copyDeviceCodeToClipboard',
     csvEscape: 'csvEscape',
     csvHeader: 'csvHeader',
@@ -16,7 +21,7 @@ const settingsNames = {
     prompt: 'prompt',
     promptListPageSize: 'promptListPageSize',
     showHelpOnFailure: 'showHelpOnFailure',
-    showSpinner: 'showSpinner'
+    tenantId: 'tenantId'
 };
 export { settingsNames };
 //# sourceMappingURL=settingsNames.js.map

package/dist/utils/entraApp.js

@@ -0,0 +1,283 @@
+import fs from 'fs';
+import request from '../request.js';
+import { odata } from './odata.js';
+async function getCertificateBase64Encoded({ options, logger, debug }) {
+    if (options.certificateBase64Encoded) {
+        return options.certificateBase64Encoded;
+    }
+    if (debug) {
+        await logger.logToStderr(`Reading existing ${options.certificateFile}...`);
+    }
+    try {
+        return fs.readFileSync(options.certificateFile, { encoding: 'base64' });
+    }
+    catch (e) {
+        throw new Error(`Error reading certificate file: ${e}. Please add the certificate using base64 option '--certificateBase64Encoded'.`);
+    }
+}
+async function createServicePrincipal(appId) {
+    const requestOptions = {
+        url: `https://graph.microsoft.com/v1.0/myorganization/servicePrincipals`,
+        headers: {
+            'content-type': 'application/json'
+        },
+        data: {
+            appId: appId
+        },
+        responseType: 'json'
+    };
+    return request.post(requestOptions);
+}
+async function grantOAuth2Permission({ appId, resourceId, scopeName }) {
+    const grantAdminConsentApplicationRequestOptions = {
+        url: `https://graph.microsoft.com/v1.0/myorganization/oauth2PermissionGrants`,
+        headers: {
+            accept: 'application/json;odata.metadata=none'
+        },
+        responseType: 'json',
+        data: {
+            clientId: appId,
+            consentType: "AllPrincipals",
+            principalId: null,
+            resourceId: resourceId,
+            scope: scopeName
+        }
+    };
+    return request.post(grantAdminConsentApplicationRequestOptions);
+}
+async function addRoleToServicePrincipal({ objectId, resourceId, appRoleId }) {
+    const requestOptions = {
+        url: `https://graph.microsoft.com/v1.0/myorganization/servicePrincipals/${objectId}/appRoleAssignments`,
+        headers: {
+            'Content-Type': 'application/json'
+        },
+        responseType: 'json',
+        data: {
+            appRoleId: appRoleId,
+            principalId: objectId,
+            resourceId: resourceId
+        }
+    };
+    return request.post(requestOptions);
+}
+async function getRequiredResourceAccessForApis({ servicePrincipals, apis, scopeType, logger, debug }) {
+    if (!apis) {
+        return [];
+    }
+    const resolvedApis = [];
+    const requestedApis = apis.split(',').map(a => a.trim());
+    for (const api of requestedApis) {
+        const pos = api.lastIndexOf('/');
+        const permissionName = api.substring(pos + 1);
+        const servicePrincipalName = api.substring(0, pos);
+        if (debug) {
+            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`;
+        }
+        const scopesOfType = scopeType === 'Scope' ? servicePrincipal.oauth2PermissionScopes : servicePrincipal.appRoles;
+        const permission = scopesOfType.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);
+        updateAppPermissions({
+            spId: servicePrincipal.id,
+            resourceAccessPermission,
+            oAuth2PermissionValue: permission.value
+        });
+    }
+    return resolvedApis;
+}
+function updateAppPermissions({ spId, resourceAccessPermission, oAuth2PermissionValue }) {
+    // During API resolution, we store globally both app role assignments and oauth2permissions
+    // So that we'll be able to parse them during the admin consent process
+    let existingPermission = entraApp.appPermissions.find(oauth => oauth.resourceId === spId);
+    if (!existingPermission) {
+        existingPermission = {
+            resourceId: spId,
+            resourceAccess: [],
+            scope: []
+        };
+        entraApp.appPermissions.push(existingPermission);
+    }
+    if (resourceAccessPermission.type === '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);
+    }
+}
+export const entraApp = {
+    appPermissions: [],
+    createAppRegistration: async ({ options, apis, logger, verbose, debug }) => {
+        const applicationInfo = {
+            displayName: options.name,
+            signInAudience: options.multitenant ? 'AzureADMultipleOrgs' : 'AzureADMyOrg'
+        };
+        if (apis.length > 0) {
+            applicationInfo.requiredResourceAccess = apis;
+        }
+        if (options.redirectUris) {
+            applicationInfo[options.platform] = {
+                redirectUris: options.redirectUris.split(',').map(u => u.trim())
+            };
+        }
+        if (options.implicitFlow) {
+            if (!applicationInfo.web) {
+                applicationInfo.web = {};
+            }
+            applicationInfo.web.implicitGrantSettings = {
+                enableAccessTokenIssuance: true,
+                enableIdTokenIssuance: true
+            };
+        }
+        if (options.certificateFile || options.certificateBase64Encoded) {
+            const certificateBase64Encoded = await getCertificateBase64Encoded({ options, logger, debug });
+            const newKeyCredential = {
+                type: 'AsymmetricX509Cert',
+                usage: 'Verify',
+                displayName: options.certificateDisplayName,
+                key: certificateBase64Encoded
+            };
+            applicationInfo.keyCredentials = [newKeyCredential];
+        }
+        if (options.allowPublicClientFlows) {
+            applicationInfo.isFallbackPublicClient = true;
+        }
+        if (verbose) {
+            await logger.logToStderr(`Creating Microsoft Entra app registration...`);
+        }
+        const createApplicationRequestOptions = {
+            url: `https://graph.microsoft.com/v1.0/myorganization/applications`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json',
+            data: applicationInfo
+        };
+        return request.post(createApplicationRequestOptions);
+    },
+    grantAdminConsent: async ({ appInfo, appPermissions, adminConsent, logger, debug }) => {
+        if (!adminConsent || appPermissions.length === 0) {
+            return appInfo;
+        }
+        const sp = await createServicePrincipal(appInfo.appId);
+        if (debug) {
+            await logger.logToStderr("Service principal created, returned object id: " + sp.id);
+        }
+        const tasks = [];
+        appPermissions.forEach(async (permission) => {
+            if (permission.scope.length > 0) {
+                tasks.push(grantOAuth2Permission({
+                    appId: sp.id,
+                    resourceId: permission.resourceId,
+                    scopeName: permission.scope.join(' ')
+                }));
+                if (debug) {
+                    await logger.logToStderr(`Admin consent granted for following resource ${permission.resourceId}, with delegated permissions: ${permission.scope.join(',')}`);
+                }
+            }
+            permission.resourceAccess.filter(access => access.type === "Role").forEach(async (access) => {
+                tasks.push(addRoleToServicePrincipal({
+                    objectId: sp.id,
+                    resourceId: permission.resourceId,
+                    appRoleId: access.id
+                }));
+                if (debug) {
+                    await logger.logToStderr(`Admin consent granted for following resource ${permission.resourceId}, with application permission: ${access.id}`);
+                }
+            });
+        });
+        await Promise.all(tasks);
+        return appInfo;
+    },
+    resolveApis: async ({ options, manifest, logger, verbose, debug }) => {
+        if (!options.apisDelegated && !options.apisApplication
+            && (typeof manifest?.requiredResourceAccess === 'undefined' || manifest.requiredResourceAccess.length === 0)) {
+            return [];
+        }
+        if (verbose) {
+            await logger.logToStderr('Resolving requested APIs...');
+        }
+        const servicePrincipals = await odata.getAllItems(`https://graph.microsoft.com/v1.0/myorganization/servicePrincipals?$select=appId,appRoles,id,oauth2PermissionScopes,servicePrincipalNames`);
+        let resolvedApis = [];
+        if (options.apisDelegated || options.apisApplication) {
+            resolvedApis = await getRequiredResourceAccessForApis({
+                servicePrincipals,
+                apis: options.apisDelegated,
+                scopeType: 'Scope',
+                logger,
+                debug
+            });
+            if (verbose) {
+                await logger.logToStderr(`Resolved delegated permissions: ${JSON.stringify(resolvedApis, null, 2)}`);
+            }
+            const resolvedApplicationApis = await getRequiredResourceAccessForApis({
+                servicePrincipals,
+                apis: options.apisApplication,
+                scopeType: 'Role',
+                logger,
+                debug
+            });
+            if (verbose) {
+                await logger.logToStderr(`Resolved application permissions: ${JSON.stringify(resolvedApplicationApis, null, 2)}`);
+            }
+            // merge resolved application APIs onto resolved delegated APIs
+            resolvedApplicationApis.forEach(resolvedRequiredResource => {
+                const requiredResource = resolvedApis.find(api => api.resourceAppId === resolvedRequiredResource.resourceAppId);
+                if (requiredResource) {
+                    requiredResource.resourceAccess.push(...resolvedRequiredResource.resourceAccess);
+                }
+                else {
+                    resolvedApis.push(resolvedRequiredResource);
+                }
+            });
+        }
+        else {
+            const manifestApis = manifest.requiredResourceAccess;
+            manifestApis.forEach(manifestApi => {
+                resolvedApis.push(manifestApi);
+                const app = servicePrincipals.find(servicePrincipals => servicePrincipals.appId === manifestApi.resourceAppId);
+                if (app) {
+                    manifestApi.resourceAccess.forEach((res => {
+                        const resourceAccessPermission = {
+                            id: res.id,
+                            type: res.type
+                        };
+                        const oAuthValue = app.oauth2PermissionScopes.find(scp => scp.id === res.id)?.value;
+                        updateAppPermissions({
+                            spId: app.id,
+                            resourceAccessPermission,
+                            oAuth2PermissionValue: oAuthValue
+                        });
+                    }));
+                }
+            });
+        }
+        if (verbose) {
+            await logger.logToStderr(`Merged delegated and application permissions: ${JSON.stringify(resolvedApis, null, 2)}`);
+            await logger.logToStderr(`App role assignments: ${JSON.stringify(entraApp.appPermissions.flatMap(permission => permission.resourceAccess.filter(access => access.type === "Role")), null, 2)}`);
+            await logger.logToStderr(`OAuth2 permissions: ${JSON.stringify(entraApp.appPermissions.flatMap(permission => permission.scope), null, 2)}`);
+        }
+        return resolvedApis;
+    }
+};
+//# sourceMappingURL=entraApp.js.map