@pnp/cli-microsoft365 7.1.0-beta.aca68bd → 7.1.0-beta.d53f0d9

package/.devcontainer/Dockerfile

@@ -6,7 +6,6 @@ LABEL name="CLI for Microsoft 365 Development" \
   maintainers="Waldek Mastykarz <waldek@mastykarz.nl>, \
   Garry Trinder <garry.trinder@live.com>, \
   Albert-Jan Schot <appie@digiwijs.nl>, \
-  Rabia Williams <rabiawilliams@gmail.com>, \
   Patrick Lamber <patrick@nubo.eu>, \
   Arjun Menon <arjun.umenon@gmail.com>, \
   Adam Wojcik <adam.wojcik.it@gmail.com>, \

package/.eslintrc.cjs

@@ -136,6 +136,7 @@ module.exports = {
   "rules": {
     "cli-microsoft365/correct-command-class-name": ["error", sortedDictionary, capitalized],
     "cli-microsoft365/correct-command-name": "error",
+    "cli-microsoft365/no-by-server-relative-url-usage": "error",
     "indent": "off",
     "@typescript-eslint/indent": [
       "error",

package/Dockerfile

@@ -8,7 +8,6 @@ LABEL name="m365pnp/cli-microsoft365:${CLI_VERSION}" \
   maintainers="Waldek Mastykarz <waldek@mastykarz.nl>, \
   Garry Trinder <garry.trinder@live.com>, \
   Albert-Jan Schot <appie@digiwijs.nl>, \
-  Rabia Williams <rabiawilliams@gmail.com>, \
   Patrick Lamber <patrick@nubo.eu>, \
   Arjun Menon <arjun.umenon@gmail.com>, \
   Adam Wojcik <adam.wojcik.it@gmail.com>, \

package/dist/Auth.js

@@ -341,7 +341,7 @@ export class Auth {
         const cli = Cli.getInstance();
         cli.spinner.text = response.message;
         cli.spinner.spinner = {
-            frames: ['🌶️  ']
+            frames: ['🌶️']
         };
         // don't show spinner if running tests
         /* c8 ignore next 3 */

package/dist/appInsights.js

@@ -9,7 +9,6 @@ import fs from 'fs';
 import path from 'path';
 import url from 'url';
 import { app } from './utils/app.js';
-import { pid } from './utils/pid.js';
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
 const config = appInsights.setup('6b908c80-d09f-4cf6-8274-e54349a0149a');
 config.setInternalLogging(false, false);
@@ -18,17 +17,14 @@ config.setInternalLogging(false, false);
 // 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 : '';
-appInsights.default.defaultClient.commonProperties = {
+const appInsightsClient = appInsights.default.defaultClient;
+appInsightsClient.commonProperties = {
     version: version,
     node: process.version,
-    shell: pid.getProcessName(process.ppid) || '',
     env: env,
     ci: Boolean(process.env.CI).toString()
 };
-appInsights.default.defaultClient.context.tags['ai.session.id'] =
-    crypto.randomBytes(24).toString('base64');
-appInsights.default.defaultClient.context.tags['ai.cloud.roleInstance'] =
-    crypto.createHash('sha256').update(appInsights.default.defaultClient.context.tags['ai.cloud.roleInstance']).digest('hex');
-delete appInsights.default.defaultClient.context.tags['ai.cloud.role'];
-export default appInsights.default.defaultClient;
+appInsightsClient.context.tags['ai.cloud.roleInstance'] = crypto.createHash('sha256').update(appInsightsClient.context.tags['ai.cloud.roleInstance']).digest('hex');
+appInsightsClient.context.tags['ai.cloud.role'];
+export default appInsightsClient;
 //# sourceMappingURL=appInsights.js.map

package/dist/cli/Cli.js

@@ -31,11 +31,15 @@ export class Cli {
             return configuredValue;
         }
     }
-    // eslint-disable-next-line @typescript-eslint/no-empty-function
     constructor() {
         this.commands = [];
         this.commandsFolder = '';
-        this.spinner = ora('Running command...');
+        const options = {
+            text: 'Running command...',
+            /* c8 ignore next 1 */
+            stream: this.getSettingWithDefaultValue('errorOutput', 'stderr') === 'stderr' ? process.stderr : process.stdout
+        };
+        this.spinner = ora(options);
     }
     static getInstance() {
         if (!Cli.instance) {

package/dist/m365/spo/commands/app/app-deploy.js

@@ -43,7 +43,7 @@ class SpoAppDeployCommand extends SpoAppBaseCommand {
                     await logger.logToStderr(`Looking up app id for app named ${args.options.name}...`);
                 }
                 const requestOptions = {
-                    url: `${appCatalogUrl}/_api/web/getfolderbyserverrelativeurl('AppCatalog')/files('${args.options.name}')?$select=UniqueId`,
+                    url: `${appCatalogUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='AppCatalog')/files('${args.options.name}')?$select=UniqueId`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },

package/dist/m365/spo/commands/app/app-get.js

@@ -39,7 +39,7 @@ class SpoAppGetCommand extends SpoAppBaseCommand {
                     await logger.logToStderr(`Looking up app id for app named ${args.options.name}...`);
                 }
                 const requestOptions = {
-                    url: `${appCatalogSiteUrl}/_api/web/getfolderbyserverrelativeurl('AppCatalog')/files('${args.options.name}')?$select=UniqueId`,
+                    url: `${appCatalogSiteUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='AppCatalog')/files('${args.options.name}')?$select=UniqueId`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },

package/dist/m365/spo/commands/app/app-teamspackage-download.js

@@ -88,7 +88,7 @@ class SpoAppTeamsPackageDownloadCommand extends SpoAppBaseCommand {
             url += `GetList('${serverRelativeAppCatalogListUrl}')/GetItemById(${args.options.appItemId})?$expand=File&$select=File/Name`;
         }
         else if (args.options.appName) {
-            url += `getfolderbyserverrelativeurl('${appCatalogListName}')/files('${formatting.encodeQueryParameter(args.options.appName)}')/ListItemAllFields?$select=Id`;
+            url += `GetFolderByServerRelativePath(DecodedUrl='${appCatalogListName}')/files('${formatting.encodeQueryParameter(args.options.appName)}')/ListItemAllFields?$select=Id`;
         }
         const requestOptions = {
             url,

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

@@ -38,7 +38,7 @@ class SpoAppPageAddCommand extends SpoCommand {
             const page = await request.post(createPageRequestOptions);
             const pageUrl = page.value;
             let requestOptions = {
-                url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/${pageUrl}')?$expand=ListItemAllFields`,
+                url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/${pageUrl}')?$expand=ListItemAllFields`,
                 headers: {
                     'content-type': 'application/json;charset=utf-8',
                     accept: 'application/json;odata=nometadata'

package/dist/m365/spo/commands/feature/feature-disable.js

@@ -5,6 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFeatureDisableCommand_instances, _SpoFeatureDisableCommand_initTelemetry, _SpoFeatureDisableCommand_initOptions, _SpoFeatureDisableCommand_initValidators, _SpoFeatureDisableCommand_initTypes;
 import request from "../../../../request.js";
+import { validation } from '../../../../utils/validation.js';
 import SpoCommand from "../../../base/SpoCommand.js";
 import commands from "../../commands.js";
 class SpoFeatureDisableCommand extends SpoCommand {
@@ -24,13 +25,10 @@ class SpoFeatureDisableCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         let scope = args.options.scope;
-        let force = args.options.force;
+        const force = !!args.options.force;
         if (!scope) {
             scope = "web";
         }
-        if (!force) {
-            force = false;
-        }
         if (this.verbose) {
             await logger.logToStderr(`Disabling feature '${args.options.id}' on scope '${scope}' for url '${args.options.webUrl}' (force='${force}')...`);
         }
@@ -39,7 +37,8 @@ class SpoFeatureDisableCommand extends SpoCommand {
             url: url,
             headers: {
                 accept: 'application/json;odata=nometadata'
-            }
+            },
+            responseType: 'json'
         };
         try {
             await request.post(requestOptions);
@@ -69,9 +68,12 @@ _SpoFeatureDisableCommand_instances = new WeakSet(), _SpoFeatureDisableCommand_i
     });
 }, _SpoFeatureDisableCommand_initValidators = function _SpoFeatureDisableCommand_initValidators() {
     this.validators.push(async (args) => {
+        if (!validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID for option id.`;
+        }
         if (args.options.scope) {
             if (['site', 'web'].indexOf(args.options.scope.toLowerCase()) < 0) {
-                return `${args.options.scope} is not a valid Feature scope. Allowed values are Site|Web`;
+                return `${args.options.scope} is not a valid Feature scope. Allowed values are: Site, Web.`;
             }
         }
         return true;

package/dist/m365/spo/commands/feature/feature-enable.js

@@ -25,13 +25,10 @@ class SpoFeatureEnableCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         let scope = args.options.scope;
-        let force = args.options.force;
+        const force = !!args.options.force;
         if (!scope) {
             scope = "web";
         }
-        if (!force) {
-            force = false;
-        }
         if (this.verbose) {
             await logger.logToStderr(`Enabling feature '${args.options.id}' on scope '${scope}' for url '${args.options.webUrl}' (force='${force}')...`);
         }
@@ -40,7 +37,8 @@ class SpoFeatureEnableCommand extends SpoCommand {
             url: url,
             headers: {
                 accept: 'application/json;odata=nometadata'
-            }
+            },
+            responseType: 'json'
         };
         try {
             await request.post(requestOptions);
@@ -70,6 +68,9 @@ _SpoFeatureEnableCommand_instances = new WeakSet(), _SpoFeatureEnableCommand_ini
     });
 }, _SpoFeatureEnableCommand_initValidators = function _SpoFeatureEnableCommand_initValidators() {
     this.validators.push(async (args) => {
+        if (!validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID for option id.`;
+        }
         if (args.options.scope) {
             if (['site', 'web'].indexOf(args.options.scope.toLowerCase()) < 0) {
                 return `${args.options.scope} is not a valid Feature scope. Allowed values are Site|Web`;

package/dist/m365/spo/commands/page/Page.js

@@ -12,7 +12,7 @@ export class Page {
         }
         const pageName = this.getPageNameWithExtension(name);
         const requestOptions = {
-            url: `${webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil.getServerRelativeSiteUrl(webUrl)}/SitePages/${formatting.encodeQueryParameter(pageName)}')?$expand=ListItemAllFields/ClientSideApplicationId`,
+            url: `${webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${urlUtil.getServerRelativeSiteUrl(webUrl)}/SitePages/${formatting.encodeQueryParameter(pageName)}')?$expand=ListItemAllFields/ClientSideApplicationId`,
             headers: {
                 'content-type': 'application/json;charset=utf-8',
                 accept: 'application/json;odata=nometadata'

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

@@ -52,7 +52,7 @@ class SpoPageAddCommand extends SpoCommand {
             const reqDigest = await spo.getRequestDigest(args.options.webUrl);
             requestDigest = reqDigest.FormDigestValue;
             let requestOptions = {
-                url: `${args.options.webUrl}/_api/web/getfolderbyserverrelativeurl('${serverRelativeSiteUrl}/sitepages')/files/AddTemplateFile`,
+                url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${serverRelativeSiteUrl}/sitepages')/files/AddTemplateFile`,
                 headers: {
                     'X-RequestDigest': requestDigest,
                     'content-type': 'application/json;odata=nometadata',

package/dist/m365/spo/commands/page/page-get.js

@@ -36,7 +36,7 @@ class SpoPageGetCommand extends SpoCommand {
         }
         try {
             let requestOptions = {
-                url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/SitePages/${formatting.encodeQueryParameter(pageName)}')?$expand=ListItemAllFields/ClientSideApplicationId,ListItemAllFields/PageLayoutType,ListItemAllFields/CommentsDisabled`,
+                url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/SitePages/${formatting.encodeQueryParameter(pageName)}')?$expand=ListItemAllFields/ClientSideApplicationId,ListItemAllFields/PageLayoutType,ListItemAllFields/CommentsDisabled`,
                 headers: {
                     'content-type': 'application/json;charset=utf-8',
                     accept: 'application/json;odata=nometadata'

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

@@ -300,7 +300,7 @@ class SpoPageHeaderSetCommand extends SpoCommand {
             await logger.logToStderr(`Retrieving information about the header image...`);
         }
         const requestOptions = {
-            url: `${siteUrl}/_api/web/getfilebyserverrelativeurl('${formatting.encodeQueryParameter(imageUrl)}')?$select=ListId,UniqueId`,
+            url: `${siteUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(imageUrl)}')?$select=ListId,UniqueId`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },

package/dist/m365/spo/commands/page/page-remove.js

@@ -54,7 +54,7 @@ class SpoPageRemoveCommand extends SpoCommand {
             }
             const requestOptions = {
                 url: `${args.options
-                    .webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')`,
+                    .webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')`,
                 headers: {
                     'X-RequestDigest': requestDigest,
                     'X-HTTP-Method': 'DELETE',

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

@@ -199,7 +199,7 @@ class SpoPageSetCommand extends SpoCommand {
             }
             if (typeof args.options.commentsEnabled !== 'undefined') {
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${serverRelativeFileUrl}')/ListItemAllFields/SetCommentsDisabled(${args.options.commentsEnabled === false})`,
+                    url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${serverRelativeFileUrl}')/ListItemAllFields/SetCommentsDisabled(${args.options.commentsEnabled === false})`,
                     headers: {
                         'X-RequestDigest': requestDigest,
                         'content-type': 'application/json;odata=nometadata',
@@ -239,7 +239,7 @@ class SpoPageSetCommand extends SpoCommand {
             }
             else {
                 requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${serverRelativeFileUrl}')/CheckIn(comment=@a1,checkintype=@a2)?@a1='${formatting.encodeQueryParameter(args.options.publishMessage || '')}'&@a2=1`,
+                    url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${serverRelativeFileUrl}')/CheckIn(comment=@a1,checkintype=@a2)?@a1='${formatting.encodeQueryParameter(args.options.publishMessage || '')}'&@a2=1`,
                     headers: {
                         'X-RequestDigest': requestDigest,
                         'content-type': 'application/json;odata=nometadata',

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

@@ -79,7 +79,7 @@ class SpoPageTextAddCommand extends SpoCommand {
         }
         const requestOptions = {
             url: `${args.options
-                .webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')/ListItemAllFields`,
+                .webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')/ListItemAllFields`,
             headers: {
                 'X-RequestDigest': requestDigest,
                 'content-type': 'application/json;odata=nometadata',

package/dist/m365/spo/commands/user/user-get.js

@@ -38,6 +38,9 @@ class SpoUserGetCommand extends SpoCommand {
         else if (args.options.loginName) {
             requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByLoginName('${formatting.encodeQueryParameter(args.options.loginName)}')`;
         }
+        else {
+            requestUrl = `${args.options.webUrl}/_api/web/currentuser`;
+        }
         const requestOptions = {
             url: requestUrl,
             method: 'GET',
@@ -82,7 +85,10 @@ _SpoUserGetCommand_instances = new WeakSet(), _SpoUserGetCommand_initTelemetry =
         return validation.isValidSharePointUrl(args.options.webUrl);
     });
 }, _SpoUserGetCommand_initOptionSets = function _SpoUserGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'email', 'loginName'] });
+    this.optionSets.push({
+        options: ['id', 'email', 'loginName'],
+        runsWhen: (args) => args.options.id || args.options.loginName || args.options.email
+    });
 };
 export default new SpoUserGetCommand();
 //# sourceMappingURL=user-get.js.map

package/dist/telemetry.js

@@ -1,26 +1,42 @@
-import appInsights from "./appInsights.js";
-import { Cli } from "./cli/Cli.js";
-import { settingsNames } from "./settingsNames.js";
-class Telemetry {
-    trackEvent(commandName, properties) {
+import child_process from 'child_process';
+import path from 'path';
+import url from 'url';
+import { Cli } from './cli/Cli.js';
+import { settingsNames } from './settingsNames.js';
+import { pid } from './utils/pid.js';
+import { session } from './utils/session.js';
+const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
+function trackTelemetry(object) {
+    try {
+        const child = child_process.spawn('node', [path.join(__dirname, 'telemetryRunner.js')], {
+            stdio: ['pipe', 'ignore', 'ignore'],
+            detached: true
+        });
+        child.unref();
+        object.shell = pid.getProcessName(process.ppid) || '';
+        object.session = session.getId(process.ppid);
+        child.stdin.write(JSON.stringify(object));
+        child.stdin.end();
+    }
+    catch { }
+}
+export const telemetry = {
+    trackEvent: (commandName, properties) => {
         if (Cli.getInstance().getSettingWithDefaultValue(settingsNames.disableTelemetry, false)) {
             return;
         }
-        appInsights.trackEvent({
-            name: commandName,
+        trackTelemetry({
+            commandName,
             properties
         });
-        appInsights.flush();
-    }
-    trackException(exception) {
+    },
+    trackException: (exception) => {
         if (Cli.getInstance().getSettingWithDefaultValue(settingsNames.disableTelemetry, false)) {
             return;
         }
-        appInsights.trackException({
+        trackTelemetry({
             exception
         });
-        appInsights.flush();
     }
-}
-export const telemetry = new Telemetry();
+};
 //# sourceMappingURL=telemetry.js.map

package/dist/telemetryRunner.js

@@ -0,0 +1,26 @@
+import appInsights from './appInsights.js';
+import * as process from 'process';
+import * as fs from 'fs';
+process.stdin.setEncoding('utf8');
+try {
+    // read from stdin
+    const input = fs.readFileSync(0, 'utf-8');
+    const data = JSON.parse(input);
+    const { commandName, properties, exception, shell, session } = data;
+    appInsights.commonProperties.shell = shell;
+    appInsights.context.tags['ai.session.id'] = session;
+    if (exception) {
+        appInsights.trackException({
+            exception
+        });
+    }
+    else {
+        appInsights.trackEvent({
+            name: commandName,
+            properties
+        });
+    }
+    appInsights.flush();
+}
+catch { }
+//# sourceMappingURL=telemetryRunner.js.map

package/docs/docs/cmd/aad/license/license-list.mdx

@@ -18,7 +18,7 @@ m365 aad license list [options]
 
 ## Examples
 
-List all licenses within the tenant
+List all licenses within the tenant.
 
 ```sh
 m365 aad license list
@@ -32,24 +32,30 @@ m365 aad license list
   ```json
   [
     {
+      "accountName": "contoso",
+      "accountId": "a9b44919-790b-4843-9b45-1923b8c3d61f",
+      "appliesTo": "User",
       "capabilityStatus": "Enabled",
       "consumedUnits": 1,
       "id": "48a80680-7326-48cd-9935-b556b81d3a4e_c7df2760-2c81-4ef7-b578-5b5392b571df",
       "skuId": "c7df2760-2c81-4ef7-b578-5b5392b571df",
-      "skuPartNumber": "ENTERPRISEPREMIUM",
-      "appliesTo": "User",
+      "skuPartNumber": "ENTERPRISEPREMIUM",      
+      "subscriptionIds": [
+        "b079cd48-7a9e-4d8b-af82-60f3adefe53b"
+      ],
       "prepaidUnits": {
         "enabled": 10000,
         "suspended": 0,
-        "warning": 0
+        "warning": 0,
+        "lockedOut": 0
       },
       "servicePlans": [
-          {
-              "servicePlanId": "8c098270-9dd4-4350-9b30-ba4703f3b36b",
-              "servicePlanName": "ADALLOM_S_O365",
-              "provisioningStatus": "Success",
-              "appliesTo": "User"
-          }
+        {
+          "servicePlanId": "8c098270-9dd4-4350-9b30-ba4703f3b36b",
+          "servicePlanName": "ADALLOM_S_O365",
+          "provisioningStatus": "Success",
+          "appliesTo": "User"
+        }
       ]
     }
   ]
@@ -68,8 +74,8 @@ m365 aad license list
   <TabItem value="CSV">
 
   ```csv
-  id,skuId,skuPartNumber
-  48a80680-7326-48cd-9935-b556b81d3a4e_c7df2760-2c81-4ef7-b578-5b5392b571df,c7df2760-2c81-4ef7-b578-5b5392b571df,ENTERPRISEPREMIUM
+  accountName,accountId,appliesTo,capabilityStatus,consumedUnits,id,skuId,skuPartNumber
+  contoso,a9b44919-790b-4843-9b45-1923b8c3d61f,User,Enabled,1,48a80680-7326-48cd-9935-b556b81d3a4e_c7df2760-2c81-4ef7-b578-5b5392b571df,c7df2760-2c81-4ef7-b578-5b5392b571df,ENTERPRISEPREMIUM
   ```
 
   </TabItem>
@@ -84,16 +90,15 @@ m365 aad license list
 
   Property | Value
   ---------|-------
+  accountName | contoso
+  accountId | a9b44919-790b-4843-9b45-1923b8c3d61f
+  appliesTo | User
   capabilityStatus | Enabled
   consumedUnits | 1
   id | 48a80680-7326-48cd-9935-b556b81d3a4e_c7df2760-2c81-4ef7-b578-5b5392b571df
   skuId | c7df2760-2c81-4ef7-b578-5b5392b571df
   skuPartNumber | ENTERPRISEPREMIUM
-  appliesTo | User
-  prepaidUnits | {"enabled":10000,"suspended":0,"warning":0}
-  servicePlans | [{"servicePlanId":"8c098270-9dd4-4350-9b30-ba4703f3b36b","servicePlanName": "ADALLOM_S_O365","provisioningStatus": "Success","appliesTo": "User"}]
   ```
 
   </TabItem>
 </Tabs>
-

package/docs/docs/cmd/aad/m365group/m365group-add.mdx

@@ -31,7 +31,7 @@ m365 aad m365group add [options]
 : Comma-separated list of Microsoft 365 Group members
 
 `--visibility [visibility]`
-: Specifies the group join policy and group content visibility for groups. Possible values are: `Private`, `Public`, or `HiddenMembership`. Defaults to `Public`.
+: Specifies the group join policy and group content visibility for groups. Allowed values: `Private`, `Public`, or `HiddenMembership`. Defaults to `Public`.
 
 `--allowMembersToPost [allowMembersToPost]`
 : Set if only group members should be able to post conversations to the group

package/docs/docs/cmd/aad/user/user-add.mdx

@@ -22,7 +22,7 @@ m365 aad user add [options]
 : The user principal name (someuser@contoso.com).
 
 `--accountEnabled [accountEnabled]`
-: Whether the account is enabled. Possible values: `true`, `false`. Default value is `true`.
+: Whether the account is enabled. Allowed values: `true`, `false`. Defaults to `true`.
 
 `--mailNickname [mailNickname]`
 : The mail alias for the user. By default this value will be extracted from `userName`.
@@ -73,7 +73,7 @@ m365 aad user add [options]
 
 :::info
 
-To use this command you must be a Global administrator, User administrator or Privileged Authentication administrator
+To use this command you must be a Global administrator, User administrator or Privileged Authentication administrator.
 
 :::
 
@@ -174,7 +174,6 @@ m365 aad user add --displayName "John Doe" --userName "john.doe@contoso.com" --m
   Property | Value
   ---------|-------
   id | 990e2425-f595-43bc-85ed-b89a44093793
-  businessPhones | []
   displayName | John Doe
   givenName | John
   jobTitle | Sales Manager
@@ -189,4 +188,3 @@ m365 aad user add --displayName "John Doe" --userName "john.doe@contoso.com" --m
 
   </TabItem>
 </Tabs>
-

package/docs/docs/cmd/aad/user/user-license-add.mdx

@@ -37,13 +37,13 @@ The user must have a `usageLocation` value in order to assign a license to it.
 
 ## Examples
 
-Assign specific licenses to a specific user by UPN
+Assign specific licenses to a specific user by UPN.
 
 ```sh
 m365 aad user license add --userName "john.doe@contoso.com" --ids "45715bb8-13f9-4bf6-927f-ef96c102d394,bea13e0c-3828-4daa-a392-28af7ff61a0f"
 ```
 
-Assign specific licenses from a specific user by ID
+Assign specific licenses from a specific user by ID.
 
 ```sh
 m365 aad user license add --userId "5c241023-2ba5-4ea8-a516-a2481a3e6c51" --ids "45715bb8-13f9-4bf6-927f-ef96c102d394,bea13e0c-3828-4daa-a392-28af7ff61a0f"
@@ -107,7 +107,6 @@ m365 aad user license add --userId "5c241023-2ba5-4ea8-a516-a2481a3e6c51" --ids
 
   Property | Value
   ---------|-------
-  businessPhones | []
   displayName | John Doe
   givenName | null
   jobTitle | null
@@ -122,4 +121,3 @@ m365 aad user license add --userId "5c241023-2ba5-4ea8-a516-a2481a3e6c51" --ids
 
   </TabItem>
 </Tabs>
-

package/docs/docs/cmd/aad/user/user-license-list.mdx

@@ -79,9 +79,9 @@ m365 aad user license list --userId 59f80e08-24b1-41f8-8586-16765fd830d3
   <TabItem value="Text">
 
   ```text
-  id           : x4s03usaBkSMs5fbAhyttK6cK8RP6rdKlxeBV2I1zKw
-  skuId        : c42b9cae-ea4f-4ab7-9717-81576235ccac
-  skuPartNumber: DEVELOPERPACK_E5
+  id                                           skuId                                 skuPartNumber
+  -------------------------------------------  ------------------------------------  -----------------------------------------
+  x4s03usaBkSMs5fbAhyttK6cK8RP6rdKlxeBV2I1zKw  c42b9cae-ea4f-4ab7-9717-81576235ccac  DEVELOPERPACK_E5
   ```
 
   </TabItem>
@@ -107,9 +107,7 @@ m365 aad user license list --userId 59f80e08-24b1-41f8-8586-16765fd830d3
   id | x4s03usaBkSMs5fbAhyttK6cK8RP6rdKlxeBV2I1zKw
   skuId | c42b9cae-ea4f-4ab7-9717-81576235ccac
   skuPartNumber | DEVELOPERPACK\_E5
-  servicePlans | [{"servicePlanId":"7547a3fe-08ee-4ccb-b430-5077c5041653","servicePlanName":"YAMMER\_ENTERPRISE","provisioningStatus":"Success","appliesTo":"User"}]
   ```
 
   </TabItem>
 </Tabs>
-

package/docs/docs/cmd/aad/user/user-recyclebinitem-list.mdx

@@ -18,7 +18,7 @@ m365 aad user recyclebinitem list [options]
 
 ## Examples
 
-List all removed users
+List all removed users.
 
 ```sh
 m365 aad user recyclebinitem list
@@ -76,7 +76,6 @@ m365 aad user recyclebinitem list
 
   Property | Value
   ---------|-------
-  businessPhones | []
   displayName | John Doe
   givenName | John Doe
   jobTitle | Developer
@@ -91,4 +90,3 @@ m365 aad user recyclebinitem list
 
   </TabItem>
 </Tabs>
-

package/docs/docs/cmd/aad/user/user-recyclebinitem-restore.mdx

@@ -37,7 +37,7 @@ After running this command, it may take a minute before the user will reappear i
 
 ## Examples
 
-Restore user from the recycle bin
+Restore user from the recycle bin.
 
 ```sh
 m365 aad user recyclebinitem restore --id 990e2425-f595-43bc-85ed-b89a44093793
@@ -102,7 +102,6 @@ m365 aad user recyclebinitem restore --id 990e2425-f595-43bc-85ed-b89a44093793
   Property | Value
   ---------|-------
   id | 990e2425-f595-43bc-85ed-b89a44093793
-  businessPhones | []
   displayName | John Doe
   givenName | John
   jobTitle | Sales Manager
@@ -116,4 +115,3 @@ m365 aad user recyclebinitem restore --id 990e2425-f595-43bc-85ed-b89a44093793
 
   </TabItem>
 </Tabs>
-