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

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/m365/spo/commands/page/page-template-list.js

@@ -30,9 +30,7 @@ class SpoPageTemplateListCommand extends SpoCommand {
         }
         try {
             const res = await odata.getAllItems(`${args.options.webUrl}/_api/sitepages/pages/templates`);
-            if (res && res.length > 0) {
-                await logger.log(res);
-            }
+            await logger.log(res);
         }
         catch (err) {
             // The API returns a 404 when no templates are created on the site collection

package/dist/m365/spo/commands/site/SiteAdmin.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=SiteAdmin.js.map

package/dist/m365/spo/commands/site/site-admin-add.js

@@ -0,0 +1,252 @@
+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 _SpoSiteAdminAddCommand_instances, _SpoSiteAdminAddCommand_initTelemetry, _SpoSiteAdminAddCommand_initOptions, _SpoSiteAdminAddCommand_initValidators, _SpoSiteAdminAddCommand_initOptionSets, _SpoSiteAdminAddCommand_initTypes;
+import config from '../../../../config.js';
+import request from '../../../../request.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
+import { entraUser } from '../../../../utils/entraUser.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { spo } from '../../../../utils/spo.js';
+import { validation } from '../../../../utils/validation.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+class SpoSiteAdminAddCommand extends SpoCommand {
+    get name() {
+        return commands.SITE_ADMIN_ADD;
+    }
+    get description() {
+        return 'Adds a user or group as a site collection administrator';
+    }
+    constructor() {
+        super();
+        _SpoSiteAdminAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteAdminAddCommand_instances, "m", _SpoSiteAdminAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAdminAddCommand_instances, "m", _SpoSiteAdminAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAdminAddCommand_instances, "m", _SpoSiteAdminAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAdminAddCommand_instances, "m", _SpoSiteAdminAddCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAdminAddCommand_instances, "m", _SpoSiteAdminAddCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        try {
+            const loginNameToAdd = await this.getCorrectLoginName(args.options);
+            if (args.options.asAdmin) {
+                await this.callActionAsAdmin(logger, args, loginNameToAdd);
+                return;
+            }
+            await this.callAction(logger, args, loginNameToAdd);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async callActionAsAdmin(logger, args, loginNameToAdd) {
+        if (this.verbose) {
+            await logger.logToStderr('Adding site administrator as an administrator...');
+        }
+        const adminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+        const siteId = await this.getSiteIdBasedOnUrl(args.options.siteUrl, logger);
+        const siteAdmins = (await this.getSiteAdmins(adminUrl, siteId)).map(u => u.loginName);
+        siteAdmins.push(loginNameToAdd);
+        await this.setSiteAdminsAsAdmin(adminUrl, siteId, siteAdmins);
+        if (args.options.primary) {
+            await this.setPrimaryAdminAsAdmin(adminUrl, siteId, loginNameToAdd);
+        }
+    }
+    async getSiteIdBasedOnUrl(siteUrl, logger) {
+        const siteGraphId = await spo.getSiteId(siteUrl, logger, this.verbose);
+        const match = siteGraphId.match(/,([a-f0-9\-]{36}),/i);
+        if (!match) {
+            throw `Site with URL ${siteUrl} not found`;
+        }
+        return match[1];
+    }
+    async getSiteAdmins(adminUrl, siteId) {
+        const requestOptions = {
+            url: `${adminUrl}/_api/SPO.Tenant/GetSiteAdministrators?siteId='${siteId}'`,
+            headers: {
+                accept: 'application/json;odata=nometadata',
+                'content-type': 'application/json;charset=utf-8'
+            }
+        };
+        const response = await request.post(requestOptions);
+        const responseContent = JSON.parse(response);
+        return responseContent.value;
+    }
+    async getCorrectLoginName(options) {
+        if (options.userId || options.userName) {
+            const userPrincipalName = options.userName ? options.userName : await entraUser.getUpnByUserId(options.userId);
+            if (userPrincipalName) {
+                return `i:0#.f|membership|${userPrincipalName}`;
+            }
+            throw 'User not found.';
+        }
+        else {
+            const group = options.groupId ? await entraGroup.getGroupById(options.groupId) : await entraGroup.getGroupByDisplayName(options.groupName);
+            //for entra groups, M365 groups have an associated email and security groups don't
+            if (group?.mail) {
+                //M365 group is prefixed with c:0o.c|federateddirectoryclaimprovider
+                return `c:0o.c|federateddirectoryclaimprovider|${group.id}`;
+            }
+            else {
+                //security group is prefixed with c:0t.c|tenant
+                return `c:0t.c|tenant|${group?.id}`;
+            }
+        }
+    }
+    async setSiteAdminsAsAdmin(adminUrl, siteId, admins) {
+        const requestOptions = {
+            url: `${adminUrl}/_api/SPOInternalUseOnly.Tenant/SetSiteSecondaryAdministrators`,
+            headers: {
+                accept: 'application/json;odata=nometadata',
+                'content-type': 'application/json;charset=utf-8'
+            },
+            data: {
+                secondaryAdministratorsFieldsData: {
+                    siteId: siteId,
+                    secondaryAdministratorLoginNames: admins
+                }
+            }
+        };
+        return request.post(requestOptions);
+    }
+    async setPrimaryAdminAsAdmin(adminUrl, siteId, adminLogin) {
+        const requestOptions = {
+            url: `${adminUrl}/_api/SPO.Tenant/sites('${siteId}')`,
+            headers: {
+                accept: 'application/json;odata=nometadata',
+                'content-type': 'application/json;charset=utf-8'
+            },
+            data: {
+                Owner: adminLogin,
+                SetOwnerWithoutUpdatingSecondaryAdmin: true
+            }
+        };
+        return request.patch(requestOptions);
+    }
+    async callAction(logger, args, loginNameToAdd) {
+        if (this.verbose) {
+            await logger.logToStderr('Adding site administrator...');
+        }
+        const ensuredUserData = await this.ensureUser(args, loginNameToAdd);
+        await this.setSiteAdmin(args.options.siteUrl, loginNameToAdd);
+        if (args.options.primary) {
+            const siteId = await this.getSiteId(args.options.siteUrl);
+            const previousPrimaryOwner = await this.getSiteOwnerLoginName(args.options.siteUrl);
+            await this.setPrimaryOwnerLoginFromSite(logger, args.options.siteUrl, siteId, ensuredUserData);
+            await this.setSiteAdmin(args.options.siteUrl, previousPrimaryOwner);
+        }
+    }
+    async ensureUser(args, loginName) {
+        const requestOptions = {
+            url: `${args.options.siteUrl}/_api/web/ensureuser`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            data: {
+                logonName: loginName
+            },
+            responseType: 'json'
+        };
+        return request.post(requestOptions);
+    }
+    async setSiteAdmin(siteUrl, loginName) {
+        const requestOptions = {
+            url: `${siteUrl}/_api/web/siteusers('${formatting.encodeQueryParameter(loginName)}')`,
+            headers: {
+                'accept': 'application/json',
+                'X-Http-Method': 'MERGE',
+                'If-Match': '*'
+            },
+            data: { IsSiteAdmin: true },
+            responseType: 'json'
+        };
+        return request.post(requestOptions);
+    }
+    async getSiteId(siteUrl) {
+        const requestOptions = {
+            url: `${siteUrl}/_api/site?$select=Id`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const response = await request.get(requestOptions);
+        return response.Id;
+    }
+    async getSiteOwnerLoginName(siteUrl) {
+        const requestOptions = {
+            url: `${siteUrl}/_api/site/owner?$select=LoginName`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const response = await request.get(requestOptions);
+        return response.LoginName;
+    }
+    async setPrimaryOwnerLoginFromSite(logger, siteUrl, siteId, loginName) {
+        const res = await spo.ensureFormDigest(siteUrl, logger, undefined, this.debug);
+        const body = `<Request xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}"><Actions><SetProperty Id="10" ObjectPathId="2" Name="Owner"><Parameter ObjectPathId="3" /></SetProperty></Actions><ObjectPaths><Property Id="2" ParentId="0" Name="Site" /><Identity Id="3" Name="6d452ba1-40a8-8000-e00d-46e1adaa12bf|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:u:${loginName.Id}" /><StaticProperty Id="0" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /></ObjectPaths></Request>`;
+        const requestOptions = {
+            url: `${siteUrl}/_vti_bin/client.svc/ProcessQuery`,
+            headers: {
+                'X-RequestDigest': res.FormDigestValue
+            },
+            data: body
+        };
+        return request.post(requestOptions);
+    }
+}
+_SpoSiteAdminAddCommand_instances = new WeakSet(), _SpoSiteAdminAddCommand_initTelemetry = function _SpoSiteAdminAddCommand_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',
+            primary: !!args.options.primary,
+            asAdmin: !!args.options.asAdmin
+        });
+    });
+}, _SpoSiteAdminAddCommand_initOptions = function _SpoSiteAdminAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --siteUrl <siteUrl>'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    }, {
+        option: '--groupId [groupId]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--primary'
+    }, {
+        option: '--asAdmin'
+    });
+}, _SpoSiteAdminAddCommand_initValidators = function _SpoSiteAdminAddCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.userId &&
+            !validation.isValidGuid(args.options.userId)) {
+            return `'${args.options.userId}' is not a valid GUID for option 'userId'`;
+        }
+        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
+            return `'${args.options.userName}' is not a valid 'userName'`;
+        }
+        if (args.options.groupId &&
+            !validation.isValidGuid(args.options.groupId)) {
+            return `'${args.options.groupId}' is not a valid GUID for option 'groupId'`;
+        }
+        return validation.isValidSharePointUrl(args.options.siteUrl);
+    });
+}, _SpoSiteAdminAddCommand_initOptionSets = function _SpoSiteAdminAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['userId', 'userName', 'groupId', 'groupName'] });
+}, _SpoSiteAdminAddCommand_initTypes = function _SpoSiteAdminAddCommand_initTypes() {
+    this.types.string.push('siteUrl', 'userId', 'userName', 'groupId', 'groupName');
+    this.types.boolean.push('primary', 'asAdmin');
+};
+export default new SpoSiteAdminAddCommand();
+//# sourceMappingURL=site-admin-add.js.map