@pnp/cli-microsoft365 10.5.0-beta.b872a3f → 10.5.0-beta.d99742c

package/dist/Auth.js

@@ -597,7 +597,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];
         }

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/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: {

package/dist/m365/viva/commands/engage/engage-community-user-add.js

@@ -0,0 +1,113 @@
+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 { validation } from '../../../../utils/validation.js';
+import { vivaEngage } from '../../../../utils/vivaEngage.js';
+import request from '../../../../request.js';
+import { entraUser } from '../../../../utils/entraUser.js';
+import { formatting } from '../../../../utils/formatting.js';
+const options = globalOptionsZod
+    .extend({
+    communityId: z.string().optional(),
+    communityDisplayName: zod.alias('n', z.string().optional()),
+    entraGroupId: z.string()
+        .refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    ids: z.string()
+        .refine(ids => validation.isValidGuidArray(ids) === true, invalidIds => ({
+        message: `The following GUIDs are invalid: ${invalidIds}.`
+    })).optional(),
+    userNames: z.string()
+        .refine(userNames => validation.isValidUserPrincipalNameArray(userNames) === true, invalidUserNames => ({
+        message: `The following user principal names are invalid: ${invalidUserNames}.`
+    })).optional(),
+    role: zod.alias('r', z.enum(['Admin', 'Member']))
+})
+    .strict();
+class VivaEngageCommunityUserAddCommand extends GraphCommand {
+    get name() {
+        return commands.ENGAGE_COMMUNITY_USER_ADD;
+    }
+    get description() {
+        return 'Adds a user to a specific Microsoft 365 Viva Engage community';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.communityId, options.communityDisplayName, options.entraGroupId].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either communityId, communityDisplayName, or entraGroupId, but not multiple.'
+        })
+            .refine(options => options.communityId || options.communityDisplayName || options.entraGroupId, {
+            message: 'Specify at least one of communityId, communityDisplayName, or entraGroupId.'
+        })
+            .refine(options => options.ids || options.userNames, {
+            message: 'Specify either of ids or userNames.'
+        })
+            .refine(options => typeof options.userNames !== undefined && typeof options.ids !== undefined, {
+            message: 'Specify either ids or userNames, but not both.'
+        });
+    }
+    async commandAction(logger, args) {
+        try {
+            if (this.verbose) {
+                await logger.logToStderr('Adding users to community...');
+            }
+            let entraGroupId = args.options.entraGroupId;
+            if (args.options.communityDisplayName) {
+                const community = await vivaEngage.getCommunityByDisplayName(args.options.communityDisplayName, ['groupId']);
+                entraGroupId = community.groupId;
+            }
+            if (args.options.communityId) {
+                const community = await vivaEngage.getCommunityById(args.options.communityId, ['groupId']);
+                entraGroupId = community.groupId;
+            }
+            const userIds = args.options.ids ? formatting.splitAndTrim(args.options.ids) : await entraUser.getUserIdsByUpns(formatting.splitAndTrim(args.options.userNames));
+            const role = args.options.role === 'Member' ? 'members' : 'owners';
+            for (let i = 0; i < userIds.length; i += 400) {
+                const userIdsBatch = userIds.slice(i, i + 400);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/$batch`,
+                    headers: {
+                        'content-type': 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: {
+                        requests: []
+                    }
+                };
+                // only 20 requests per one batch are allowed
+                for (let j = 0; j < userIdsBatch.length; j += 20) {
+                    // only 20 users can be added in one request
+                    const userIdsChunk = userIdsBatch.slice(j, j + 20);
+                    requestOptions.data.requests.push({
+                        id: j + 1,
+                        method: 'PATCH',
+                        url: `/groups/${entraGroupId}`,
+                        headers: {
+                            'content-type': 'application/json;odata.metadata=none'
+                        },
+                        body: {
+                            [`${role}@odata.bind`]: userIdsChunk.map((u) => `${this.resource}/v1.0/directoryObjects/${u}`)
+                        }
+                    });
+                }
+                const res = await request.post(requestOptions);
+                for (const response of res.responses) {
+                    if (response.status !== 204) {
+                        throw response.body;
+                    }
+                }
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new VivaEngageCommunityUserAddCommand();
+//# sourceMappingURL=engage-community-user-add.js.map

package/dist/m365/viva/commands/engage/engage-community-user-remove.js

@@ -0,0 +1,107 @@
+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 { validation } from '../../../../utils/validation.js';
+import { vivaEngage } from '../../../../utils/vivaEngage.js';
+import request from '../../../../request.js';
+import { entraUser } from '../../../../utils/entraUser.js';
+import { cli } from '../../../../cli/cli.js';
+const options = globalOptionsZod
+    .extend({
+    communityId: z.string().optional(),
+    communityDisplayName: zod.alias('n', z.string().optional()),
+    entraGroupId: z.string()
+        .refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    id: z.string()
+        .refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    userName: z.string()
+        .refine(userName => validation.isValidUserPrincipalName(userName), userName => ({
+        message: `'${userName}' is not a valid user principal name.`
+    })).optional(),
+    force: z.boolean().optional()
+})
+    .strict();
+class VivaEngageCommunityUserRemoveCommand extends GraphCommand {
+    get name() {
+        return commands.ENGAGE_COMMUNITY_USER_REMOVE;
+    }
+    get description() {
+        return 'Removes a specified user from a Microsoft 365 Viva Engage community';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.communityId, options.communityDisplayName, options.entraGroupId].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either communityId, communityDisplayName, or entraGroupId, but not multiple.'
+        })
+            .refine(options => options.communityId || options.communityDisplayName || options.entraGroupId, {
+            message: 'Specify at least one of communityId, communityDisplayName, or entraGroupId.'
+        })
+            .refine(options => options.id || options.userName, {
+            message: 'Specify either of id or userName.'
+        })
+            .refine(options => typeof options.userName !== undefined && typeof options.id !== undefined, {
+            message: 'Specify either id or userName, but not both.'
+        });
+    }
+    async commandAction(logger, args) {
+        try {
+            if (args.options.force) {
+                await this.deleteUserFromCommunity(args.options, logger);
+            }
+            else {
+                const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the user ${args.options.id || args.options.userName} from the community ${args.options.communityDisplayName || args.options.communityId || args.options.entraGroupId}?` });
+                if (result) {
+                    await this.deleteUserFromCommunity(args.options, logger);
+                }
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async deleteUserFromCommunity(options, logger) {
+        if (this.verbose) {
+            await logger.logToStderr('Removing user from community...');
+        }
+        let entraGroupId = options.entraGroupId;
+        if (options.communityDisplayName) {
+            const community = await vivaEngage.getCommunityByDisplayName(options.communityDisplayName, ['groupId']);
+            entraGroupId = community.groupId;
+        }
+        else if (options.communityId) {
+            const community = await vivaEngage.getCommunityById(options.communityId, ['groupId']);
+            entraGroupId = community.groupId;
+        }
+        const userId = options.id || await entraUser.getUserIdByUpn(options.userName);
+        await this.deleteUser(entraGroupId, userId, 'owners');
+        await this.deleteUser(entraGroupId, userId, 'members');
+    }
+    async deleteUser(entraGroupId, userId, role) {
+        try {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/groups/${entraGroupId}/${role}/${userId}/$ref`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            await request.delete(requestOptions);
+        }
+        catch (err) {
+            if (err.response.status !== 404) {
+                throw err.response.data;
+            }
+        }
+    }
+}
+export default new VivaEngageCommunityUserRemoveCommand();
+//# sourceMappingURL=engage-community-user-remove.js.map

package/dist/m365/viva/commands.js

@@ -5,7 +5,9 @@ export default {
     ENGAGE_COMMUNITY_GET: `${prefix} engage community get`,
     ENGAGE_COMMUNITY_LIST: `${prefix} engage community list`,
     ENGAGE_COMMUNITY_SET: `${prefix} engage community set`,
+    ENGAGE_COMMUNITY_USER_ADD: `${prefix} engage community user add`,
     ENGAGE_COMMUNITY_USER_LIST: `${prefix} engage community user list`,
+    ENGAGE_COMMUNITY_USER_REMOVE: `${prefix} engage community user remove`,
     ENGAGE_GROUP_LIST: `${prefix} engage group list`,
     ENGAGE_GROUP_USER_ADD: `${prefix} engage group user add`,
     ENGAGE_GROUP_USER_REMOVE: `${prefix} engage group user remove`,

package/docs/docs/cmd/viva/engage/engage-community-user-add.mdx

@@ -0,0 +1,67 @@
+import Global from '/docs/cmd/_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# viva engage community user add
+
+Adds a user to a specific Microsoft 365 Viva Engage community
+
+## Usage
+
+```sh
+m365 viva engage community user add [options]
+```
+
+## Options
+
+```md definition-list
+`-i, --communityId [communityId]`
+: The ID of the Viva Engage community. Specify `communityId`, `communityDisplayName` or `entraGroupId`.
+
+`-n, --communityDisplayName [communityDisplayName]`
+: The display name of the Viva Engage community. Specify `communityId`, `communityDisplayName` or `entraGroupId`.
+
+`--entraGroupId [entraGroupId]`
+: The ID of the Microsoft 365 group. Specify `communityId`, `communityDisplayName` or `entraGroupId`.
+
+`--ids [ids]`
+: Microsoft Entra IDs of users. You can pass a comma-separated list of multiple IDs. Specify either `ids` or `userNames` but not both.
+
+`--userNames [userNames]`
+: The user principal names of users. You can pass a comma-separated list of multiple UPNs. Specify either `ids` or `userNames` but not both.
+
+`-r, --role <role>`
+: The role to be assigned to the new users. Valid values: `Admin`, `Member`.
+```
+
+<Global />
+
+## Examples
+
+Add a single user specified by ID as a member to a community specified by display name.
+
+```sh
+m365 viva engage community user add --communityDisplayName "All company" --ids 098b9f52-f48c-4401-819f-29c33794c3f5 --role Member
+```
+
+Add multiple users specified by ID as members to a community specified by ID.
+
+```sh
+m365 viva engage community user add --communityId eyJfdHlwZSI6Ikdyb3VwIiwiaWQiOiIzNjAyMDAxMTAwOSJ9 --ids "098b9f52-f48c-4401-819f-29c33794c3f5,f1e06e31-3abf-4746-83c2-1513d71f38b8" --role Member
+```
+
+Add a single user specified by UPN as an admin to a community specified by display name.
+
+```sh
+m365 viva engage community user add --communityDisplayName "All company" --userNames john.doe@contoso.com --role Admin
+```
+
+Adds multiple users specified by UPN as admins to a community specified by its group ID.
+
+```sh
+m365 viva engage community user add --entraGroupId a03c0c35-ef9a-419b-8cab-f89e0a8d2d2a --userNames "john.doe@contoso.com,adele.vance@contoso.com" --role Admin
+```
+
+## Response
+
+The command won't return a response on success.

package/docs/docs/cmd/viva/engage/engage-community-user-remove.mdx

@@ -0,0 +1,55 @@
+import Global from '/docs/cmd/_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# viva engage community user remove
+
+Removes a specified user from a Microsoft 365 Viva Engage community
+
+## Usage
+
+```sh
+m365 viva engage community user remove [options]
+```
+
+## Options
+
+```md definition-list
+`-i, --communityId [communityId]`
+: The ID of the Viva Engage community. Specify `communityId`, `communityDisplayName` or `entraGroupId`.
+
+`-n, --communityDisplayName [communityDisplayName]`
+: The display name of the Viva Engage community. Specify `communityId`, `communityDisplayName` or `entraGroupId`.
+
+`--entraGroupId [entraGroupId]`
+: The ID of the Microsoft 365 group. Specify `communityId`, `communityDisplayName` or `entraGroupId`.
+
+`--id [id]`
+: Microsoft Entra ID of the user. Specify either `id` or `userName` but not both.
+
+`--userName [userName]`
+: The user principal name of the user. Specify either `id` or `userName` but not both.
+
+`-f, --force`
+: Don't prompt for confirming removing the user from the specified Viva Engage community.
+```
+
+<Global />
+
+## Examples
+
+Remove a user specified by ID as a member from a community specified by display name.
+
+```sh
+m365 viva engage community user remove --communityDisplayName "All company" --id 098b9f52-f48c-4401-819f-29c33794c3f5
+```
+
+Remove a user specified by UPN from a community specified by its group ID without confirmation.
+
+```sh
+m365 viva engage community user remove --entraGroupId a03c0c35-ef9a-419b-8cab-f89e0a8d2d2a --userName john.doe@contoso.com --force
+```
+
+## Response
+
+The command won't return a response on success.