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

package/dist/utils/spo.js

@@ -11,17 +11,20 @@ import { odata } from './odata.js';
 import { RoleType } from '../m365/spo/commands/roledefinition/RoleType.js';
 import { entraGroup } from './entraGroup.js';
 import { SharingCapabilities } from '../m365/spo/commands/site/SharingCapabilities.js';
-import { setTimeout } from 'timers/promises';
-export var CreateCopyJobsNameConflictBehavior;
-(function (CreateCopyJobsNameConflictBehavior) {
-    CreateCopyJobsNameConflictBehavior[CreateCopyJobsNameConflictBehavior["Fail"] = 0] = "Fail";
-    CreateCopyJobsNameConflictBehavior[CreateCopyJobsNameConflictBehavior["Replace"] = 1] = "Replace";
-    CreateCopyJobsNameConflictBehavior[CreateCopyJobsNameConflictBehavior["Rename"] = 2] = "Rename";
-})(CreateCopyJobsNameConflictBehavior || (CreateCopyJobsNameConflictBehavior = {}));
+import { timersUtil } from './timersUtil.js';
+export var CreateFileCopyJobsNameConflictBehavior;
+(function (CreateFileCopyJobsNameConflictBehavior) {
+    CreateFileCopyJobsNameConflictBehavior[CreateFileCopyJobsNameConflictBehavior["Fail"] = 0] = "Fail";
+    CreateFileCopyJobsNameConflictBehavior[CreateFileCopyJobsNameConflictBehavior["Replace"] = 1] = "Replace";
+    CreateFileCopyJobsNameConflictBehavior[CreateFileCopyJobsNameConflictBehavior["Rename"] = 2] = "Rename";
+})(CreateFileCopyJobsNameConflictBehavior || (CreateFileCopyJobsNameConflictBehavior = {}));
+export var CreateFolderCopyJobsNameConflictBehavior;
+(function (CreateFolderCopyJobsNameConflictBehavior) {
+    CreateFolderCopyJobsNameConflictBehavior[CreateFolderCopyJobsNameConflictBehavior["Fail"] = 0] = "Fail";
+    CreateFolderCopyJobsNameConflictBehavior[CreateFolderCopyJobsNameConflictBehavior["Rename"] = 2] = "Rename";
+})(CreateFolderCopyJobsNameConflictBehavior || (CreateFolderCopyJobsNameConflictBehavior = {}));
 // Wrapping this into a settings object so we can alter the values in tests
-export const settings = {
-    pollingInterval: 3000
-};
+const pollingInterval = 3000;
 export const spo = {
     async getRequestDigest(siteUrl) {
         const requestOptions = {
@@ -79,7 +82,7 @@ export const spo = {
                 }
                 return;
             }
-            await setTimeout(operation.PollingInterval);
+            await timersUtil.setTimeout(pollingInterval);
             await spo.waitUntilFinished({
                 operationId: JSON.stringify(operation._ObjectIdentity_),
                 siteUrl,
@@ -500,10 +503,10 @@ export const spo = {
    * @param webUrl Web url
    * @param email The email of the user
    * @param logger the Logger object
-   * @param verbose set if verbose logging should be logged
+   * @param verbose set for verbose logging
    */
     async getUserByEmail(webUrl, email, logger, verbose) {
-        if (verbose) {
+        if (verbose && logger) {
             await logger.logToStderr(`Retrieving the spo user by email ${email}`);
         }
         const requestUrl = `${webUrl}/_api/web/siteusers/GetByEmail('${formatting.encodeQueryParameter(email)}')`;
@@ -574,10 +577,10 @@ export const spo = {
     * @param webUrl Web url
     * @param name The name of the group
     * @param logger the Logger object
-    * @param verbose set if verbose logging should be logged
+    * @param verbose set for verbose logging
     */
     async getGroupByName(webUrl, name, logger, verbose) {
-        if (verbose) {
+        if (verbose && logger) {
             await logger.logToStderr(`Retrieving the group by name ${name}`);
         }
         const requestUrl = `${webUrl}/_api/web/sitegroups/GetByName('${formatting.encodeQueryParameter(name)}')`;
@@ -596,10 +599,10 @@ export const spo = {
     * @param webUrl Web url
     * @param name the name of the role definition
     * @param logger the Logger object
-    * @param debug set if debug logging should be logged
+    * @param verbose set for verbose logging
     */
-    async getRoleDefinitionByName(webUrl, name, logger, debug) {
-        if (debug) {
+    async getRoleDefinitionByName(webUrl, name, logger, verbose) {
+        if (verbose && logger) {
             await logger.logToStderr(`Retrieving the role definitions for ${name}`);
         }
         const roledefinitions = await odata.getAllItems(`${webUrl}/_api/web/roledefinitions`);
@@ -691,7 +694,7 @@ export const spo = {
                 if (!wait || isComplete) {
                     return;
                 }
-                await setTimeout(operation.PollingInterval);
+                await timersUtil.setTimeout(pollingInterval);
                 await spo.waitUntilFinished({
                     operationId: JSON.stringify(operation._ObjectIdentity_),
                     siteUrl: spoAdminUrl,
@@ -905,7 +908,7 @@ export const spo = {
         if (!wait || isComplete) {
             return;
         }
-        await setTimeout(operation.PollingInterval);
+        await timersUtil.setTimeout(pollingInterval);
         await spo.waitUntilFinished({
             operationId: JSON.stringify(operation._ObjectIdentity_),
             siteUrl: spoAdminUrl,
@@ -1051,7 +1054,7 @@ export const spo = {
                 const operation = json[json.length - 1];
                 const isComplete = operation.IsComplete;
                 if (!isComplete) {
-                    await setTimeout(operation.PollingInterval);
+                    await timersUtil.setTimeout(pollingInterval);
                     await spo.waitUntilFinished({
                         operationId: JSON.stringify(operation._ObjectIdentity_),
                         siteUrl: spoAdminUrl,
@@ -1528,14 +1531,37 @@ export const spo = {
         return (itemsResponse);
     },
     /**
-     * Create a SharePoint copy job to copy a file/folder to another location.
-     * @param webUrl Absolute web URL where the source file/folder is located.
-     * @param sourceUrl Absolute URL of the source file/folder.
+    * Retrieves the file by id.
+    * Returns a FileProperties object
+    * @param webUrl Web url
+    * @param id the id of the file
+    * @param logger the Logger object
+    * @param verbose set for verbose logging
+    */
+    async getFileById(webUrl, id, logger, verbose) {
+        if (verbose && logger) {
+            await logger.logToStderr(`Retrieving the file with id ${id}`);
+        }
+        const requestUrl = `${webUrl}/_api/web/GetFileById('${formatting.encodeQueryParameter(id)}')`;
+        const requestOptions = {
+            url: requestUrl,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const file = await request.get(requestOptions);
+        return file;
+    },
+    /**
+     * Create a SharePoint copy job to copy a file to another location.
+     * @param webUrl Absolute web URL where the source file is located.
+     * @param sourceUrl Absolute URL of the source file.
      * @param destinationUrl Absolute URL of the destination folder.
      * @param options Options for the copy job.
      * @returns Copy job information. Use {@link spo.getCopyJobResult} to get the result of the copy job.
      */
-    async createCopyJob(webUrl, sourceUrl, destinationUrl, options) {
+    async createFileCopyJob(webUrl, sourceUrl, destinationUrl, options) {
         const requestOptions = {
             url: `${webUrl}/_api/Site/CreateCopyJobs`,
             headers: {
@@ -1546,12 +1572,44 @@ export const spo = {
                 destinationUri: destinationUrl,
                 exportObjectUris: [sourceUrl],
                 options: {
-                    NameConflictBehavior: options?.nameConflictBehavior ?? CreateCopyJobsNameConflictBehavior.Fail,
+                    NameConflictBehavior: options?.nameConflictBehavior ?? CreateFileCopyJobsNameConflictBehavior.Fail,
                     AllowSchemaMismatch: true,
                     BypassSharedLock: !!options?.bypassSharedLock,
                     IgnoreVersionHistory: !!options?.ignoreVersionHistory,
+                    IncludeItemPermissions: !!options?.includeItemPermissions,
                     CustomizedItemName: options?.newName ? [options.newName] : undefined,
-                    SameWebCopyMoveOptimization: true
+                    SameWebCopyMoveOptimization: true,
+                    IsMoveMode: options?.operation === 'move'
+                }
+            }
+        };
+        const response = await request.post(requestOptions);
+        return response.value[0];
+    },
+    /**
+     * Create a SharePoint copy job to copy a folder to another location.
+     * @param webUrl Absolute web URL where the source folder is located.
+     * @param sourceUrl Absolute URL of the source folder.
+     * @param destinationUrl Absolute URL of the destination folder.
+     * @param options Options for the copy job.
+     * @returns Copy job information. Use {@link spo.getCopyJobResult} to get the result of the copy job.
+     */
+    async createFolderCopyJob(webUrl, sourceUrl, destinationUrl, options) {
+        const requestOptions = {
+            url: `${webUrl}/_api/Site/CreateCopyJobs`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json',
+            data: {
+                destinationUri: destinationUrl,
+                exportObjectUris: [sourceUrl],
+                options: {
+                    NameConflictBehavior: options?.nameConflictBehavior ?? CreateFolderCopyJobsNameConflictBehavior.Fail,
+                    AllowSchemaMismatch: true,
+                    CustomizedItemName: options?.newName ? [options.newName] : undefined,
+                    SameWebCopyMoveOptimization: true,
+                    IsMoveMode: options?.operation === 'move'
                 }
             }
         };
@@ -1576,12 +1634,20 @@ export const spo = {
                 copyJobInfo: copyJobInfo
             }
         };
+        const logs = [];
         let progress = await request.post(requestOptions);
+        const newLogs = progress.Logs?.map(l => JSON.parse(l));
+        if (newLogs?.length > 0) {
+            logs.push(...newLogs);
+        }
         while (progress.JobState !== 0) {
-            await setTimeout(settings.pollingInterval);
+            await timersUtil.setTimeout(pollingInterval);
             progress = await request.post(requestOptions);
+            const newLogs = progress.Logs?.map(l => JSON.parse(l));
+            if (newLogs?.length > 0) {
+                logs.push(...newLogs);
+            }
         }
-        const logs = progress.Logs.map(l => JSON.parse(l));
         // Check if the job has failed
         const errorLog = logs.find(l => l.Event === 'JobError');
         if (errorLog) {
@@ -1590,6 +1656,77 @@ export const spo = {
         // Get the destination object information
         const objectInfo = logs.find(l => l.Event === 'JobFinishedObjectInfo');
         return objectInfo;
+    },
+    /**
+     * Gets the primary owner login from a site as admin.
+     * @param adminUrl The SharePoint admin URL
+     * @param siteId The site ID
+     * @param logger The logger object
+     * @param verbose If in verbose mode
+     * @returns Owner login name
+     */
+    async getPrimaryAdminLoginNameAsAdmin(adminUrl, siteId, logger, verbose) {
+        if (verbose) {
+            await logger.logToStderr('Getting the primary admin login name...');
+        }
+        const requestOptions = {
+            url: `${adminUrl}/_api/SPO.Tenant/sites('${siteId}')?$select=OwnerLoginName`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const response = await request.get(requestOptions);
+        return response.OwnerLoginName;
+    },
+    /**
+     * Gets the primary owner login from a site.
+     * @param siteUrl The site URL
+     * @param logger The logger object
+     * @param verbose If in verbose mode
+     * @returns Owner login name
+     */
+    async getPrimaryOwnerLoginFromSite(siteUrl, logger, verbose) {
+        if (verbose) {
+            await logger.logToStderr('Getting the primary admin login name...');
+        }
+        const requestOptions = {
+            url: `${siteUrl}/_api/site/owner`,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const responseContent = await request.get(requestOptions);
+        return responseContent?.LoginName;
+    },
+    /**
+    * Retrieves the site admin properties for a given site URL.
+    * @param adminUrl The SharePoint admin url.
+    * @param siteUrl URL of the site for which to retrieve properties.
+    * @param includeDetail Set to true to include detailed properties.
+    * @param logger The logger object.
+    * @param verbose Set for verbose logging.
+    * @returns Tenant Site properties.
+    */
+    async getSiteAdminPropertiesByUrl(siteUrl, includeDetail, logger, verbose) {
+        if (verbose) {
+            await logger.logToStderr(`Getting site admin properties for URL: ${siteUrl}...`);
+        }
+        const adminUrl = await spo.getSpoAdminUrl(logger, !!verbose);
+        const requestOptions = {
+            url: `${adminUrl}/_api/SPO.Tenant/GetSitePropertiesByUrl`,
+            headers: {
+                accept: 'application/json;odata=nometadata',
+                'content-type': 'application/json;charset=utf-8'
+            },
+            data: {
+                url: siteUrl,
+                includeDetail: includeDetail
+            },
+            responseType: 'json'
+        };
+        return request.post(requestOptions);
     }
 };
 //# sourceMappingURL=spo.js.map

package/dist/utils/spp.js

@@ -0,0 +1,22 @@
+import request from '../request.js';
+export const spp = {
+    /**
+     * Asserts whether the specified site is a content center.
+     * @param siteUrl The URL of the site to check.
+     * @throws Error when the site is not a content center.
+     */
+    async assertSiteIsContentCenter(siteUrl) {
+        const requestOptions = {
+            url: `${siteUrl}/_api/web?$select=WebTemplateConfiguration`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const response = await request.get(requestOptions);
+        if (response.WebTemplateConfiguration !== 'CONTENTCTR#0') {
+            throw Error(`${siteUrl} is not a content site.`);
+        }
+    }
+};
+//# sourceMappingURL=spp.js.map

package/dist/utils/teams.js

@@ -3,6 +3,25 @@ import { odata } from './odata.js';
 import { cli } from '../cli/cli.js';
 const graphResource = 'https://graph.microsoft.com';
 export const teams = {
+    /**
+     * Retrieve a team by its name.
+     * @param displayName Name of the team to retrieve.
+     * @throws Error if the team cannot be found.
+     * @throws Error when multiple teams with the same name and prompting is disabled.
+     * @returns The Teams team.
+     */
+    async getTeamByDisplayName(displayName) {
+        const teams = await odata.getAllItems(`${graphResource}/v1.0/teams?$filter=displayName eq '${formatting.encodeQueryParameter(displayName)}'`);
+        if (!teams.length) {
+            throw Error(`The specified team '${displayName}' does not exist.`);
+        }
+        if (teams.length === 1) {
+            return teams[0];
+        }
+        const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', teams);
+        const result = await cli.handleMultipleResultsFound(`Multiple teams with name '${displayName}' found.`, resultAsKeyValuePair);
+        return result;
+    },
     /**
      * Retrieve the id of a team by its name.
      * @param displayName Name of the team to retrieve.
@@ -15,12 +34,35 @@ export const teams = {
         if (!teams.length) {
             throw Error(`The specified team '${displayName}' does not exist.`);
         }
-        if (teams.length > 1) {
-            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', teams);
-            const result = await cli.handleMultipleResultsFound(`Multiple teams with name '${displayName}' found.`, resultAsKeyValuePair);
-            return result.id;
+        if (teams.length === 1) {
+            return teams[0].id;
+        }
+        const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', teams);
+        const result = await cli.handleMultipleResultsFound(`Multiple teams with name '${displayName}' found.`, resultAsKeyValuePair);
+        return result.id;
+    },
+    /**
+       * Retrieves a channel by its name in a Microsoft Teams team.
+       * @param teamId The ID of the team.
+       * @param name The name of the channel.
+       * @throws Throws an error if the specified channel does not exist in the team.
+       * @returns The Teams channel.
+       */
+    async getChannelByDisplayName(teamId, name) {
+        const channelRequestOptions = {
+            url: `${graphResource}/v1.0/teams/${teamId}/channels?$filter=displayName eq '${formatting.encodeQueryParameter(name)}'`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const response = await odata.getAllItems(channelRequestOptions);
+        // Only one channel can have the same name in a team
+        const channelItem = response[0];
+        if (!channelItem) {
+            throw Error(`The channel '${name}' does not exist in the Microsoft Teams team with ID '${teamId}'.`);
         }
-        return teams[0].id;
+        return channelItem;
     },
     /**
      * Retrieves the channel ID by its name in a Microsoft Teams team.

package/dist/utils/timersUtil.js

@@ -0,0 +1,13 @@
+import { setTimeout } from "timers/promises";
+export const timersUtil = {
+    /**
+     * Timeout for a specific duration.
+     * @param duration Duration in milliseconds.
+     */
+    /* c8 ignore next 4 */
+    // Function is created so we can easily mock it in our tests
+    async setTimeout(duration) {
+        return setTimeout(duration);
+    }
+};
+//# sourceMappingURL=timersUtil.js.map

package/dist/utils/urlUtil.js

@@ -198,6 +198,14 @@ export const urlUtil = {
             return rootUrl.origin;
         }
     },
+    /**
+     * Removes leading slashes from the URL.
+     * @param url The URL to process.
+     * @returns The URL without leading slashes.
+     */
+    removeLeadingSlashes(url) {
+        return url.replace(/^\/+/, '');
+    },
     /**
      * Removes trailing slashes from the URL.
      * @param url The URL to process.

package/dist/utils/vivaEngage.js

@@ -0,0 +1,61 @@
+import { cli } from '../cli/cli.js';
+import request from '../request.js';
+import { formatting } from './formatting.js';
+import { odata } from './odata.js';
+export const vivaEngage = {
+    /**
+     * Get Viva Engage group ID by community ID.
+     * @param communityId The ID of the Viva Engage community.
+     * @returns The ID of the Viva Engage group.
+     * @returns The Viva Engage community.
+     */
+    async getCommunityById(communityId, selectProperties) {
+        const requestOptions = {
+            url: `https://graph.microsoft.com/v1.0/employeeExperience/communities/${communityId}?$select=${selectProperties.join(',')}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const community = await request.get(requestOptions);
+        if (!community) {
+            throw `The specified Viva Engage community with ID '${communityId}' does not exist.`;
+        }
+        return community;
+    },
+    /**
+     * Get Viva Engage community by display name.
+     * @param displayName Community display name.
+     * @param selectProperties Properties to select.
+     * @returns The Viva Engage community.
+     */
+    async getCommunityByDisplayName(displayName, selectProperties) {
+        const communities = await odata.getAllItems(`https://graph.microsoft.com/v1.0/employeeExperience/communities?$filter=displayName eq '${formatting.encodeQueryParameter(displayName)}'&$select=${selectProperties.join(',')}`);
+        if (communities.length === 0) {
+            throw `The specified Viva Engage community '${displayName}' does not exist.`;
+        }
+        if (communities.length > 1) {
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', communities);
+            const selectedCommunity = await cli.handleMultipleResultsFound(`Multiple Viva Engage communities with name '${displayName}' found.`, resultAsKeyValuePair);
+            return selectedCommunity;
+        }
+        return communities[0];
+    },
+    /**
+     * Get Viva Engage community by Microsoft Entra group ID.
+     * Note: The Graph API doesn't support filtering by groupId, so we need to retrieve all communities and filter them in memory.
+     * @param entraGroupId The ID of the Microsoft Entra group.
+     * @param selectProperties Properties to select.
+     * @returns The Viva Engage community.
+     */
+    async getCommunityByEntraGroupId(entraGroupId, selectProperties) {
+        const properties = selectProperties.includes('groupId') ? selectProperties : [...selectProperties, 'groupId'];
+        const communities = await odata.getAllItems(`https://graph.microsoft.com/v1.0/employeeExperience/communities?$select=${properties.join(',')}`);
+        const filteredCommunity = communities.find(c => c.groupId === entraGroupId);
+        if (!filteredCommunity) {
+            throw `The Microsoft Entra group with id '${entraGroupId}' is not associated with any Viva Engage community.`;
+        }
+        return filteredCommunity;
+    }
+};
+//# sourceMappingURL=vivaEngage.js.map

package/dist/utils/zod.js

@@ -60,14 +60,14 @@ function parseDefault(def, _options, currentOption) {
 function parseEnum(def, _options, currentOption) {
     if (currentOption) {
         currentOption.type = 'string';
-        currentOption.autocomplete = def.values;
+        currentOption.autocomplete = [...def.values];
     }
     return;
 }
 function parseNativeEnum(def, _options, currentOption) {
     if (currentOption) {
         currentOption.type = 'string';
-        currentOption.autocomplete = Object.getOwnPropertyNames(def.values);
+        currentOption.autocomplete = Object.values(def.values).map(v => String(v));
     }
     return;
 }
@@ -119,6 +119,15 @@ export const zod = {
         const options = [];
         parseDef(schema._def, options);
         return options;
-    }
+    },
+    coercedEnum: (e) => z.preprocess(val => {
+        const target = String(val)?.toLowerCase();
+        for (const k of Object.values(e)) {
+            if (String(k)?.toLowerCase() === target) {
+                return k;
+            }
+        }
+        return null;
+    }, z.nativeEnum(e))
 };
 //# sourceMappingURL=zod.js.map

package/docs/docs/_clisettings.mdx

@@ -2,6 +2,11 @@ Setting name|Definition|Default value
 ------------|----------|-------------
 `authType`|Default login method to use when running `m365 login` without the `--authType` option.|`deviceCode`
 `autoOpenLinksInBrowser`|Automatically open the browser for all commands which return a url and expect the user to copy paste this to the browser. For example when logging in, using `m365 login` in device code mode.|`false`
+`clientId`|ID of the default Entra ID app use by the CLI to authenticate|``
+`clientSecret`|Secret of the default Entra ID app use by the CLI to authenticate|``
+`clientCertificateFile`|Path to the file containing the client certificate to use for authentication|``
+`clientCertificateBase64Encoded`|Base64-encoded client certificate contents|``
+`clientCertificatePassword`|Password to the client certificate file|``
 `copyDeviceCodeToClipboard`|Automatically copy the device code to the clipboard when running `m365 login` command in device code mode|`false`
 `csvEscape`|Single character used for escaping; only apply to characters matching the quote and the escape options|`"`
 `csvHeader`|Display the column names on the first line|`true`
@@ -17,4 +22,4 @@ Setting name|Definition|Default value
 `prompt`|Prompts for missing values in required options and enables interactive selection when multiple values are available for a command that requires a specific value to be retrieved.|`true`
 `promptListPageSize`|By default, lists of choices longer than 7 will be paginated. Use this option to control how many choices will appear on the screen at once.|7
 `showHelpOnFailure`|Automatically display help when executing a command failed|`true`
-`showSpinner`|Display spinner when executing commands|`true`
+`tenantId`|ID of the default tenant to use when authenticating with|``

package/docs/docs/cmd/cli/cli-doctor.mdx

@@ -22,7 +22,7 @@ This command gets all the necessary diagnostic information needed to triage and
 
 ## Examples
 
-Retrieve diagnostic information
+Retrieve diagnostic information.
 
 ```sh
 m365 cli doctor
@@ -42,18 +42,20 @@ m365 cli doctor
     },
     "cliVersion": "6.1.0",
     "nodeVersion": "v16.13.0",
-    "cliAadAppId": "31359c7f-bd7e-475c-86db-fdb8c937548e",
-    "cliAadAppTenant": "common",
-    "authMode": "DeviceCode",
+    "cliEntraAppId": "31359c7f-bd7e-475c-86db-fdb8c937548e",
+    "cliEntraAppTenant": "common",
+    "authMode": "deviceCode",
     "cliEnvironment": "",
     "cliConfig": {
       "output": "json",
       "showHelpOnFailure": false
     },
     "roles": [],
-    "scopes": [
-      "AllSites.FullControl"
-    ]
+    "scopes": {
+      "https://graph.microsoft.com": [
+        "AllSites.FullControl"
+      ]
+    }
   }
   ```
 
@@ -61,24 +63,24 @@ m365 cli doctor
   <TabItem value="Text">
 
   ```text
-  authMode       : DeviceCode
-  cliAadAppId    : 31359c7f-bd7e-475c-86db-fdb8c937548e
-  cliAadAppTenant: common
-  cliConfig      : {"output":"json","showHelpOnFailure":false}
-  cliEnvironment :
-  cliVersion     : 6.1.0
-  nodeVersion    : v16.13.0
-  os             : {"platform":"win32","version":"Windows 10 Pro","release":"10.0.19045"}
-  roles          : []
-  scopes         : ["AllSites.FullControl"]
+  authMode         : deviceCode
+  cliConfig        : {"output":"json","showHelpOnFailure":false}
+  cliEntraAppId    : 31359c7f-bd7e-475c-86db-fdb8c937548e
+  cliEntraAppTenant: common
+  cliEnvironment   :
+  cliVersion       : 6.1.0
+  nodeVersion      : v16.13.0
+  os               : {"platform":"win32","version":"Windows 10 Pro","release":"10.0.19045"}
+  roles            : []
+  scopes           : {"https://graph.microsoft.com":["AllSites.FullControl"]}
   ```
 
   </TabItem>
   <TabItem value="CSV">
 
   ```csv
-  os,cliVersion,nodeVersion,cliAadAppId,cliAadAppTenant,authMode,cliEnvironment,cliConfig,roles,scopes
-  "{""platform"":""win32"",""version"":""Windows 10 Pro"",""release"":""10.0.19045""}",6.1.0,v16.13.0,31359c7f-bd7e-475c-86db-fdb8c937548e,common,DeviceCode,,"{""output"":""json"",""showHelpOnFailure"":false}",[],"[""AllSites.FullControl""]"
+  os,cliVersion,nodeVersion,cliEntraAppId,cliEntraAppTenant,authMode,cliEnvironment,cliConfig,roles,scopes
+  "{""platform"":""win32"",""version"":""Windows 10 Pro"",""release"":""10.0.19045""}",6.1.0,v16.13.0,31359c7f-bd7e-475c-86db-fdb8c937548e,common,deviceCode,,"{""output"":""json"",""showHelpOnFailure"":false}",[],"{""https://graph.microsoft.com"":[""AllSites.FullControl""]}"
   ```
 
   </TabItem>
@@ -93,12 +95,11 @@ m365 cli doctor
   ---------|-------
   cliVersion | 6.1.0
   nodeVersion | v16.13.0
-  cliAadAppId | 31359c7f-bd7e-475c-86db-fdb8c937548e
-  cliAadAppTenant | common
-  authMode | DeviceCode
+  cliEntraAppId | 31359c7f-bd7e-475c-86db-fdb8c937548e
+  cliEntraAppTenant | common
+  authMode | deviceCode
   cliEnvironment |
   ```
 
   </TabItem>
 </Tabs>
-

package/docs/docs/cmd/entra/administrativeunit/administrativeunit-add.mdx

@@ -12,12 +12,6 @@ Creates a new administrative unit
 m365 entra administrativeunit add [options]
 ```
 
-## Alias
-
-```sh
-m365 aad administrativeunit add [options]
-```
-
 ## Options
 
 ```md definition-list

package/docs/docs/cmd/entra/administrativeunit/administrativeunit-get.mdx

@@ -12,12 +12,6 @@ Gets information about a specific administrative unit
 m365 entra administrativeunit get [options]
 ```
 
-## Alias
-
-```sh
-m365 aad administrativeunit get [options]
-```
-
 ## Options
 
 ```md definition-list

package/docs/docs/cmd/entra/administrativeunit/administrativeunit-list.mdx

@@ -12,12 +12,6 @@ Retrieves a list of administrative units
 m365 entra administrativeunit list [options]
 ```
 
-## Alias
-
-```sh
-m365 aad administrativeunit list [options]
-```
-
 ## Options
 
 <Global />