@pnp/cli-microsoft365 10.7.0 → 10.8.0-beta.26ade35

package/dist/Auth.js

@@ -562,19 +562,93 @@ export class Auth {
         if (debug) {
             await logger.logToStderr('Trying to retrieve access token using federated identity...');
         }
-        if (!process.env.ACTIONS_ID_TOKEN_REQUEST_URL || !process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN) {
-            throw new CommandError('Federated identity is currently only supported in GitHub Actions.');
+        if (process.env.ACTIONS_ID_TOKEN_REQUEST_URL && process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN) {
+            if (debug) {
+                await logger.logToStderr('ACTIONS_ID_TOKEN_REQUEST_URL and ACTIONS_ID_TOKEN_REQUEST_TOKEN env variables found. The context is GitHub Actions...');
+            }
+            const federationToken = await this.getFederationTokenFromGithub(logger, debug);
+            return this.getAccessTokenWithFederatedToken(resource, federationToken, logger, debug);
+        }
+        else if (process.env.SYSTEM_OIDCREQUESTURI) {
+            if (debug) {
+                await logger.logToStderr('SYSTEM_OIDCREQUESTURI env variable found. The context is Azure DevOps...');
+            }
+            if (!process.env.SYSTEM_ACCESSTOKEN) {
+                throw new CommandError(`The SYSTEM_ACCESSTOKEN environment variable is not available. Please check the Azure DevOps pipeline task configuration. It should contain 'SYSTEM_ACCESSTOKEN: $(System.AccessToken)' in the env section.`);
+            }
+            const serviceConnectionId = process.env.AZURESUBSCRIPTION_SERVICE_CONNECTION_ID;
+            const serviceConnectionAppId = process.env.AZURESUBSCRIPTION_CLIENT_ID;
+            const serviceConnectionTenantId = process.env.AZURESUBSCRIPTION_TENANT_ID;
+            const useServiceConnection = serviceConnectionId && serviceConnectionAppId && serviceConnectionTenantId;
+            if (!useServiceConnection) {
+                if (debug) {
+                    await logger.logToStderr('Not using a service connection. Run this command in an AzurePowerShell task to be able to use a service connection.');
+                }
+                if (!this.connection.appId || this.connection.tenant === 'common') {
+                    throw new CommandError('The appId and tenant parameters are required when not using a service connection.');
+                }
+            }
+            else {
+                if (debug) {
+                    if (this.connection.appId || this.connection.tenant !== 'common') {
+                        await logger.logToStderr('When using a service connection, the appId and tenant values are updated to the values of the service connection.');
+                    }
+                    await logger.logToStderr(`Using service connection '${serviceConnectionId}' with app Id '${serviceConnectionAppId}' and tenant Id '${serviceConnectionTenantId}'...`);
+                }
+                this.connection.appId = serviceConnectionAppId;
+                this.connection.tenant = serviceConnectionTenantId;
+            }
+            const federationToken = await this.getFederationTokenFromAzureDevOps(logger, debug, serviceConnectionId);
+            return this.getAccessTokenWithFederatedToken(resource, federationToken, logger, debug);
+        }
+        else {
+            throw new CommandError('Federated identity is currently only supported in GitHub Actions and Azure DevOps.');
+        }
+    }
+    async getFederationTokenFromGithub(logger, debug) {
+        if (debug) {
+            await logger.logToStderr('Retrieving GitHub federation token...');
+        }
+        const requestOptions = {
+            url: `${process.env.ACTIONS_ID_TOKEN_REQUEST_URL}&audience=${encodeURIComponent('api://AzureADTokenExchange')}`,
+            headers: {
+                Authorization: `Bearer ${process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN}`,
+                Accept: 'application/json',
+                'x-anonymous': true
+            },
+            responseType: 'json'
+        };
+        const accessTokenResponse = await request.get(requestOptions);
+        return accessTokenResponse.value;
+    }
+    async getFederationTokenFromAzureDevOps(logger, debug, serviceConnectionId) {
+        if (debug) {
+            await logger.logToStderr('Retrieving Azure DevOps federation token...');
         }
+        const urlSuffix = serviceConnectionId ? `&serviceConnectionId=${serviceConnectionId}` : '';
+        const requestOptions = {
+            url: `${process.env.SYSTEM_OIDCREQUESTURI}?api-version=7.1${urlSuffix}`,
+            headers: {
+                Authorization: `Bearer ${process.env.SYSTEM_ACCESSTOKEN}`,
+                Accept: 'application/json',
+                'Content-Type': 'application/json',
+                'x-anonymous': true
+            },
+            responseType: 'json'
+        };
+        const accessTokenResponse = await request.post(requestOptions);
+        return accessTokenResponse.oidcToken;
+    }
+    async getAccessTokenWithFederatedToken(resource, federatedToken, logger, debug) {
         if (debug) {
-            await logger.logToStderr('ACTIONS_ID_TOKEN_REQUEST_URL and ACTIONS_ID_TOKEN_REQUEST_TOKEN env variables found. The context is GitHub Actions...');
+            await logger.logToStderr('Retrieving Entra ID Access Token with federated token...');
         }
-        const federationToken = await this.getFederationTokenFromGithub(logger, debug);
         const queryParams = [
             'grant_type=client_credentials',
             `scope=${encodeURIComponent(`${resource}/.default`)}`,
             `client_id=${this.connection.appId}`,
             `client_assertion_type=${encodeURIComponent('urn:ietf:params:oauth:client-assertion-type:jwt-bearer')}`,
-            `client_assertion=${federationToken}`
+            `client_assertion=${federatedToken}`
         ];
         const requestOptions = {
             url: `https://login.microsoftonline.com/${this.connection.tenant}/oauth2/v2.0/token`,
@@ -587,27 +661,13 @@ export class Auth {
             responseType: 'json'
         };
         const accessTokenResponse = await request.post(requestOptions);
+        const expiresIn = parseInt(accessTokenResponse.expires_in) * 1000;
+        const now = new Date();
         return {
             accessToken: accessTokenResponse.access_token,
-            expiresOn: new Date(parseInt(accessTokenResponse.expires_on) * 1000)
+            expiresOn: new Date(now.getTime() + expiresIn)
         };
     }
-    async getFederationTokenFromGithub(logger, debug) {
-        if (debug) {
-            await logger.logToStderr('Retrieving GitHub federation token...');
-        }
-        const requestOptions = {
-            url: `${process.env.ACTIONS_ID_TOKEN_REQUEST_URL}&audience=${encodeURIComponent('api://AzureADTokenExchange')}`,
-            headers: {
-                Authorization: `Bearer ${process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN}`,
-                accept: 'application/json',
-                'x-anonymous': true
-            },
-            responseType: 'json'
-        };
-        const accessTokenResponse = await request.get(requestOptions);
-        return accessTokenResponse.value;
-    }
     async ensureAccessTokenWithSecret(resource, logger, debug, fetchNew) {
         this.clientApplication = await this.getConfidentialClient(logger, debug, undefined, undefined, this.connection.secret);
         return this.clientApplication.acquireTokenByClientCredential({

package/dist/cli/cli.js

@@ -406,7 +406,7 @@ async function loadCommandFromFile(commandFileUrl) {
     catch { }
 }
 function getCommandInfo(command, filePath = '', helpFilePath = '') {
-    const options = command.schema ? zod.schemaToOptions(command.schema) : getCommandOptions(command);
+    const options = command.schema ? zod.schemaToOptionInfo(command.schema) : getCommandOptions(command);
     command.optionsInfo = options;
     return {
         aliases: command.alias(),

package/dist/m365/adaptivecard/commands/adaptivecard-send.js

@@ -1,13 +1,21 @@
-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 _AdaptiveCardSendCommand_instances, _AdaptiveCardSendCommand_initTelemetry, _AdaptiveCardSendCommand_initOptions, _AdaptiveCardSendCommand_initValidators, _AdaptiveCardSendCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../Command.js';
 import request from '../../../request.js';
+import { optionsUtils } from '../../../utils/optionsUtils.js';
+import { zod } from '../../../utils/zod.js';
 import AnonymousCommand from '../../base/AnonymousCommand.js';
 import commands from '../commands.js';
-import { optionsUtils } from '../../../utils/optionsUtils.js';
+export const options = globalOptionsZod
+    .extend({
+    url: z.string(),
+    title: zod.alias('t', z.string().optional()),
+    description: zod.alias('d', z.string().optional()),
+    imageUrl: zod.alias('i', z.string().optional()),
+    actionUrl: zod.alias('a', z.string().optional()),
+    card: z.string().optional(),
+    cardData: z.string().optional()
+})
+    .and(z.any());
 class AdaptiveCardSendCommand extends AnonymousCommand {
     get name() {
         return commands.SEND;
@@ -15,19 +23,48 @@ class AdaptiveCardSendCommand extends AnonymousCommand {
     get description() {
         return 'Sends adaptive card to the specified URL';
     }
-    constructor() {
-        super();
-        _AdaptiveCardSendCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AdaptiveCardSendCommand_instances, "m", _AdaptiveCardSendCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AdaptiveCardSendCommand_instances, "m", _AdaptiveCardSendCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AdaptiveCardSendCommand_instances, "m", _AdaptiveCardSendCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AdaptiveCardSendCommand_instances, "m", _AdaptiveCardSendCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
     }
-    allowUnknownOptions() {
-        return true;
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => !options.cardData || options.card, {
+            message: 'When you specify cardData, you must also specify card.',
+            path: ['cardData']
+        })
+            .refine(options => {
+            if (options.card) {
+                try {
+                    JSON.parse(options.card);
+                    return true;
+                }
+                catch (e) {
+                    return false;
+                }
+            }
+            return true;
+        }, {
+            message: 'Specified card is not a valid JSON string.',
+            path: ['card']
+        })
+            .refine(options => {
+            if (options.cardData) {
+                try {
+                    JSON.parse(options.cardData);
+                    return true;
+                }
+                catch (e) {
+                    return false;
+                }
+            }
+            return true;
+        }, {
+            message: 'Specified cardData is not a valid JSON string.',
+            path: ['cardData']
+        });
     }
     async commandAction(logger, args) {
-        const unknownOptions = optionsUtils.getUnknownOptions(args.options, this.options);
+        const unknownOptions = optionsUtils.getUnknownOptions(args.options, zod.schemaToOptions(this.schema));
         const unknownOptionNames = Object.getOwnPropertyNames(unknownOptions);
         const card = await this.getCard(args, unknownOptionNames, unknownOptions);
         const requestOptions = {
@@ -166,55 +203,5 @@ class AdaptiveCardSendCommand extends AnonymousCommand {
         return cardData;
     }
 }
-_AdaptiveCardSendCommand_instances = new WeakSet(), _AdaptiveCardSendCommand_initTelemetry = function _AdaptiveCardSendCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            actionUrl: typeof args.options.actionUrl !== 'undefined',
-            card: typeof args.options.card !== 'undefined',
-            cardData: typeof args.options.cardData !== 'undefined',
-            description: typeof args.options.description !== 'undefined',
-            imageUrl: typeof args.options.imageUrl !== 'undefined',
-            title: typeof args.options.title !== 'undefined'
-        });
-    });
-}, _AdaptiveCardSendCommand_initOptions = function _AdaptiveCardSendCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --url <url>'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '-d, --description [description]'
-    }, {
-        option: '-i, --imageUrl [imageUrl]'
-    }, {
-        option: '-a, --actionUrl [actionUrl]'
-    }, {
-        option: '--card [card]'
-    }, {
-        option: '--cardData [cardData]'
-    });
-}, _AdaptiveCardSendCommand_initValidators = function _AdaptiveCardSendCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.card) {
-            try {
-                JSON.parse(args.options.card);
-            }
-            catch (e) {
-                return `Error while parsing the card: ${e}`;
-            }
-        }
-        if (args.options.cardData) {
-            try {
-                JSON.parse(args.options.cardData);
-            }
-            catch (e) {
-                return `Error while parsing card data: ${e}`;
-            }
-        }
-        return true;
-    });
-}, _AdaptiveCardSendCommand_initOptionSets = function _AdaptiveCardSendCommand_initOptionSets() {
-    this.optionSets.push({ options: ['title', 'card'] });
-};
 export default new AdaptiveCardSendCommand();
 //# sourceMappingURL=adaptivecard-send.js.map

package/dist/m365/commands/login.js

@@ -37,7 +37,7 @@ class LoginCommand extends Command {
     }
     getRefinedSchema(schema) {
         return schema
-            .refine(options => typeof options.appId !== 'undefined' || cli.getClientId() || options.authType === 'identity', {
+            .refine(options => typeof options.appId !== 'undefined' || cli.getClientId() || options.authType === 'identity' || options.authType === 'federatedIdentity', {
             message: `appId is required. TIP: use the "m365 setup" command to configure the default appId.`,
             path: ['appId']
         })

package/dist/m365/commands/setup.js

@@ -18,7 +18,6 @@ import { validation } from '../../utils/validation.js';
 import AnonymousCommand from '../base/AnonymousCommand.js';
 import commands from './commands.js';
 import { interactivePreset, powerShellPreset, scriptingPreset } from './setupPresets.js';
-import { optionsUtils } from '../../utils/optionsUtils.js';
 export var CliUsageMode;
 (function (CliUsageMode) {
     CliUsageMode["Interactively"] = "interactively";
@@ -228,7 +227,7 @@ class SetupCommand extends AnonymousCommand {
         });
         const appInfo = await entraApp.createAppRegistration({
             options,
-            unknownOptions: optionsUtils.getUnknownOptions(options, this.options),
+            unknownOptions: {},
             apis,
             logger,
             verbose: this.verbose,

package/dist/m365/entra/commands/organization/organization-list.js

@@ -0,0 +1,51 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import { zod } from '../../../../utils/zod.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { odata } from '../../../../utils/odata.js';
+const options = globalOptionsZod
+    .extend({
+    properties: zod.alias('p', z.string().optional())
+})
+    .strict();
+class EntraOrganizationListCommand extends GraphCommand {
+    get name() {
+        return commands.ORGANIZATION_LIST;
+    }
+    get description() {
+        return 'Lists all Microsoft Entra ID organizations';
+    }
+    defaultProperties() {
+        return ['id', 'displayName', 'tenantType'];
+    }
+    get schema() {
+        return options;
+    }
+    async commandAction(logger, args) {
+        try {
+            let url = `${this.resource}/v1.0/organization`;
+            if (args.options.properties) {
+                url += `?$select=${args.options.properties}`;
+            }
+            const requestOptions = {
+                url: url,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            if (args.options.verbose) {
+                await logger.logToStderr(`Retrieving organizations...`);
+            }
+            const res = await odata.getAllItems(requestOptions);
+            await logger.log(res);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new EntraOrganizationListCommand();
+//# sourceMappingURL=organization-list.js.map

package/dist/m365/entra/commands.js

@@ -83,6 +83,7 @@ export default {
     OAUTH2GRANT_LIST: `${prefix} oauth2grant list`,
     OAUTH2GRANT_REMOVE: `${prefix} oauth2grant remove`,
     OAUTH2GRANT_SET: `${prefix} oauth2grant set`,
+    ORGANIZATION_LIST: `${prefix} organization list`,
     PIM_ROLE_ASSIGNMENT_ADD: `${prefix} pim role assignment add`,
     PIM_ROLE_ASSIGNMENT_LIST: `${prefix} pim role assignment list`,
     PIM_ROLE_ASSIGNMENT_REMOVE: `${prefix} pim role assignment remove`,

package/dist/m365/graph/commands/openextension/openextension-set.js

@@ -0,0 +1,107 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import { zod } from '../../../../utils/zod.js';
+import { validation } from '../../../../utils/validation.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import request from '../../../../request.js';
+import { optionsUtils } from '../../../../utils/optionsUtils.js';
+const options = globalOptionsZod
+    .extend({
+    name: zod.alias('n', z.string()),
+    resourceId: zod.alias('i', z.string()),
+    resourceType: zod.alias('t', z.enum(['user', 'group', 'device', 'organization'])),
+    keepUnchangedProperties: zod.alias('k', z.boolean().optional())
+})
+    .and(z.any());
+class GraphOpenExtensionSetCommand extends GraphCommand {
+    constructor() {
+        super(...arguments);
+        this.commandOptions = ['keepUnchangedProperties', 'resourceType', 'resourceId', 'name'];
+        this.defaultOpenExtensionProperties = ['id', 'extensionName'];
+    }
+    get name() {
+        return commands.OPENEXTENSION_SET;
+    }
+    get description() {
+        return 'Updates an open extension for a resource';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => options.resourceType !== 'group' && options.resourceType !== 'device' && options.resourceType !== 'organization' || (options.resourceId && validation.isValidGuid(options.resourceId)), options => ({
+            message: `The '${options.resourceId}' must be a valid GUID`,
+            path: ['resourceId']
+        }))
+            .refine(options => options.resourceType !== 'user' || (options.resourceId && (validation.isValidGuid(options.resourceId) || validation.isValidUserPrincipalName(options.resourceId))), options => ({
+            message: `The '${options.resourceId}' must be a valid GUID or user principal name`,
+            path: ['resourceId']
+        }));
+    }
+    async commandAction(logger, args) {
+        try {
+            const currentExtension = await this.getOpenExtension(logger, args);
+            const currentExtensionNames = Object.getOwnPropertyNames(currentExtension);
+            const requestBody = {};
+            requestBody["@odata.type"] = '#microsoft.graph.openTypeExtension';
+            const unknownOptions = optionsUtils.getUnknownOptions(args.options, this.options);
+            const unknownOptionsNames = Object.getOwnPropertyNames(unknownOptions);
+            unknownOptionsNames.forEach(async (option) => {
+                if (this.commandOptions.includes(option)) {
+                    return;
+                }
+                const value = unknownOptions[option];
+                if (value === "") {
+                    requestBody[option] = null;
+                }
+                else {
+                    try {
+                        const jsonObject = JSON.parse(value);
+                        requestBody[option] = jsonObject;
+                    }
+                    catch {
+                        requestBody[option] = value;
+                    }
+                }
+            });
+            currentExtensionNames.forEach(async (name) => {
+                if (!unknownOptionsNames.includes(name) && (args.options.keepUnchangedProperties || this.defaultOpenExtensionProperties.includes(name))) {
+                    requestBody[name] = currentExtension[name];
+                }
+            });
+            const requestOptions = {
+                url: `${this.resource}/v1.0/${args.options.resourceType}${args.options.resourceType === 'organization' ? '' : 's'}/${args.options.resourceId}/extensions/${args.options.name}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json'
+                },
+                data: requestBody,
+                responseType: 'json'
+            };
+            if (args.options.verbose) {
+                await logger.logToStderr(`Updating open extension of the ${args.options.resourceType} with id '${args.options.resourceId}'...`);
+            }
+            await request.patch(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getOpenExtension(logger, args) {
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving open extension for resource ${args.options.resourceId}...`);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/${args.options.resourceType}${args.options.resourceType === 'organization' ? '' : 's'}/${args.options.resourceId}/extensions/${args.options.name}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return await request.get(requestOptions);
+    }
+}
+export default new GraphOpenExtensionSetCommand();
+//# sourceMappingURL=openextension-set.js.map

package/dist/m365/graph/commands.js

@@ -8,6 +8,7 @@ export default {
     OPENEXTENSION_GET: `${prefix} openextension get`,
     OPENEXTENSION_LIST: `${prefix} openextension list`,
     OPENEXTENSION_REMOVE: `${prefix} openextension remove`,
+    OPENEXTENSION_SET: `${prefix} openextension set`,
     SCHEMAEXTENSION_ADD: `${prefix} schemaextension add`,
     SCHEMAEXTENSION_GET: `${prefix} schemaextension get`,
     SCHEMAEXTENSION_LIST: `${prefix} schemaextension list`,

package/dist/m365/spe/commands/container/container-permission-list.js

@@ -0,0 +1,52 @@
+import { cli } from '../../../../cli/cli.js';
+import { z } from 'zod';
+import { zod } from '../../../../utils/zod.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import commands from '../../commands.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import { odata } from '../../../../utils/odata.js';
+import { formatting } from '../../../../utils/formatting.js';
+const options = globalOptionsZod
+    .extend({
+    containerId: zod.alias('i', z.string())
+})
+    .strict();
+class SpeContainerPermissionListCommand extends GraphCommand {
+    get name() {
+        return commands.CONTAINER_PERMISSION_LIST;
+    }
+    get description() {
+        return 'Lists permissions of a SharePoint Embedded Container';
+    }
+    defaultProperties() {
+        return ['id', 'userPrincipalName', 'roles'];
+    }
+    get schema() {
+        return options;
+    }
+    async commandAction(logger, args) {
+        try {
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieving permissions of a SharePoint Embedded Container with id '${args.options.containerId}'...`);
+            }
+            const containerPermission = await odata.getAllItems(`${this.resource}/v1.0/storage/fileStorage/containers/${formatting.encodeQueryParameter(args.options.containerId)}/permissions`);
+            if (!cli.shouldTrimOutput(args.options.output)) {
+                await logger.log(containerPermission);
+            }
+            else {
+                await logger.log(containerPermission.map(i => {
+                    return {
+                        id: i.id,
+                        roles: i.roles.join(','),
+                        userPrincipalName: i.grantedToV2.user.userPrincipalName
+                    };
+                }));
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new SpeContainerPermissionListCommand();
+//# sourceMappingURL=container-permission-list.js.map

package/dist/m365/spe/commands.js

@@ -3,6 +3,7 @@ export default {
     CONTAINER_ACTIVATE: `${prefix} container activate`,
     CONTAINER_GET: `${prefix} container get`,
     CONTAINER_LIST: `${prefix} container list`,
+    CONTAINER_PERMISSION_LIST: `${prefix} container permission list`,
     CONTAINERTYPE_ADD: `${prefix} containertype add`,
     CONTAINERTYPE_GET: `${prefix} containertype get`,
     CONTAINERTYPE_LIST: `${prefix} containertype list`

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

@@ -59,19 +59,25 @@ class SpoPageSectionAddCommand extends SpoCommand {
                 };
                 await request.post(requestOptions);
             }
-            // get columns
-            const columns = canvasContent
-                .filter(c => typeof c.controlType === 'undefined');
             // get unique zoneIndex values given each section can have 1 or more
             // columns each assigned to the zoneIndex of the corresponding section
-            const zoneIndices = columns
+            const zoneIndices = canvasContent
+                // Exclude the vertical section
+                .filter(c => c.position)
                 .map(c => c.position.zoneIndex)
                 .filter((value, index, array) => {
                 return array.indexOf(value) === index;
             })
-                .sort();
-            // zoneIndex for the new section to add
-            const zoneIndex = this.getSectionIndex(zoneIndices, args.options.order);
+                .sort((a, b) => a - b);
+            // Add a new zoneIndex  at the end of the array
+            zoneIndices.push(zoneIndices.length > 0 ? zoneIndices[zoneIndices.length - 1] + 1 : 1);
+            // get section number. if not specified, get the last section
+            let section = args.options.order || zoneIndices.length;
+            if (section > zoneIndices.length) {
+                section = zoneIndices.length;
+            }
+            // zoneIndex that represents the section where the web part should be added
+            const zoneIndex = zoneIndices[section - 1];
             let zoneId;
             let backgroundControlToAdd = undefined;
             if (args.options.zoneEmphasis && ['image', 'gradient'].includes(args.options.zoneEmphasis.toLowerCase())) {
@@ -83,11 +89,17 @@ class SpoPageSectionAddCommand extends SpoCommand {
                     canvasContent.push(backgroundControlToAdd);
                 }
             }
+            // Increment the zoneIndex of all columns that are greater than or equal to the new zoneIndex
+            canvasContent.forEach((c) => {
+                if (c.position && c.position.zoneIndex >= zoneIndex) {
+                    c.position.zoneIndex += 1;
+                }
+            });
             // get the list of columns to insert based on the selected template
             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 && c.position.zoneIndex > zoneIndex);
+            let pos = canvasContent.findIndex(c => c.position && c.position.zoneIndex >= zoneIndex);
             if (pos === -1) {
                 pos = canvasContent.length - 1;
             }
@@ -109,21 +121,6 @@ class SpoPageSectionAddCommand extends SpoCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    getSectionIndex(zoneIndices, order) {
-        // zoneIndex of the first column on the page
-        const minIndex = zoneIndices.length === 0 ? 0 : zoneIndices[0];
-        // zoneIndex of the last column on the page
-        const maxIndex = zoneIndices.length === 0 ? 0 : zoneIndices[zoneIndices.length - 1];
-        if (!order || order > zoneIndices.length) {
-            // no order specified, add section to the end
-            return maxIndex === 0 ? 1 : maxIndex * 2;
-        }
-        // add to the beginning
-        if (order === 1) {
-            return minIndex / 2;
-        }
-        return zoneIndices[order - 2] + ((zoneIndices[order - 1] - zoneIndices[order - 2]) / 2);
-    }
     getColumns(zoneIndex, args, zoneId) {
         const columns = [];
         let sectionIndex = 1;