@pnp/cli-microsoft365 10.5.0-beta.395d550 → 10.5.0-beta.63404d1

package/dist/Auth.js

@@ -53,6 +53,7 @@ export var AuthType;
     AuthType["Password"] = "password";
     AuthType["Certificate"] = "certificate";
     AuthType["Identity"] = "identity";
+    AuthType["FederatedIdentity"] = "federatedIdentity";
     AuthType["Browser"] = "browser";
     AuthType["Secret"] = "secret";
 })(AuthType || (AuthType = {}));
@@ -153,7 +154,8 @@ export class Auth {
         // wasn't specified
         if (this.connection.authType !== AuthType.Certificate &&
             this.connection.authType !== AuthType.Secret &&
-            this.connection.authType !== AuthType.Identity) {
+            this.connection.authType !== AuthType.Identity &&
+            this.connection.authType !== AuthType.FederatedIdentity) {
             this.clientApplication = await this.getPublicClient(logger, debug);
             if (this.clientApplication) {
                 const accounts = await this.clientApplication.getTokenCache().getAllAccounts();
@@ -177,6 +179,9 @@ export class Auth {
                 case AuthType.Identity:
                     getTokenPromise = this.ensureAccessTokenWithIdentity.bind(this);
                     break;
+                case AuthType.FederatedIdentity:
+                    getTokenPromise = this.ensureAccessTokenWithFederatedIdentity.bind(this);
+                    break;
                 case AuthType.Browser:
                     getTokenPromise = this.ensureAccessTokenWithBrowser.bind(this);
                     break;
@@ -552,6 +557,56 @@ export class Auth {
             }
         }
     }
+    async ensureAccessTokenWithFederatedIdentity(resource, logger, debug) {
+        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 (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);
+        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}`
+        ];
+        const requestOptions = {
+            url: `https://login.microsoftonline.com/${this.connection.tenant}/oauth2/v2.0/token`,
+            headers: {
+                accept: 'application/json',
+                'x-anonymous': true,
+                'Content-Type': 'application/x-www-form-urlencoded'
+            },
+            data: queryParams.join('&'),
+            responseType: 'json'
+        };
+        const accessTokenResponse = await request.post(requestOptions);
+        return {
+            accessToken: accessTokenResponse.access_token,
+            expiresOn: new Date(parseInt(accessTokenResponse.expires_on) * 1000)
+        };
+    }
+    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({
@@ -597,7 +652,9 @@ export class Auth {
         await connectionStorage.set(JSON.stringify(this.connection));
         let allConnections = await this.getAllConnections();
         if (this.connection.active) {
-            allConnections = allConnections.filter(c => c.identityId !== this.connection.identityId);
+            allConnections = allConnections.filter(c => c.identityId !== this.connection.identityId ||
+                c.appId !== this.connection.appId ||
+                c.tenant !== this.connection.tenant);
             allConnections.forEach(c => c.active = false);
             allConnections = [{ ...this.connection }, ...allConnections];
         }
@@ -624,7 +681,8 @@ export class Auth {
         // When using an application identity, there is no account in the MSAL TokenCache
         if (this.connection.authType !== AuthType.Certificate &&
             this.connection.authType !== AuthType.Secret &&
-            this.connection.authType !== AuthType.Identity) {
+            this.connection.authType !== AuthType.Identity &&
+            this.connection.authType !== AuthType.FederatedIdentity) {
             this.clientApplication = await this.getPublicClient(logger, debug);
             if (this.clientApplication) {
                 const tokenCache = this.clientApplication.getTokenCache();

package/dist/appInsights.js

@@ -5,7 +5,7 @@ process.env.APPLICATION_INSIGHTS_NO_DIAGNOSTIC_CHANNEL = 'none';
 process.env.APPLICATION_INSIGHTS_NO_STATSBEAT = 'true';
 // suppress all logging
 process.env.APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL = 'NONE';
-import * as appInsights from 'applicationinsights';
+import appInsights from 'applicationinsights';
 import crypto from 'crypto';
 import fs from 'fs';
 import os from 'os';
@@ -15,21 +15,27 @@ import { app } from './utils/app.js';
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
 appInsights
     .setup('InstrumentationKey=6b908c80-d09f-4cf6-8274-e54349a0149a;IngestionEndpoint=https://westeurope-3.in.applicationinsights.azure.com/;LiveEndpoint=https://westeurope.livediagnostics.monitor.azure.com/;ApplicationId=d42020c6-da32-44f7-bbb7-666f0b3a664d')
+    .setAutoCollectRequests(false)
+    .setAutoCollectPerformance(false, false)
+    .setAutoCollectExceptions(false)
+    .setAutoCollectDependencies(false)
+    .setAutoCollectConsole(false, false)
+    .setAutoCollectPreAggregatedMetrics(false)
+    .setSendLiveMetrics(false)
+    .enableWebInstrumentation(false)
     .setInternalLogging(false, false);
 // append -dev to the version number when ran locally
 // to distinguish production and dev version of the CLI
 // in the telemetry
 const version = `${app.packageJson().version}${fs.existsSync(path.join(__dirname, `..${path.sep}src`)) ? '-dev' : ''}`;
 const env = process.env.CLIMICROSOFT365_ENV !== undefined ? process.env.CLIMICROSOFT365_ENV : '';
-const appInsightsClient = appInsights.default.defaultClient;
+const appInsightsClient = appInsights.defaultClient;
 appInsightsClient.commonProperties = {
     version: version,
     node: process.version,
     env: env,
     ci: Boolean(process.env.CI).toString()
 };
-appInsightsClient.config.proxyHttpUrl = process.env.HTTP_PROXY ?? '';
-appInsightsClient.config.proxyHttpsUrl = process.env.HTTPS_PROXY ?? '';
 appInsightsClient.context.tags[appInsightsClient.context.keys.cloudRoleInstance] = crypto.createHash('sha256').update(os.hostname()).digest('hex');
 delete appInsightsClient.context.tags[appInsightsClient.context.keys.cloudRole];
 delete appInsightsClient.context.tags['ai.cloud.roleName'];

package/dist/m365/commands/login.js

@@ -184,6 +184,9 @@ class LoginCommand extends Command {
                 auth.connection.authType = AuthType.Identity;
                 auth.connection.userName = args.options.userName;
                 break;
+            case 'federatedIdentity':
+                auth.connection.authType = AuthType.FederatedIdentity;
+                break;
             case 'browser':
                 auth.connection.authType = AuthType.Browser;
                 break;

package/dist/m365/graph/commands/directoryextension/directoryextension-add.js

@@ -0,0 +1,85 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import request from '../../../../request.js';
+import { zod } from '../../../../utils/zod.js';
+import commands from '../../commands.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import { validation } from '../../../../utils/validation.js';
+import { entraApp } from '../../../../utils/entraApp.js';
+const options = globalOptionsZod
+    .extend({
+    name: zod.alias('n', z.string()),
+    appId: z.string().optional(),
+    appObjectId: z.string().optional(),
+    appName: z.string().optional(),
+    dataType: z.enum(['Binary', 'Boolean', 'DateTime', 'Integer', 'LargeInteger', 'String']),
+    targetObjects: z.string().transform((value) => value.split(',').map(String))
+        .pipe(z.enum(['User', 'Group', 'Application', 'AdministrativeUnit', 'Device', 'Organization']).array()),
+    isMultiValued: z.boolean().optional()
+})
+    .strict();
+class GraphDirectoryExtensionAddCommand extends GraphCommand {
+    get name() {
+        return commands.DIRECTORYEXTENSION_ADD;
+    }
+    get description() {
+        return 'Creates a new directory extension';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => Object.values([options.appId, options.appObjectId, options.appName]).filter(v => typeof v !== 'undefined').length === 1, {
+            message: 'Specify either appId, appObjectId or appName, but not multiple'
+        })
+            .refine(options => (!options.appId && !options.appObjectId && !options.appName) || options.appObjectId || options.appName ||
+            (options.appId && validation.isValidGuid(options.appId)), options => ({
+            message: `The '${options.appId}' must be a valid GUID`,
+            path: ['appId']
+        }))
+            .refine(options => (!options.appId && !options.appObjectId && !options.appName) || options.appId || options.appName ||
+            (options.appObjectId && validation.isValidGuid(options.appObjectId)), options => ({
+            message: `The '${options.appObjectId}' must be a valid GUID`,
+            path: ['appObjectId']
+        }));
+    }
+    async commandAction(logger, args) {
+        try {
+            const appObjectId = await this.getAppObjectId(args.options);
+            if (args.options.verbose) {
+                await logger.logToStderr(`Adding directory extension to the app with id '${appObjectId}'...`);
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/applications/${appObjectId}/extensionProperties`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json'
+                },
+                data: {
+                    name: args.options.name,
+                    dataType: args.options.dataType,
+                    targetObjects: args.options.targetObjects,
+                    isMultiValued: args.options.isMultiValued
+                },
+                responseType: 'json'
+            };
+            const res = await request.post(requestOptions);
+            await logger.log(res);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getAppObjectId(options) {
+        if (options.appObjectId) {
+            return options.appObjectId;
+        }
+        if (options.appId) {
+            return (await entraApp.getAppRegistrationByAppId(options.appId, ["id"])).id;
+        }
+        return (await entraApp.getAppRegistrationByAppName(options.appName, ["id"])).id;
+    }
+}
+export default new GraphDirectoryExtensionAddCommand();
+//# sourceMappingURL=directoryextension-add.js.map

package/dist/m365/graph/commands/directoryextension/directoryextension-get.js

@@ -0,0 +1,82 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import request from '../../../../request.js';
+import { zod } from '../../../../utils/zod.js';
+import commands from '../../commands.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import { validation } from '../../../../utils/validation.js';
+import { entraApp } from '../../../../utils/entraApp.js';
+import { directoryExtension } from '../../../../utils/directoryExtension.js';
+const options = globalOptionsZod
+    .extend({
+    id: zod.alias('i', z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional()),
+    name: zod.alias('n', z.string().optional()),
+    appId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    appObjectId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    appName: z.string().optional()
+})
+    .strict();
+class GraphDirectoryExtensionGetCommand extends GraphCommand {
+    get name() {
+        return commands.DIRECTORYEXTENSION_GET;
+    }
+    get description() {
+        return 'Retrieves the definition of a directory extension';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => !options.id !== !options.name, {
+            message: 'Specify either id or name, but not both'
+        })
+            .refine(options => options.id || options.name, {
+            message: 'Specify either id or name'
+        })
+            .refine(options => Object.values([options.appId, options.appObjectId, options.appName]).filter(v => typeof v !== 'undefined').length === 1, {
+            message: 'Specify either appId, appObjectId or appName, but not multiple'
+        });
+    }
+    async commandAction(logger, args) {
+        try {
+            const appObjectId = await this.getAppObjectId(args.options);
+            let schemeExtensionId = args.options.id;
+            if (args.options.name) {
+                schemeExtensionId = (await directoryExtension.getDirectoryExtensionByName(args.options.name, appObjectId, ['id'])).id;
+            }
+            if (args.options.verbose) {
+                await logger.logToStderr(`Retrieving schema extension with ID ${schemeExtensionId} from application with ID ${appObjectId}...`);
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/applications/${appObjectId}/extensionProperties/${schemeExtensionId}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const res = await request.get(requestOptions);
+            await logger.log(res);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getAppObjectId(options) {
+        if (options.appObjectId) {
+            return options.appObjectId;
+        }
+        if (options.appId) {
+            return (await entraApp.getAppRegistrationByAppId(options.appId, ["id"])).id;
+        }
+        return (await entraApp.getAppRegistrationByAppName(options.appName, ["id"])).id;
+    }
+}
+export default new GraphDirectoryExtensionGetCommand();
+//# sourceMappingURL=directoryextension-get.js.map

package/dist/m365/graph/commands/directoryextension/directoryextension-remove.js

@@ -0,0 +1,93 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import request from '../../../../request.js';
+import { zod } from '../../../../utils/zod.js';
+import commands from '../../commands.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import { validation } from '../../../../utils/validation.js';
+import { entraApp } from '../../../../utils/entraApp.js';
+import { cli } from '../../../../cli/cli.js';
+import { directoryExtension } from '../../../../utils/directoryExtension.js';
+const options = globalOptionsZod
+    .extend({
+    id: zod.alias('i', z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional()),
+    name: zod.alias('n', z.string().optional()),
+    appId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    appObjectId: z.string().refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    appName: z.string().optional(),
+    force: zod.alias('f', z.boolean().optional())
+})
+    .strict();
+class GraphDirectoryExtensionRemoveCommand extends GraphCommand {
+    get name() {
+        return commands.DIRECTORYEXTENSION_REMOVE;
+    }
+    get description() {
+        return 'Removes a directory extension';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => !options.id !== !options.name, {
+            message: 'Specify either id or name, but not both'
+        })
+            .refine(options => options.id || options.name, {
+            message: 'Specify either id or name'
+        })
+            .refine(options => Object.values([options.appId, options.appObjectId, options.appName]).filter(v => typeof v !== 'undefined').length === 1, {
+            message: 'Specify either appId, appObjectId or appName, but not multiple'
+        });
+    }
+    async commandAction(logger, args) {
+        const removeDirectoryExtension = async () => {
+            try {
+                const appObjectId = await this.getAppObjectId(args.options);
+                let schemeExtensionId = args.options.id;
+                if (args.options.name) {
+                    schemeExtensionId = (await directoryExtension.getDirectoryExtensionByName(args.options.name, appObjectId, ['id'])).id;
+                }
+                if (args.options.verbose) {
+                    await logger.logToStderr(`Removing schema extension with ID ${schemeExtensionId} from application with ID ${appObjectId}...`);
+                }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/applications/${appObjectId}/extensionProperties/${schemeExtensionId}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    }
+                };
+                await request.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        };
+        if (args.options.force) {
+            await removeDirectoryExtension();
+        }
+        else {
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove directory extension '${args.options.id || args.options.name}' from application '${args.options.appObjectId || args.options.appId || args.options.appName}'?` });
+            if (result) {
+                await removeDirectoryExtension();
+            }
+        }
+    }
+    async getAppObjectId(options) {
+        if (options.appObjectId) {
+            return options.appObjectId;
+        }
+        if (options.appId) {
+            return (await entraApp.getAppRegistrationByAppId(options.appId, ["id"])).id;
+        }
+        return (await entraApp.getAppRegistrationByAppName(options.appName, ["id"])).id;
+    }
+}
+export default new GraphDirectoryExtensionRemoveCommand();
+//# sourceMappingURL=directoryextension-remove.js.map

package/dist/m365/graph/commands.js

@@ -1,6 +1,9 @@
 const prefix = 'graph';
 export default {
     CHANGELOG_LIST: `${prefix} changelog list`,
+    DIRECTORYEXTENSION_ADD: `${prefix} directoryextension add`,
+    DIRECTORYEXTENSION_GET: `${prefix} directoryextension get`,
+    DIRECTORYEXTENSION_REMOVE: `${prefix} directoryextension remove`,
     SCHEMAEXTENSION_ADD: `${prefix} schemaextension add`,
     SCHEMAEXTENSION_GET: `${prefix} schemaextension get`,
     SCHEMAEXTENSION_LIST: `${prefix} schemaextension list`,

package/dist/m365/spo/commands/homesite/homesite-add.js

@@ -0,0 +1,66 @@
+import { z } from 'zod';
+import { zod } from '../../../../utils/zod.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { spo } from '../../../../utils/spo.js';
+import { validation } from '../../../../utils/validation.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+import request from '../../../../request.js';
+const options = globalOptionsZod
+    .extend({
+    url: zod.alias('u', z.string()
+        .refine((url) => validation.isValidSharePointUrl(url) === true, url => ({
+        message: `'${url}' is not a valid SharePoint Online site URL.`
+    }))),
+    audiences: z.string()
+        .refine(audiences => validation.isValidGuidArray(audiences) === true, audiences => ({
+        message: `The following GUIDs are invalid: ${validation.isValidGuidArray(audiences)}.`
+    })).optional(),
+    vivaConnectionsDefaultStart: z.boolean().optional(),
+    isInDraftMode: z.boolean().optional(),
+    order: z.number()
+        .refine(order => validation.isValidPositiveInteger(order) === true, order => ({
+        message: `'${order}' is not a positive integer.`
+    })).optional()
+})
+    .strict();
+class SpoHomeSiteAddCommand extends SpoCommand {
+    get name() {
+        return commands.HOMESITE_ADD;
+    }
+    get description() {
+        return 'Adds a home site';
+    }
+    get schema() {
+        return options;
+    }
+    async commandAction(logger, args) {
+        try {
+            const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
+            const requestOptions = {
+                url: `${spoAdminUrl}/_api/SPHSite/AddHomeSite`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json',
+                data: {
+                    siteUrl: args.options.url,
+                    audiences: args.options.audiences?.split(','),
+                    vivaConnectionsDefaultStart: args.options.vivaConnectionsDefaultStart ?? true,
+                    isInDraftMode: args.options.isInDraftMode ?? false,
+                    order: args.options.order
+                }
+            };
+            if (this.verbose) {
+                await logger.logToStderr(`Adding home site with URL: ${args.options.url}...`);
+            }
+            const res = await request.post(requestOptions);
+            await logger.log(res);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new SpoHomeSiteAddCommand();
+//# sourceMappingURL=homesite-add.js.map

package/dist/m365/spo/commands/page/page-header-set.js

@@ -9,6 +9,7 @@ import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+const BannerWebPartId = 'cbe7b0a9-3504-44dd-a3a3-0e5cacd07788';
 class SpoPageHeaderSetCommand extends SpoCommand {
     get name() {
         return commands.PAGE_HEADER_SET;
@@ -28,8 +29,8 @@ class SpoPageHeaderSetCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         const noPageHeader = {
-            "id": "cbe7b0a9-3504-44dd-a3a3-0e5cacd07788",
-            "instanceId": "cbe7b0a9-3504-44dd-a3a3-0e5cacd07788",
+            "id": BannerWebPartId,
+            "instanceId": BannerWebPartId,
             "title": "Title Region",
             "description": "Title Region Description",
             "serverProcessedContent": {
@@ -50,8 +51,8 @@ class SpoPageHeaderSetCommand extends SpoCommand {
             }
         };
         const defaultPageHeader = {
-            "id": "cbe7b0a9-3504-44dd-a3a3-0e5cacd07788",
-            "instanceId": "cbe7b0a9-3504-44dd-a3a3-0e5cacd07788",
+            "id": BannerWebPartId,
+            "instanceId": BannerWebPartId,
             "title": "Title Region",
             "description": "Title Region Description",
             "serverProcessedContent": {
@@ -72,8 +73,8 @@ class SpoPageHeaderSetCommand extends SpoCommand {
             }
         };
         const customPageHeader = {
-            "id": "cbe7b0a9-3504-44dd-a3a3-0e5cacd07788",
-            "instanceId": "cbe7b0a9-3504-44dd-a3a3-0e5cacd07788",
+            "id": BannerWebPartId,
+            "instanceId": BannerWebPartId,
             "title": "Title Region",
             "description": "Title Region Description",
             "serverProcessedContent": {
@@ -177,6 +178,14 @@ class SpoPageHeaderSetCommand extends SpoCommand {
                 title = pageData.Title;
                 topicHeader = topicHeader || pageData.TopicHeader || "";
             }
+            const pageControls = JSON.parse(pageData.CanvasContent1);
+            //In the new design page header is is a configurable Banner webpart in the first full-width section
+            const headerControl = pageControls.find(control => control?.position?.zoneIndex === 1 && control?.position?.sectionFactor === 0 && control?.webPartId === BannerWebPartId);
+            const isStandardPageHeader = pageData.LayoutWebpartsContent !== '[]';
+            //LayoutWebpartsContent represents standard page header
+            if (!isStandardPageHeader) {
+                header = headerControl?.webPartData || header;
+            }
             header.properties.title = title;
             header.properties.textAlignment = args.options.textAlignment || 'Left';
             header.properties.showTopicHeader = args.options.showTopicHeader || false;
@@ -232,8 +241,39 @@ class SpoPageHeaderSetCommand extends SpoCommand {
                 }
             }
             const requestBody = {
-                LayoutWebpartsContent: JSON.stringify([header])
+                LayoutWebpartsContent: JSON.stringify([header]),
+                CanvasContent1: canvasContent
             };
+            if (!isStandardPageHeader) {
+                requestBody.LayoutWebpartsContent = '[]';
+                header.properties.title = topicHeader;
+                if (headerControl) {
+                    headerControl.webPartData = header;
+                }
+                else {
+                    for (const pageControl of pageControls) {
+                        if (pageControl?.position?.sectionIndex) {
+                            pageControl.position.sectionIndex += pageControl.position.sectionIndex;
+                        }
+                    }
+                    pageControls.push({
+                        id: BannerWebPartId,
+                        controlType: 3,
+                        displayMode: 2,
+                        emphasis: {},
+                        position: {
+                            zoneIndex: 1,
+                            sectionFactor: 0,
+                            layoutIndex: 1,
+                            controlIndex: 1,
+                            sectionIndex: 1
+                        },
+                        webPartId: BannerWebPartId,
+                        webPartData: header
+                    });
+                }
+                requestBody.CanvasContent1 = JSON.stringify(pageControls);
+            }
             if (title) {
                 requestBody.Title = title;
             }
@@ -249,9 +289,6 @@ class SpoPageHeaderSetCommand extends SpoCommand {
             if (bannerImageUrl) {
                 requestBody.BannerImageUrl = bannerImageUrl;
             }
-            if (canvasContent) {
-                requestBody.CanvasContent1 = canvasContent;
-            }
             requestOptions = {
                 url: `${args.options.webUrl}/_api/sitepages/pages/GetByUrl('sitepages/${formatting.encodeQueryParameter(pageFullName)}')/SavePageAsDraft`,
                 headers: {