@pnp/cli-microsoft365 12.0.0-beta.10c5833 → 12.0.0-beta.47b768f

package/dist/m365/teams/commands/meeting/meeting-list.js

@@ -1,10 +1,6 @@
-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 _TeamsMeetingListCommand_instances, _TeamsMeetingListCommand_initTelemetry, _TeamsMeetingListCommand_initOptions, _TeamsMeetingListCommand_initValidators;
 import auth from '../../../../Auth.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
 import { entraUser } from '../../../../utils/entraUser.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import { odata } from '../../../../utils/odata.js';
@@ -13,6 +9,30 @@ import GraphCommand from "../../../base/GraphCommand.js";
 import commands from '../../commands.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    userId: z.string()
+        .refine(value => validation.isValidGuid(value), {
+        message: 'The userId value must be a valid GUID.'
+    }).optional().alias('u'),
+    userName: z.string()
+        .refine(value => validation.isValidUserPrincipalName(value), {
+        message: 'The userName value must be a valid user principal name (UPN).'
+    }).optional().alias('n'),
+    email: z.string()
+        .refine(value => validation.isValidUserPrincipalName(value), {
+        message: 'The email value must be a valid email.'
+    }).optional(),
+    startDateTime: z.string()
+        .refine(value => validation.isValidISODateTime(value), {
+        error: issue => `'${issue.input}' is not a valid ISO date string for startDateTime.`
+    }),
+    endDateTime: z.string()
+        .refine(value => validation.isValidISODateTime(value), {
+        error: issue => `'${issue.input}' is not a valid ISO date string for endDateTime.`
+    }).optional(),
+    isOrganizer: z.boolean().optional()
+});
 class TeamsMeetingListCommand extends GraphCommand {
     get name() {
         return commands.MEETING_LIST;
@@ -23,12 +43,14 @@ class TeamsMeetingListCommand extends GraphCommand {
     defaultProperties() {
         return ['subject', 'startDateTime', 'endDateTime'];
     }
-    constructor() {
-        super();
-        _TeamsMeetingListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _TeamsMeetingListCommand_instances, "m", _TeamsMeetingListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _TeamsMeetingListCommand_instances, "m", _TeamsMeetingListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsMeetingListCommand_instances, "m", _TeamsMeetingListCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema.refine(options => !options.endDateTime || options.startDateTime <= options.endDateTime, {
+            message: 'startDateTime value must be before endDateTime.',
+            path: ['startDateTime']
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -127,52 +149,5 @@ class TeamsMeetingListCommand extends GraphCommand {
         return result;
     }
 }
-_TeamsMeetingListCommand_instances = new WeakSet(), _TeamsMeetingListCommand_initTelemetry = function _TeamsMeetingListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            email: typeof args.options.email !== 'undefined',
-            endDateTime: typeof args.options.endDateTime !== 'undefined',
-            isOrganizer: !!args.options.isOrganizer
-        });
-    });
-}, _TeamsMeetingListCommand_initOptions = function _TeamsMeetingListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --userId [userId]'
-    }, {
-        option: '-n, --userName [userName]'
-    }, {
-        option: '--email [email]'
-    }, {
-        option: '--startDateTime <startDateTime>'
-    }, {
-        option: '--endDateTime [endDateTime]'
-    }, {
-        option: '--isOrganizer'
-    });
-}, _TeamsMeetingListCommand_initValidators = function _TeamsMeetingListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidISODateTime(args.options.startDateTime)) {
-            return `'${args.options.startDateTime}' is not a valid ISO date string for startDateTime.`;
-        }
-        if (args.options.endDateTime && !validation.isValidISODateTime(args.options.endDateTime)) {
-            return `'${args.options.startDateTime}' is not a valid ISO date string for endDateTime.`;
-        }
-        if (args.options.startDateTime && args.options.endDateTime && args.options.startDateTime > args.options.endDateTime) {
-            return 'startDateTime value must be before endDateTime.';
-        }
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid GUID for userId.`;
-        }
-        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
-            return `'${args.options.userName}' is not a valid UPN for userName.`;
-        }
-        if (args.options.email && !validation.isValidUserPrincipalName(args.options.email)) {
-            return `'${args.options.email}' is not a valid UPN for email.`;
-        }
-        return true;
-    });
-};
 export default new TeamsMeetingListCommand();
 //# sourceMappingURL=meeting-list.js.map

package/dist/m365/teams/commands/meeting/meeting-transcript-get.js

@@ -1,10 +1,6 @@
-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 _TeamsMeetingTranscriptGetCommand_instances, _TeamsMeetingTranscriptGetCommand_initTelemetry, _TeamsMeetingTranscriptGetCommand_initOptions, _TeamsMeetingTranscriptGetCommand_initValidators, _TeamsMeetingTranscriptGetCommand_initOptionSets;
 import auth from '../../../../Auth.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
 import request from '../../../../request.js';
 import { entraUser } from '../../../../utils/entraUser.js';
 import { accessToken } from '../../../../utils/accessToken.js';
@@ -13,6 +9,27 @@ import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import fs from 'fs';
 import path from 'path';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    userId: z.string()
+        .refine(value => validation.isValidGuid(value), {
+        message: 'The userId value must be a valid GUID.'
+    }).optional().alias('u'),
+    userName: z.string()
+        .refine(value => validation.isValidUserPrincipalName(value), {
+        message: 'The userName value must be a valid user principal name (UPN).'
+    }).optional().alias('n'),
+    email: z.string()
+        .refine(value => validation.isValidUserPrincipalName(value), {
+        message: 'The email value must be a valid email.'
+    }).optional(),
+    meetingId: z.string().alias('m'),
+    id: z.string().alias('i'),
+    outputFile: z.string()
+        .refine(value => fs.existsSync(path.dirname(value)), {
+        message: 'Specified path where to save the file does not exist.'
+    }).optional().alias('f')
+});
 class TeamsMeetingTranscriptGetCommand extends GraphCommand {
     get name() {
         return commands.MEETING_TRANSCRIPT_GET;
@@ -20,13 +37,17 @@ class TeamsMeetingTranscriptGetCommand extends GraphCommand {
     get description() {
         return 'Downloads a transcript for a given meeting';
     }
-    constructor() {
-        super();
-        _TeamsMeetingTranscriptGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _TeamsMeetingTranscriptGetCommand_instances, "m", _TeamsMeetingTranscriptGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _TeamsMeetingTranscriptGetCommand_instances, "m", _TeamsMeetingTranscriptGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsMeetingTranscriptGetCommand_instances, "m", _TeamsMeetingTranscriptGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _TeamsMeetingTranscriptGetCommand_instances, "m", _TeamsMeetingTranscriptGetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema.refine(options => [options.userId, options.userName, options.email].filter(value => value !== undefined).length <= 1, {
+            message: 'Specify either userId, userName or email, but not multiple.',
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName', 'email']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -103,50 +124,5 @@ class TeamsMeetingTranscriptGetCommand extends GraphCommand {
         }
     }
 }
-_TeamsMeetingTranscriptGetCommand_instances = new WeakSet(), _TeamsMeetingTranscriptGetCommand_initTelemetry = function _TeamsMeetingTranscriptGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            email: typeof args.options.email !== 'undefined',
-            outputFile: typeof args.options.outputFile !== 'undefined'
-        });
-    });
-}, _TeamsMeetingTranscriptGetCommand_initOptions = function _TeamsMeetingTranscriptGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --userId [userId]'
-    }, {
-        option: '-n, --userName [userName]'
-    }, {
-        option: '--email [email]'
-    }, {
-        option: '-m, --meetingId <meetingId>'
-    }, {
-        option: '-i, --id <id>'
-    }, {
-        option: '-f, --outputFile [outputFile]'
-    });
-}, _TeamsMeetingTranscriptGetCommand_initValidators = function _TeamsMeetingTranscriptGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid Guid`;
-        }
-        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
-            return `${args.options.userName} is not a valid user principal name (UPN)`;
-        }
-        if (args.options.email && !validation.isValidUserPrincipalName(args.options.email)) {
-            return `${args.options.email} is not a valid email`;
-        }
-        if (args.options.outputFile && !fs.existsSync(path.dirname(args.options.outputFile))) {
-            return 'Specified path where to save the file does not exits';
-        }
-        return true;
-    });
-}, _TeamsMeetingTranscriptGetCommand_initOptionSets = function _TeamsMeetingTranscriptGetCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['userId', 'userName', 'email'],
-        runsWhen: (args) => args.options.userId || args.options.userName || args.options.email
-    });
-};
 export default new TeamsMeetingTranscriptGetCommand();
 //# sourceMappingURL=meeting-transcript-get.js.map

package/dist/m365/teams/commands/meeting/meeting-transcript-list.js

@@ -1,16 +1,28 @@
-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 _TeamsMeetingTranscriptListCommand_instances, _TeamsMeetingTranscriptListCommand_initTelemetry, _TeamsMeetingTranscriptListCommand_initOptions, _TeamsMeetingTranscriptListCommand_initValidators, _TeamsMeetingTranscriptListCommand_initOptionSets;
 import auth from '../../../../Auth.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
 import { entraUser } from '../../../../utils/entraUser.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    userId: z.string()
+        .refine(value => validation.isValidGuid(value), {
+        message: 'The userId value must be a valid GUID.'
+    }).optional().alias('u'),
+    userName: z.string()
+        .refine(value => validation.isValidUserPrincipalName(value), {
+        message: 'The userName value must be a valid user principal name (UPN).'
+    }).optional().alias('n'),
+    email: z.string()
+        .refine(value => validation.isValidUserPrincipalName(value), {
+        message: 'The email value must be a valid email.'
+    }).optional(),
+    meetingId: z.string().alias('m')
+});
 class TeamsMeetingTranscriptListCommand extends GraphCommand {
     get name() {
         return commands.MEETING_TRANSCRIPT_LIST;
@@ -21,13 +33,17 @@ class TeamsMeetingTranscriptListCommand extends GraphCommand {
     defaultProperties() {
         return ['id', 'createdDateTime'];
     }
-    constructor() {
-        super();
-        _TeamsMeetingTranscriptListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _TeamsMeetingTranscriptListCommand_instances, "m", _TeamsMeetingTranscriptListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _TeamsMeetingTranscriptListCommand_instances, "m", _TeamsMeetingTranscriptListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsMeetingTranscriptListCommand_instances, "m", _TeamsMeetingTranscriptListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _TeamsMeetingTranscriptListCommand_instances, "m", _TeamsMeetingTranscriptListCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema.refine(options => [options.userId, options.userName, options.email].filter(value => value !== undefined).length <= 1, {
+            message: 'Specify either userId, userName or email, but not multiple.',
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName', 'email']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -70,42 +86,5 @@ class TeamsMeetingTranscriptListCommand extends GraphCommand {
         }
     }
 }
-_TeamsMeetingTranscriptListCommand_instances = new WeakSet(), _TeamsMeetingTranscriptListCommand_initTelemetry = function _TeamsMeetingTranscriptListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            email: typeof args.options.email !== 'undefined'
-        });
-    });
-}, _TeamsMeetingTranscriptListCommand_initOptions = function _TeamsMeetingTranscriptListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --userId [userId]'
-    }, {
-        option: '-n, --userName [userName]'
-    }, {
-        option: '--email [email]'
-    }, {
-        option: '-m, --meetingId <meetingId>'
-    });
-}, _TeamsMeetingTranscriptListCommand_initValidators = function _TeamsMeetingTranscriptListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid Guid`;
-        }
-        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
-            return `${args.options.userName} is not a valid user principal name (UPN)`;
-        }
-        if (args.options.email && !validation.isValidUserPrincipalName(args.options.email)) {
-            return `${args.options.email} is not a valid email`;
-        }
-        return true;
-    });
-}, _TeamsMeetingTranscriptListCommand_initOptionSets = function _TeamsMeetingTranscriptListCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['userId', 'userName', 'email'],
-        runsWhen: (args) => args.options.userId || args.options.userName || args.options.email
-    });
-};
 export default new TeamsMeetingTranscriptListCommand();
 //# sourceMappingURL=meeting-transcript-list.js.map

package/dist/m365/util/commands/accesstoken/accesstoken-get.js

@@ -1,13 +1,14 @@
-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 _UtilAccessTokenGetCommand_instances, _UtilAccessTokenGetCommand_initTelemetry, _UtilAccessTokenGetCommand_initOptions;
+import { z } from 'zod';
 import auth, { Auth } from '../../../../Auth.js';
-import Command from '../../../../Command.js';
+import Command, { globalOptionsZod } from '../../../../Command.js';
 import commands from '../../commands.js';
 import { accessToken } from '../../../../utils/accessToken.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    resource: z.string().alias('r'),
+    new: z.boolean().optional(),
+    decoded: z.boolean().optional()
+});
 class UtilAccessTokenGetCommand extends Command {
     get name() {
         return commands.ACCESSTOKEN_GET;
@@ -15,11 +16,8 @@ class UtilAccessTokenGetCommand extends Command {
     get description() {
         return 'Gets access token for the specified resource';
     }
-    constructor() {
-        super();
-        _UtilAccessTokenGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _UtilAccessTokenGetCommand_instances, "m", _UtilAccessTokenGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _UtilAccessTokenGetCommand_instances, "m", _UtilAccessTokenGetCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         let resource = args.options.resource;
@@ -49,21 +47,5 @@ class UtilAccessTokenGetCommand extends Command {
         }
     }
 }
-_UtilAccessTokenGetCommand_instances = new WeakSet(), _UtilAccessTokenGetCommand_initTelemetry = function _UtilAccessTokenGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            new: args.options.new,
-            decoded: args.options.decoded
-        });
-    });
-}, _UtilAccessTokenGetCommand_initOptions = function _UtilAccessTokenGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-r, --resource <resource>'
-    }, {
-        option: '--new'
-    }, {
-        option: '--decoded'
-    });
-};
 export default new UtilAccessTokenGetCommand();
 //# sourceMappingURL=accesstoken-get.js.map

package/dist/telemetry.js

@@ -1,25 +1,21 @@
-import appInsights from './appInsights.js';
 import { cli } from './cli/cli.js';
+import { googleAnalytics } from './googleAnalytics.js';
 import { settingsNames } from './settingsNames.js';
 import { pid } from './utils/pid.js';
 import { session } from './utils/session.js';
 async function trackTelemetry(object) {
     try {
         const { commandName, properties, exception } = object;
-        appInsights.commonProperties.shell = pid.getProcessName(process.ppid) || '';
-        appInsights.context.tags[appInsights.context.keys.sessionId] = session.getId(process.ppid);
+        const context = {
+            shell: pid.getProcessName(process.ppid) || '',
+            sessionId: session.getId(process.ppid)
+        };
         if (exception) {
-            appInsights.trackException({
-                exception
-            });
+            await googleAnalytics.trackException(exception, context);
         }
         else {
-            appInsights.trackEvent({
-                name: commandName,
-                properties
-            });
+            await googleAnalytics.trackEvent(commandName, properties, context);
         }
-        await appInsights.flush();
     }
     catch {
         // Do nothing

package/dist/utils/spo.js

@@ -576,6 +576,45 @@ export const spo = {
         return request.post(requestOptions);
     },
     /**
+    * Retrieves the navigation node with the specified key.
+    * Returns the node along with the menu state that contains it.
+    * @param webUrl Web url
+    * @param key Key (ID) of the navigation node
+    * @param location Navigation to search. When not specified, searches the quick launch first and then the top navigation
+    */
+    async getMenuStateNodeByKey(webUrl, key, location) {
+        const locations = location ? [location] : ['QuickLaunch', 'TopNavigationBar'];
+        for (const navigationLocation of locations) {
+            const menuState = navigationLocation === 'TopNavigationBar'
+                ? await this.getTopNavigationMenuState(webUrl)
+                : await this.getQuickLaunchMenuState(webUrl);
+            const node = this.findMenuStateNode(menuState.Nodes, key);
+            if (node) {
+                return { menuState, node };
+            }
+        }
+        throw location
+            ? `Navigation node with id '${key}' not found in ${location}.`
+            : `Navigation node with id '${key}' not found.`;
+    },
+    /**
+    * Recursively searches the specified menu state nodes for the node with the specified key.
+    * @param nodes Menu state nodes to search
+    * @param key Key (ID) of the navigation node
+    */
+    findMenuStateNode(nodes, key) {
+        for (const node of nodes) {
+            if (node.Key === key) {
+                return node;
+            }
+            const childNode = this.findMenuStateNode(node.Nodes, key);
+            if (childNode) {
+                return childNode;
+            }
+        }
+        return undefined;
+    },
+    /**
     * Retrieves the spo group by name.
     * Returns a group object
     * @param webUrl Web url
@@ -1250,9 +1289,7 @@ export const spo = {
             // Neither properties nor contentTypeName provided, no need to proceed
             throw 'Either properties or contentTypeName must be provided for systemUpdateListItem.';
         }
-        const parsedUrl = new URL(absoluteListUrl);
-        const serverRelativeSiteMatch = absoluteListUrl.match(new RegExp('/sites/[^/]+'));
-        const webUrl = `${parsedUrl.protocol}//${parsedUrl.host}${serverRelativeSiteMatch ?? ''}`;
+        const webUrl = absoluteListUrl.substring(0, absoluteListUrl.indexOf('/_api/'));
         if (verbose && logger) {
             await logger.logToStderr(`Getting list id...`);
         }

package/dist/utils/urlUtil.js

@@ -165,8 +165,8 @@ export const urlUtil = {
     */
     getTargetSiteAbsoluteUrl(webUrl, url) {
         const fullUrl = url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
-        // Pattern to match SharePoint URLs
-        const urlPattern = /https:\/\/[\w-]+\.sharepoint\.com\/(teams|sites|personal)\/([\w-]+)/;
+        // Pattern to match SharePoint site collection URLs on any of the supported managed paths
+        const urlPattern = /^https:\/\/[\w-]+\.sharepoint\.com\/(teams|sites|personal)\/[^/?#]+/i;
         const match = fullUrl.match(urlPattern);
         if (match) {
             // If a match is found, return the matched URL

package/docs/docs/cmd/login.mdx

@@ -78,7 +78,20 @@ When logging in to Microsoft 365 using the user name and password, next to the a
 
 When logging in to Microsoft 365 using a certificate, the CLI for Microsoft 365 will store the contents of the certificate so that it can automatically re-authenticate if necessary. The contents of the certificate are removed by re-authenticating using the device code or by calling the [logout](logout.mdx) command.  
 
-Federated Identity is currently supported in GitHub Actions. To use this you need to set `authType` to `federatedIdentity` and specify `appId` and `tenant` to the values of the app registration you've configured a federated credential on. 
+Federated Identity is currently supported in GitHub Actions, Azure DevOps and GitLab CI/CD. To use this you need to set `authType` to `federatedIdentity` and specify `appId` and `tenant` to the values of the app registration you've configured a federated credential on.
+
+To use Federated Identity in GitLab CI/CD, the job must request an ID token named `GITLAB_OIDC_TOKEN` with audience `api://AzureADTokenExchange`, for example:
+
+```yaml
+job:
+  id_tokens:
+    GITLAB_OIDC_TOKEN:
+      aud: "api://AzureADTokenExchange"
+  script:
+    - m365 login --authType federatedIdentity --appId eb96cfd0-abfa-4477-8d1d-c6dfde3efb19 --tenant 9a1a1bbd-e158-4cf5-967d-a53b8e85c628
+```
+
+The corresponding federated credential on the Microsoft Entra app registration must have issuer `https://gitlab.com` (or your self-managed GitLab instance URL) and a subject matching the GitLab OIDC claim for the job, for example `project_path:<group>/<project>:ref_type:branch:ref:<branch>`.
 
 To log in to Microsoft 365 using a certificate or secret, you will typically [create a custom Microsoft Entra application](../user-guide/using-own-identity.mdx). To use this application with the CLI for Microsoft 365, you will set the `CLIMICROSOFT365_ENTRAAPPID` environment variable to the application's ID and the `CLIMICROSOFT365_TENANT` environment variable to the ID of the Microsoft Entra tenant, where you created the Microsoft Entra application. Also, please make sure to read about [the caveats when using the certificate login option](../user-guide/cli-certificate-caveats.mdx).
 
@@ -202,7 +215,7 @@ Log in to Microsoft 365 using a user-assigned managed identity with `clientId` s
 m365 login --authType identity --userName ac9fbed5-804c-4362-a369-21a4ec51109e
 ```
 
-Log in to Microsoft 365 using a federated identity. Can currently only be used in GitHub Actions.
+Log in to Microsoft 365 using a federated identity. Can currently only be used in GitHub Actions, Azure DevOps and GitLab CI/CD.
 
 ```sh
 m365 login --authType federatedIdentity --appId eb96cfd0-abfa-4477-8d1d-c6dfde3efb19 --tenant 9a1a1bbd-e158-4cf5-967d-a53b8e85c628

package/docs/docs/cmd/spo/file/file-archive.mdx

@@ -22,7 +22,7 @@ m365 spo file archive [options]
 : The server- or site-relative decoded URL of the file to archive. Specify either `url` or `id`, but not both.
 
 `-i, --id [id]`
-: The UniqueId (GUID) of the file to archive. Specify either `url` or `id`, but not both.
+: The unique ID (GUID) of the file to archive. Specify either `url` or `id`, but not both.
 
 `-f, --force`
 : Don't prompt for confirmation.

package/docs/docs/cmd/spo/file/file-checkin.mdx

@@ -22,7 +22,7 @@ m365 spo file checkin [options]
 : The server- or site-relative decoded URL of the file to retrieve. Specify either `url` or `id` but not both.
 
 `-i, --id [id]`
-: The UniqueId (GUID) of the file to retrieve. Specify either `url` or `id` but not both.
+: The unique ID (GUID) of the file to retrieve. Specify either `url` or `id` but not both.
 
 `-t, --type [type]`
 : Type of the check in. Allowed values: `Minor`, `Major`, `Overwrite`. Defaults to `Major`.
@@ -54,7 +54,7 @@ m365 spo file checkin [options]
 
 ## Examples
 
-Checks in file with the specified UniqueId located in the specified site.
+Checks in file with the specified unique ID located in the specified site.
 
 ```sh
 m365 spo file checkin --webUrl https://contoso.sharepoint.com/sites/project-x --id 'b2307a39-e878-458b-bc90-03bc578531d6'

package/docs/docs/cmd/spo/file/file-checkout-undo.mdx

@@ -22,7 +22,7 @@ m365 spo file checkout undo [options]
 : The server- or site-relative decoded URL of the file to retrieve. Specify either `fileUrl` or `fileId` but not both.
 
 `-i, --fileId [fileId]`
-: The UniqueId (GUID) of the file to retrieve. Specify either `fileUrl` or `fileId` but not both.
+: The unique ID (GUID) of the file to retrieve. Specify either `fileUrl` or `fileId` but not both.
 
 `-f, --force`
 : Don't prompt for confirmation.

package/docs/docs/cmd/spo/file/file-checkout.mdx

@@ -22,7 +22,7 @@ m365 spo file checkout [options]
 : The server- or site-relative decoded URL of the file to retrieve. Specify either `url` or `id` but not both.
 
 `-i, --id [id]`
-: The UniqueId (GUID) of the file to retrieve. Specify either `url` or `id` but not both.
+: The unique ID (GUID) of the file to retrieve. Specify either `url` or `id` but not both.
 ```
 
 <Global />
@@ -48,7 +48,7 @@ m365 spo file checkout [options]
 
 ## Examples
 
-Checks out file with the specified UniqueId located in the specified site.
+Checks out file with the specified unique ID located in the specified site.
 
 ```sh
 m365 spo file checkout --webUrl https://contoso.sharepoint.com/sites/project-x --id 'b2307a39-e878-458b-bc90-03bc578531d6'

package/docs/docs/cmd/spo/file/file-copy.mdx

@@ -85,13 +85,13 @@ Copy a file by site-relative URL to a document library in another site collectio
 m365 spo file copy --webUrl https://contoso.sharepoint.com/sites/project --sourceUrl "/Shared Documents/Document.pdf" --targetUrl "/sites/IT/Shared Documents" --ignoreVersionHistory
 ```
 
-Copy file by sourceId (UniqueId) to a document library in another site collection and rename the file (without specifying the file extension).
+Copy file by sourceId (unique ID) to a document library in another site collection and rename the file (without specifying the file extension).
 
 ```sh
 m365 spo file copy --webUrl https://contoso.sharepoint.com/sites/project --sourceId "b2307a39-e878-458b-bc90-03bc578531d6" --targetUrl "/sites/IT/Shared Documents" --newName "Report.pdf"
 ```
 
-Copy file by sourceId (UniqueId) to a document library in another site collection with a new name, rename the file if it already exists.
+Copy file by sourceId (unique ID) to a document library in another site collection with a new name, rename the file if it already exists.
 
 ```sh
 m365 spo file copy --webUrl https://contoso.sharepoint.com/sites/project --sourceId "b2307a39-e878-458b-bc90-03bc578531d6" --targetUrl "/sites/IT/Shared Documents" --newName "Report.pdf" --nameConflictBehavior rename