@pnp/cli-microsoft365 7.0.0-beta.68fea7b → 7.0.0-beta.86298a0

package/dist/m365/spo/commands/tenant/tenant-commandset-set.js

@@ -13,15 +13,19 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _SpoTenantCommandSetSetCommand_instances, _SpoTenantCommandSetSetCommand_initTelemetry, _SpoTenantCommandSetSetCommand_initOptions, _SpoTenantCommandSetSetCommand_initValidators;
+var _SpoTenantCommandSetSetCommand_instances, _SpoTenantCommandSetSetCommand_initTelemetry, _SpoTenantCommandSetSetCommand_initOptions, _SpoTenantCommandSetSetCommand_initValidators, _SpoTenantCommandSetSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
+const os = require("os");
 const urlUtil_1 = require("../../../../utils/urlUtil");
+const Cli_1 = require("../../../../cli/Cli");
+const spoListItemListCommand = require("../listitem/listitem-list");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
+const odata_1 = require("../../../../utils/odata");
 class SpoTenantCommandSetSetCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.TENANT_COMMANDSET_SET;
@@ -35,6 +39,7 @@ class SpoTenantCommandSetSetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoTenantCommandSetSetCommand_instances, "m", _SpoTenantCommandSetSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoTenantCommandSetSetCommand_instances, "m", _SpoTenantCommandSetSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoTenantCommandSetSetCommand_instances, "m", _SpoTenantCommandSetSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTenantCommandSetSetCommand_instances, "m", _SpoTenantCommandSetSetCommand_initOptionSets).call(this);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -43,34 +48,97 @@ class SpoTenantCommandSetSetCommand extends SpoCommand_1.default {
                 if (!appCatalogUrl) {
                     throw 'No app catalog URL found';
                 }
-                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(appCatalogUrl, '/lists/TenantWideExtensions');
-                const listItem = yield this.getListItemById(logger, appCatalogUrl, listServerRelativeUrl, args.options.id);
-                if (listItem.TenantWideExtensionLocation.indexOf("ClientSideExtension.ListViewCommandSet") === -1) {
-                    throw 'The item is not a ListViewCommandSet';
+                if (args.options.newClientSideComponentId !== undefined) {
+                    const componentManifest = yield this.getComponentManifest(appCatalogUrl, args.options.newClientSideComponentId, logger);
+                    const clientComponentManifest = JSON.parse(componentManifest.ClientComponentManifest);
+                    if (clientComponentManifest.extensionType !== "ListViewCommandSet") {
+                        throw `The extension type of this component is not of type 'ListViewCommandSet' but of type '${clientComponentManifest.extensionType}'`;
+                    }
+                    const solution = yield this.getSolutionFromAppCatalog(appCatalogUrl, componentManifest.SolutionId, logger);
+                    if (!solution.ContainsTenantWideExtension) {
+                        throw `The solution does not contain an extension that can be deployed to all sites. Make sure that you've entered the correct component Id.`;
+                    }
+                    else if (!solution.SkipFeatureDeployment) {
+                        throw 'The solution has not been deployed to all sites. Make sure to deploy this solution to all sites.';
+                    }
                 }
-                yield this.updateTenantWideExtension(appCatalogUrl, args.options, listServerRelativeUrl, logger);
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(appCatalogUrl, '/lists/TenantWideExtensions');
+                const listItemId = yield this.getListItemId(appCatalogUrl, args.options, listServerRelativeUrl, logger);
+                yield this.updateTenantWideExtension(logger, appCatalogUrl, args.options, listServerRelativeUrl, listItemId);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
             }
         });
     }
-    getListItemById(logger, webUrl, listServerRelativeUrl, id) {
+    getComponentManifest(appCatalogUrl, clientSideComponentId, logger) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Getting the list item by id ${id}`);
+                logger.logToStderr('Retrieving component manifest item from the ComponentManifests list on the app catalog site so that we get the solution id');
             }
-            const reqOptions = {
-                url: `${webUrl}/_api/web/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/Items(${id})`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
+            const camlQuery = `<View><ViewFields><FieldRef Name='ClientComponentId'></FieldRef><FieldRef Name='SolutionId'></FieldRef><FieldRef Name='ClientComponentManifest'></FieldRef></ViewFields><Query><Where><Eq><FieldRef Name='ClientComponentId' /><Value Type='Guid'>${clientSideComponentId}</Value></Eq></Where></Query></View>`;
+            const commandOptions = {
+                webUrl: appCatalogUrl,
+                listUrl: `${urlUtil_1.urlUtil.getServerRelativeSiteUrl(appCatalogUrl)}/Lists/ComponentManifests`,
+                camlQuery: camlQuery,
+                verbose: this.verbose,
+                debug: this.debug,
+                output: 'json'
             };
-            return yield request_1.default.get(reqOptions);
+            const output = yield Cli_1.Cli.executeCommandWithOutput(spoListItemListCommand, { options: Object.assign(Object.assign({}, commandOptions), { _: [] }) });
+            if (this.verbose) {
+                logger.logToStderr(output.stderr);
+            }
+            const outputParsed = JSON.parse(output.stdout);
+            if (outputParsed.length === 0) {
+                throw 'No component found with the specified clientSideComponentId found in the component manifest list. Make sure that the application is added to the application catalog';
+            }
+            return outputParsed[0];
         });
     }
-    updateTenantWideExtension(appCatalogUrl, options, listServerRelativeUrl, logger) {
+    getSolutionFromAppCatalog(appCatalogUrl, solutionId, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving solution with id ${solutionId} from the application catalog`);
+            }
+            const camlQuery = `<View><ViewFields><FieldRef Name='SkipFeatureDeployment'></FieldRef><FieldRef Name='ContainsTenantWideExtension'></FieldRef></ViewFields><Query><Where><Eq><FieldRef Name='AppProductID' /><Value Type='Guid'>${solutionId}</Value></Eq></Where></Query></View>`;
+            const commandOptions = {
+                webUrl: appCatalogUrl,
+                listUrl: `${urlUtil_1.urlUtil.getServerRelativeSiteUrl(appCatalogUrl)}/AppCatalog`,
+                camlQuery: camlQuery,
+                verbose: this.verbose,
+                debug: this.debug,
+                output: 'json'
+            };
+            const output = yield Cli_1.Cli.executeCommandWithOutput(spoListItemListCommand, { options: Object.assign(Object.assign({}, commandOptions), { _: [] }) });
+            if (this.verbose) {
+                logger.logToStderr(output.stderr);
+            }
+            const outputParsed = JSON.parse(output.stdout);
+            if (outputParsed.length === 0) {
+                throw `No component found with the solution id ${solutionId}. Make sure that the solution is available in the app catalog`;
+            }
+            return outputParsed[0];
+        });
+    }
+    getListItemId(appCatalogUrl, options, listServerRelativeUrl, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { title, id, clientSideComponentId } = options;
+            const filter = title ? `Title eq '${title}'` : id ? `Id eq '${id}'` : `TenantWideExtensionComponentId eq '${clientSideComponentId}'`;
+            if (this.verbose) {
+                logger.logToStderr(`Getting tenant-wide listview commandset: "${title || id || clientSideComponentId}"...`);
+            }
+            const listItemInstances = yield odata_1.odata.getAllItems(`${appCatalogUrl}/_api/web/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/Items?$filter=startswith(TenantWideExtensionLocation, 'ClientSideExtension.ListViewCommandSet') and ${filter}`);
+            if (!listItemInstances || listItemInstances.length === 0) {
+                throw 'The specified listview commandset was not found';
+            }
+            if (listItemInstances.length > 1) {
+                throw `Multiple listview commandsets with ${title ? `title '${title}'` : `ClientSideComponentId '${clientSideComponentId}'`} found. Please disambiguate using IDs: ${os.EOL}${listItemInstances.map(item => `- ${item.Id}`).join(os.EOL)}`;
+            }
+            return listItemInstances[0].Id;
+        });
+    }
+    updateTenantWideExtension(logger, appCatalogUrl, options, listServerRelativeUrl, listItemId) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
                 logger.logToStderr('Updating tenant wide extension to the TenantWideExtensions list');
@@ -82,10 +150,10 @@ class SpoTenantCommandSetSetCommand extends SpoCommand_1.default {
                     FieldValue: options.newTitle
                 });
             }
-            if (options.clientSideComponentId !== undefined) {
+            if (options.newClientSideComponentId !== undefined) {
                 formValues.push({
                     FieldName: 'TenantWideExtensionComponentId',
-                    FieldValue: options.clientSideComponentId
+                    FieldValue: options.newClientSideComponentId
                 });
             }
             if (options.location !== undefined) {
@@ -113,7 +181,7 @@ class SpoTenantCommandSetSetCommand extends SpoCommand_1.default {
                 });
             }
             const requestOptions = {
-                url: `${appCatalogUrl}/_api/web/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/Items(${options.id})/ValidateUpdateListItem()`,
+                url: `${appCatalogUrl}/_api/web/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/Items(${listItemId})/ValidateUpdateListItem()`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
@@ -149,9 +217,12 @@ class SpoTenantCommandSetSetCommand extends SpoCommand_1.default {
 _SpoTenantCommandSetSetCommand_instances = new WeakSet(), _SpoTenantCommandSetSetCommand_initTelemetry = function _SpoTenantCommandSetSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            title: typeof args.options.title !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
             newTitle: typeof args.options.newTitle !== 'undefined',
             listType: args.options.listType,
-            clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
+            newClientSideComponentId: typeof args.options.newClientSideComponentId !== 'undefined',
             clientSideComponentProperties: typeof args.options.clientSideComponentProperties !== 'undefined',
             webTemplate: typeof args.options.webTemplate !== 'undefined',
             location: args.options.location
@@ -159,14 +230,18 @@ _SpoTenantCommandSetSetCommand_instances = new WeakSet(), _SpoTenantCommandSetSe
     });
 }, _SpoTenantCommandSetSetCommand_initOptions = function _SpoTenantCommandSetSetCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-i, --id [id]'
+    }, {
+        option: '-t, --title [title]'
+    }, {
+        option: '-c, --clientSideComponentId [clientSideComponentId]'
     }, {
-        option: '-t, --newTitle [newTitle]'
+        option: '--newTitle [newTitle]'
     }, {
         option: '-l, --listType [listType]',
         autocomplete: SpoTenantCommandSetSetCommand.listTypes
     }, {
-        option: '-c, --clientSideComponentId [clientSideComponentId]'
+        option: '--newClientSideComponentId [newClientSideComponentId]'
     }, {
         option: '-p, --clientSideComponentProperties [clientSideComponentProperties]'
     }, {
@@ -179,15 +254,21 @@ _SpoTenantCommandSetSetCommand_instances = new WeakSet(), _SpoTenantCommandSetSe
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (!args.options.newTitle &&
             !args.options.listType &&
-            !args.options.clientSideComponentId &&
+            !args.options.newClientSideComponentId &&
             !args.options.clientSideComponentProperties &&
             !args.options.webTemplate &&
             !args.options.location) {
             return 'Specify at least one property to update';
         }
+        if (args.options.id && isNaN(parseInt(args.options.id))) {
+            return `${args.options.id} is not a number`;
+        }
         if (args.options.clientSideComponentId && !validation_1.validation.isValidGuid(args.options.clientSideComponentId)) {
             return `${args.options.clientSideComponentId} is not a valid GUID`;
         }
+        if (args.options.newClientSideComponentId && !validation_1.validation.isValidGuid(args.options.newClientSideComponentId)) {
+            return `${args.options.newClientSideComponentId} is not a valid GUID`;
+        }
         if (args.options.listType && SpoTenantCommandSetSetCommand.listTypes.indexOf(args.options.listType) < 0) {
             return `${args.options.listType} is not a valid list type. Allowed values are ${SpoTenantCommandSetSetCommand.listTypes.join(', ')}`;
         }
@@ -196,6 +277,8 @@ _SpoTenantCommandSetSetCommand_instances = new WeakSet(), _SpoTenantCommandSetSe
         }
         return true;
     }));
+}, _SpoTenantCommandSetSetCommand_initOptionSets = function _SpoTenantCommandSetSetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['title', 'id', 'clientSideComponentId'] });
 };
 SpoTenantCommandSetSetCommand.listTypes = ['List', 'Library', 'SitePages'];
 SpoTenantCommandSetSetCommand.locations = ['ContextMenu', 'CommandBar', 'Both'];

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

@@ -47,8 +47,8 @@ class SpoUserGetCommand extends SpoCommand_1.default {
             else if (args.options.email) {
                 requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByEmail('${formatting_1.formatting.encodeQueryParameter(args.options.email)}')`;
             }
-            else if (args.options.loginName) {
-                requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByLoginName('${formatting_1.formatting.encodeQueryParameter(args.options.loginName)}')`;
+            else if (args.options.userName) {
+                requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByLoginName('${formatting_1.formatting.encodeQueryParameter(args.options.userName)}')`;
             }
             const requestOptions = {
                 url: requestUrl,
@@ -73,7 +73,7 @@ _SpoUserGetCommand_instances = new WeakSet(), _SpoUserGetCommand_initTelemetry =
         Object.assign(this.telemetryProperties, {
             id: (!(!args.options.id)).toString(),
             email: (!(!args.options.email)).toString(),
-            loginName: (!(!args.options.loginName)).toString()
+            userName: (!(!args.options.userName)).toString()
         });
     });
 }, _SpoUserGetCommand_initOptions = function _SpoUserGetCommand_initOptions() {
@@ -84,7 +84,7 @@ _SpoUserGetCommand_instances = new WeakSet(), _SpoUserGetCommand_initTelemetry =
     }, {
         option: '--email [email]'
     }, {
-        option: '--loginName [loginName]'
+        option: '--userName [userName]'
     });
 }, _SpoUserGetCommand_initValidators = function _SpoUserGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -95,7 +95,7 @@ _SpoUserGetCommand_instances = new WeakSet(), _SpoUserGetCommand_initTelemetry =
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoUserGetCommand_initOptionSets = function _SpoUserGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'email', 'loginName'] });
+    this.optionSets.push({ options: ['id', 'email', 'userName'] });
 };
 module.exports = new SpoUserGetCommand();
 //# sourceMappingURL=user-get.js.map

package/dist/m365/spo/commands.js

@@ -132,8 +132,6 @@ exports.default = {
     LIST_CONTENTTYPE_REMOVE: `${prefix} list contenttype remove`,
     LIST_CONTENTTYPE_DEFAULT_SET: `${prefix} list contenttype default set`,
     LIST_GET: `${prefix} list get`,
-    LIST_LABEL_GET: `${prefix} list label get`,
-    LIST_LABEL_SET: `${prefix} list label set`,
     LIST_LIST: `${prefix} list list`,
     LIST_REMOVE: `${prefix} list remove`,
     LIST_RETENTIONLABEL_ENSURE: `${prefix} list retentionlabel ensure`,

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

@@ -16,13 +16,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsMeetingGetCommand_instances, _TeamsMeetingGetCommand_initTelemetry, _TeamsMeetingGetCommand_initOptions, _TeamsMeetingGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
-const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const validation_1 = require("../../../../utils/validation");
 const accessToken_1 = require("../../../../utils/accessToken");
-const AadUserGetCommand = require("../../../aad/commands/user/user-get");
+const aadUser_1 = require("../../../../utils/aadUser");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsMeetingGetCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.MEETING_GET;
@@ -37,20 +37,6 @@ class TeamsMeetingGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsMeetingGetCommand_instances, "m", _TeamsMeetingGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsMeetingGetCommand_instances, "m", _TeamsMeetingGetCommand_initValidators).call(this);
     }
-    getUserId(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const commandOptions = {
-                email: options.email,
-                userName: options.userName,
-                output: 'json',
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            const output = yield Cli_1.Cli.executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, commandOptions), { _: [] }) });
-            const getUserOutput = JSON.parse(output.stdout);
-            return getUserOutput.id;
-        });
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const isAppOnlyAccessToken = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
@@ -71,18 +57,13 @@ class TeamsMeetingGetCommand extends GraphCommand_1.default {
                 let requestUrl = `${this.resource}/v1.0/`;
                 if (isAppOnlyAccessToken) {
                     requestUrl += 'users/';
-                    if (args.options.userId) {
-                        requestUrl += args.options.userId;
-                    }
-                    else {
-                        const userId = yield this.getUserId(args.options);
-                        requestUrl += userId;
-                    }
+                    const userId = yield this.getUserId(args.options);
+                    requestUrl += userId;
                 }
                 else {
                     requestUrl += `me`;
                 }
-                requestUrl += `/onlineMeetings?$filter=JoinWebUrl eq '${encodeURIComponent(args.options.joinUrl)}'`;
+                requestUrl += `/onlineMeetings?$filter=JoinWebUrl eq '${formatting_1.formatting.encodeQueryParameter(args.options.joinUrl)}'`;
                 const requestOptions = {
                     url: requestUrl,
                     headers: {
@@ -103,6 +84,17 @@ class TeamsMeetingGetCommand extends GraphCommand_1.default {
             }
         });
     }
+    getUserId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.userId) {
+                return options.userId;
+            }
+            if (options.userName) {
+                return aadUser_1.aadUser.getUserIdByUpn(options.userName);
+            }
+            return aadUser_1.aadUser.getUserIdByEmail(options.email);
+        });
+    }
 }
 _TeamsMeetingGetCommand_instances = new WeakSet(), _TeamsMeetingGetCommand_initTelemetry = function _TeamsMeetingGetCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -21,8 +21,8 @@ const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const odata_1 = require("../../../../utils/odata");
 const validation_1 = require("../../../../utils/validation");
-const AadUserGetCommand = require("../../../aad/commands/user/user-get");
 const accessToken_1 = require("../../../../utils/accessToken");
+const aadUser_1 = require("../../../../utils/aadUser");
 class TeamsMeetingListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.MEETING_LIST;
@@ -60,7 +60,7 @@ class TeamsMeetingListCommand extends GraphCommand_1.default {
                         requestUrl += args.options.userName;
                     }
                     else if (args.options.email) {
-                        const userId = yield this.getUserId(args.options.email);
+                        const userId = yield aadUser_1.aadUser.getUserIdByEmail(args.options.email);
                         requestUrl += userId;
                     }
                 }
@@ -98,19 +98,6 @@ class TeamsMeetingListCommand extends GraphCommand_1.default {
             }
         });
     }
-    getUserId(email) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const options = {
-                email: email,
-                output: 'json',
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            const output = yield Cli_1.Cli.executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
-            const getUserOutput = JSON.parse(output.stdout);
-            return getUserOutput.id;
-        });
-    }
 }
 _TeamsMeetingListCommand_instances = new WeakSet(), _TeamsMeetingListCommand_initTelemetry = function _TeamsMeetingListCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -17,9 +17,6 @@ m365 aad user list [options]
 ```md definition-list
 `-p, --properties [properties]`
 : Comma-separated list of properties to retrieve
-
-`-d, --deleted`
-: Use to retrieve deleted users
 ```
 
 <Global />
@@ -40,12 +37,6 @@ List all users in the tenant
 m365 aad user list
 ```
 
-List all recently deleted users in the tenant
-
-```sh
-m365 aad user list --deleted
-```
-
 List all users in the tenant. For each one return the display name and e-mail address
 
 ```sh

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

@@ -13,11 +13,11 @@ m365 aad user set [options]
 ## Options
 
 ```md definition-list
-`-i, --objectId [objectId]`
-: The object ID of the user to update. Specify `objectId` or `userPrincipalName` but not both.
+`-i, --id [id]`
+: The object ID of the user to update. Specify `id` or `userName` but not both.
 
-`-n, --userPrincipalName [userPrincipalName]`
-: User principal name of the user to update. Specify `objectId` or `userPrincipalName` but not both.
+`-n, --userName [userName]`
+: User principal name of the user to update. Specify `id` or `userName` but not both.
 
 `--accountEnabled [accountEnabled]`
 : Boolean value specifying whether the account is enabled. Valid values are `true` or `false`.
@@ -87,36 +87,36 @@ If the user with the specified ID or username doesn't exist, or if the specified
 Update specific property _department_ of user with id _1caf7dcd-7e83-4c3a-94f7-932a1299c844_
 
 ```sh
-m365 aad user set --objectId 1caf7dcd-7e83-4c3a-94f7-932a1299c844 --Department IT
+m365 aad user set --id 1caf7dcd-7e83-4c3a-94f7-932a1299c844 --Department IT
 ```
 
 Update multiple properties of user by name
 ```sh
-m365 aad user set --userPrincipalName steve@contoso.onmicrosoft.com --firstName John --lastName Doe --jobTitle "Sales Manager" --companyName Contoso --department Sales --officeLocation "New York"
+m365 aad user set --userName steve@contoso.onmicrosoft.com --firstName John --lastName Doe --jobTitle "Sales Manager" --companyName Contoso --department Sales --officeLocation "New York"
 ```
 
 Enable user with id _1caf7dcd-7e83-4c3a-94f7-932a1299c844_
 
 ```sh
-m365 aad user set --objectId 1caf7dcd-7e83-4c3a-94f7-932a1299c844 --accountEnabled true
+m365 aad user set --id 1caf7dcd-7e83-4c3a-94f7-932a1299c844 --accountEnabled true
 ```
 
 Disable user with id _1caf7dcd-7e83-4c3a-94f7-932a1299c844_
 
 ```sh
-m365 aad user set --objectId 1caf7dcd-7e83-4c3a-94f7-932a1299c844 --accountEnabled false
+m365 aad user set --id 1caf7dcd-7e83-4c3a-94f7-932a1299c844 --accountEnabled false
 ```
 
-Reset password of a given user by userPrincipalName and require the user to change the password on the next sign in
+Reset password of a given user by userName and require the user to change the password on the next sign in
 
 ```sh
-m365 aad user set --userPrincipalName steve@contoso.onmicrosoft.com --resetPassword --newPassword 6NLUId79Lc24 --forceChangePasswordNextSignIn
+m365 aad user set --userName steve@contoso.onmicrosoft.com --resetPassword --newPassword 6NLUId79Lc24 --forceChangePasswordNextSignIn
 ```
 
 Change password of the currently logged in user
 
 ```sh
-m365 aad user set --objectId 1caf7dcd-7e83-4c3a-94f7-932a1299c844 --currentPassword SLBF5gnRtyYc --newPassword 6NLUId79Lc24
+m365 aad user set --id 1caf7dcd-7e83-4c3a-94f7-932a1299c844 --currentPassword SLBF5gnRtyYc --newPassword 6NLUId79Lc24
 ```
 
 Updates a user with a manager

package/docs/docs/cmd/flow/environment/environment-get.mdx

@@ -120,8 +120,7 @@ m365 flow environment get
       "governanceConfiguration": {
         "protectionLevel": "Basic"
       }
-    },
-    "displayName": "contoso (default)"
+    }
   }
   ```
 

package/docs/docs/cmd/flow/environment/environment-list.mdx

@@ -109,8 +109,7 @@ m365 flow environment list
         "governanceConfiguration": {
           "protectionLevel": "Basic"
         }
-      },
-      "displayName": "Contoso Environment"
+      }
     }
   ]
   ```

package/docs/docs/cmd/flow/run/run-list.mdx

@@ -121,9 +121,7 @@ m365 flow run list --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c
           },
           "status": "Succeeded"
         }
-      },
-      "startTime": "2022-11-17T14:33:45.2763872Z",
-      "status": "Running"
+      }
     }
   ]
   ```

package/docs/docs/cmd/pa/app/app-consent-set.mdx

@@ -13,7 +13,7 @@ m365 pa app consent set [options]
 ## Options
 
 ```md definition-list
-`-e, --environment <environment>`
+`-e, --environmentName <environmentName>`
 : The name of the environment.
 
 `-n, --name <name>`
@@ -37,13 +37,13 @@ This command only works for canvas apps.
 Enables the bypass for the specified canvas app
 
 ```sh
-m365 pa app consent set --environment 4be50206-9576-4237-8b17-38d8aadfaa36 --name 3989cb59-ce1a-4a5c-bb78-257c5c39381d --bypass true
+m365 pa app consent set --environmentName 4be50206-9576-4237-8b17-38d8aadfaa36 --name 3989cb59-ce1a-4a5c-bb78-257c5c39381d --bypass true
 ```
 
 Disables the bypass consent for the specified canvas app
 
 ```sh
-m365 pa app consent set --environment 4be50206-9576-4237-8b17-38d8aadfaa36 --name 3989cb59-ce1a-4a5c-bb78-257c5c39381d --bypass false --force
+m365 pa app consent set --environmentName 4be50206-9576-4237-8b17-38d8aadfaa36 --name 3989cb59-ce1a-4a5c-bb78-257c5c39381d --bypass false --force
 ```
 
 ## Response

package/docs/docs/cmd/pa/app/app-export.mdx

@@ -16,7 +16,7 @@ m365 pa app export [options]
 `-i, --id <id>`
 : The id of the Power App to export
 
-`-e, --environment <environment>`
+`-e, --environmentName <environmentName>`
 : The name of the environment for which to export the app
 
 `-n, --packageDisplayName [packageDisplayName]`
@@ -42,13 +42,13 @@ m365 pa app export [options]
 Export the specified Power App as a ZIP file
 
 ```sh
-m365 pa app export --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --id 3989cb59-ce1a-4a5c-bb78-257c5c39381d 
+m365 pa app export --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --id 3989cb59-ce1a-4a5c-bb78-257c5c39381d --packageDisplayName "PowerApp"
 ```
 
 Export the specified Power App as a ZIP file with the package displayname, package description, the one who created it, the package source environment and the path
 
 ```sh
-m365 pa app export --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --id 3989cb59-ce1a-4a5c-bb78-257c5c39381d --packageDisplayName "PowerApp" --packageDescription "Power App Description" --packageCreatedBy "John Doe" --packageSourceEnvironment "Contoso" --path "C:/Users/John/Documents"
+m365 pa app export --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --id 3989cb59-ce1a-4a5c-bb78-257c5c39381d --packageDisplayName "PowerApp" --packageDescription "Power App Description" --packageCreatedBy "John Doe" --packageSourceEnvironment "Contoso" --path "C:/Users/John/Documents"
 ```
 
 ## Response

package/docs/docs/cmd/pa/app/app-list.mdx

@@ -15,7 +15,7 @@ m365 pa app list [options]
 ## Options
 
 ```md definition-list
-`-e, --environment [environment]`
+`-e, --environmentName [environmentName]`
 : The name of the environment for which to retrieve available apps
 
 `--asAdmin`
@@ -47,7 +47,7 @@ m365 pa app list
 List all apps in a given environment
 
 ```sh
-m365 pa app list --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --asAdmin
+m365 pa app list --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --asAdmin
 ```
 
 ## Response

package/docs/docs/cmd/pp/aibuildermodel/aibuildermodel-get.mdx

@@ -15,7 +15,7 @@ m365 pp aibuildermodel get [options]
 ## Options
 
 ```md definition-list
-`-e, --environment <environment>`
+`-e, --environmentName <environmentName>`
 : The name of the environment
 
 `-i, --id [id]`
@@ -35,13 +35,13 @@ m365 pp aibuildermodel get [options]
 Get an AI Builder model in a specific environment
 
 ```sh
-m365 pp aibuildermodel get --environment "Default-d87a7535-dd31-4437-bfe1-95340acd55c5" --name "Document Processing 11/29/2022, 12:58:43 PM"
+m365 pp aibuildermodel get --environmentName "Default-d87a7535-dd31-4437-bfe1-95340acd55c5" --name "Document Processing 11/29/2022, 12:58:43 PM"
 ```
 
 Get an AI Builder models in a specific environment by id as admin
 
 ```sh
-m365 pp aibuildermodel get --environment "Default-d87a7535-dd31-4437-bfe1-95340acd55c5" --id "08ffffbe-ec1c-4e64-b64b-dd1db926c613" --asAdmin
+m365 pp aibuildermodel get --environmentName "Default-d87a7535-dd31-4437-bfe1-95340acd55c5" --id "08ffffbe-ec1c-4e64-b64b-dd1db926c613" --asAdmin
 ```
 
 ## Response
@@ -111,7 +111,7 @@ m365 pp aibuildermodel get --environment "Default-d87a7535-dd31-4437-bfe1-95340a
   <TabItem value="Markdown">
 
   ```md
-  # pp aibuildermodel get --environment "Default-d87a7535-dd31-4437-bfe1-95340acd55c5" --id "08ffffbe-ec1c-4e64-b64b-dd1db926c613"
+  # pp aibuildermodel get --environmentName "Default-d87a7535-dd31-4437-bfe1-95340acd55c5" --id "08ffffbe-ec1c-4e64-b64b-dd1db926c613"
 
   Date: 6/2/2023