@pnp/cli-microsoft365 8.1.0-beta.bf59841 → 9.0.0-beta.33615bd

package/dist/m365/app/commands/permission/permission-add.js

@@ -33,12 +33,12 @@ class AppPermissionAddCommand extends AppCommand {
             const appObject = await this.getAppObject();
             const servicePrincipals = await odata.getAllItems(`${this.resource}/v1.0/myorganization/servicePrincipals?$select=appId,appRoles,id,oauth2PermissionScopes,servicePrincipalNames`);
             const appPermissions = [];
-            if (args.options.delegatedPermission) {
-                const delegatedPermissions = await this.getRequiredResourceAccessForApis(servicePrincipals, args.options.delegatedPermission, ScopeType.Scope, appPermissions, logger);
+            if (args.options.delegatedPermissions) {
+                const delegatedPermissions = await this.getRequiredResourceAccessForApis(servicePrincipals, args.options.delegatedPermissions, ScopeType.Scope, appPermissions, logger);
                 this.addPermissionsToResourceArray(delegatedPermissions, appObject.requiredResourceAccess);
             }
-            if (args.options.applicationPermission) {
-                const applicationPermissions = await this.getRequiredResourceAccessForApis(servicePrincipals, args.options.applicationPermission, ScopeType.Role, appPermissions, logger);
+            if (args.options.applicationPermissions) {
+                const applicationPermissions = await this.getRequiredResourceAccessForApis(servicePrincipals, args.options.applicationPermissions, ScopeType.Role, appPermissions, logger);
                 this.addPermissionsToResourceArray(applicationPermissions, appObject.requiredResourceAccess);
             }
             const addPermissionsRequestOptions = {
@@ -198,17 +198,17 @@ _AppPermissionAddCommand_instances = new WeakSet(), _AppPermissionAddCommand_ini
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: typeof args.options.appId !== 'undefined',
-            applicationPermission: typeof args.options.applicationPermission !== 'undefined',
-            delegatedPermission: typeof args.options.delegatedPermission !== 'undefined',
+            applicationPermissions: typeof args.options.applicationPermissions !== 'undefined',
+            delegatedPermissions: typeof args.options.delegatedPermissions !== 'undefined',
             grantAdminConsent: !!args.options.grantAdminConsent
         });
     });
 }, _AppPermissionAddCommand_initOptions = function _AppPermissionAddCommand_initOptions() {
-    this.options.unshift({ option: '--appId [appId]' }, { option: '--applicationPermission [applicationPermission]' }, { option: '--delegatedPermission [delegatedPermission]' }, { option: '--grantAdminConsent' });
+    this.options.unshift({ option: '--appId [appId]' }, { option: '--applicationPermissions [applicationPermissions]' }, { option: '--delegatedPermissions [delegatedPermissions]' }, { option: '--grantAdminConsent' });
 }, _AppPermissionAddCommand_initOptionSets = function _AppPermissionAddCommand_initOptionSets() {
     this.optionSets.push({
-        options: ['applicationPermission', 'delegatedPermission'],
-        runsWhen: (args) => args.options.delegatedPermission === undefined && args.options.applicationPermission === undefined
+        options: ['applicationPermissions', 'delegatedPermissions'],
+        runsWhen: (args) => args.options.delegatedPermissions === undefined && args.options.applicationPermissions === undefined
     });
 };
 export default new AppPermissionAddCommand();

package/dist/m365/entra/commands/group/group-user-list.js

@@ -65,7 +65,7 @@ class EntraGroupUserListCommand extends GraphCommand {
         if (this.verbose) {
             await logger.logToStderr('Retrieving Group Id...');
         }
-        return await entraGroup.getGroupIdByDisplayName(options.groupDisplayName);
+        return await entraGroup.getGroupIdByDisplayName(options.groupName);
     }
     async getUsers(options, role, groupId, logger) {
         const { properties, filter } = options;
@@ -111,7 +111,7 @@ _EntraGroupUserListCommand_instances = new WeakSet(), _EntraGroupUserListCommand
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             groupId: typeof args.options.groupId !== 'undefined',
-            groupDisplayName: typeof args.options.groupDisplayName !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
             role: typeof args.options.role !== 'undefined',
             properties: typeof args.options.properties !== 'undefined',
             filter: typeof args.options.filter !== 'undefined'
@@ -121,7 +121,7 @@ _EntraGroupUserListCommand_instances = new WeakSet(), _EntraGroupUserListCommand
     this.options.unshift({
         option: "-i, --groupId [groupId]"
     }, {
-        option: "-n, --groupDisplayName [groupDisplayName]"
+        option: "-n, --groupName [groupName]"
     }, {
         option: "-r, --role [role]",
         autocomplete: ["Owner", "Member"]
@@ -132,7 +132,7 @@ _EntraGroupUserListCommand_instances = new WeakSet(), _EntraGroupUserListCommand
     });
 }, _EntraGroupUserListCommand_initOptionSets = function _EntraGroupUserListCommand_initOptionSets() {
     this.optionSets.push({
-        options: ['groupId', 'groupDisplayName']
+        options: ['groupId', 'groupName']
     });
 }, _EntraGroupUserListCommand_initValidators = function _EntraGroupUserListCommand_initValidators() {
     this.validators.push(async (args) => {

package/dist/m365/entra/commands/m365group/m365group-conversation-post-list.js

@@ -51,7 +51,7 @@ class EntraM365GroupConversationPostListCommand extends GraphCommand {
         if (args.options.groupId) {
             return formatting.encodeQueryParameter(args.options.groupId);
         }
-        const group = await entraGroup.getGroupByDisplayName(args.options.groupDisplayName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.groupName);
         return group.id;
     }
 }
@@ -59,14 +59,14 @@ _EntraM365GroupConversationPostListCommand_instances = new WeakSet(), _EntraM365
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             groupId: typeof args.options.groupId !== 'undefined',
-            groupDisplayName: typeof args.options.groupDisplayName !== 'undefined'
+            groupName: typeof args.options.groupName !== 'undefined'
         });
     });
 }, _EntraM365GroupConversationPostListCommand_initOptions = function _EntraM365GroupConversationPostListCommand_initOptions() {
     this.options.unshift({
         option: '-i, --groupId [groupId]'
     }, {
-        option: '-d, --groupDisplayName [groupDisplayName]'
+        option: '-d, --groupName [groupName]'
     }, {
         option: '-t, --threadId <threadId>'
     });
@@ -78,7 +78,7 @@ _EntraM365GroupConversationPostListCommand_instances = new WeakSet(), _EntraM365
         return true;
     });
 }, _EntraM365GroupConversationPostListCommand_initOptionSets = function _EntraM365GroupConversationPostListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupDisplayName'] });
+    this.optionSets.push({ options: ['groupId', 'groupName'] });
 };
 export default new EntraM365GroupConversationPostListCommand();
 //# sourceMappingURL=m365group-conversation-post-list.js.map

package/dist/m365/entra/commands/m365group/m365group-recyclebinitem-list.js

@@ -32,7 +32,7 @@ class EntraM365GroupRecycleBinItemListCommand extends GraphCommand {
         await this.showDeprecationWarning(logger, aadCommands.M365GROUP_RECYCLEBINITEM_LIST, commands.M365GROUP_RECYCLEBINITEM_LIST);
         try {
             const filter = `?$filter=groupTypes/any(c:c+eq+'Unified')`;
-            const displayNameFilter = args.options.groupDisplayName ? ` and startswith(DisplayName,'${formatting.encodeQueryParameter(args.options.groupDisplayName).replace(/'/g, `''`)}')` : '';
+            const displayNameFilter = args.options.groupName ? ` and startswith(DisplayName,'${formatting.encodeQueryParameter(args.options.groupName).replace(/'/g, `''`)}')` : '';
             const mailNicknameFilter = args.options.groupMailNickname ? ` and startswith(MailNickname,'${formatting.encodeQueryParameter(args.options.groupMailNickname).replace(/'/g, `''`)}')` : '';
             const topCount = '&$top=100';
             const endpoint = `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group${filter}${displayNameFilter}${mailNicknameFilter}${topCount}`;
@@ -47,13 +47,13 @@ class EntraM365GroupRecycleBinItemListCommand extends GraphCommand {
 _EntraM365GroupRecycleBinItemListCommand_instances = new WeakSet(), _EntraM365GroupRecycleBinItemListCommand_initTelemetry = function _EntraM365GroupRecycleBinItemListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            groupDisplayName: typeof args.options.groupDisplayName !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
             groupMailNickname: typeof args.options.groupMailNickname !== 'undefined'
         });
     });
 }, _EntraM365GroupRecycleBinItemListCommand_initOptions = function _EntraM365GroupRecycleBinItemListCommand_initOptions() {
     this.options.unshift({
-        option: '-d, --groupDisplayName [groupDisplayName]'
+        option: '-d, --groupName [groupName]'
     }, {
         option: '-m, --groupMailNickname [groupMailNickname]'
     });

package/dist/m365/entra/commands/m365group/m365group-user-list.js

@@ -31,9 +31,6 @@ class EntraM365GroupUserListCommand extends GraphCommand {
     async commandAction(logger, args) {
         await this.showDeprecationWarning(logger, aadCommands.M365GROUP_USER_LIST, commands.M365GROUP_USER_LIST);
         try {
-            if (args.options.role === 'Guest') {
-                await this.warn(logger, `Value 'Guest' for the option role is deprecated. Use --filter "userType eq 'Guest'" instead.`);
-            }
             const groupId = await this.getGroupId(args.options, logger);
             const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);
             if (!isUnifiedGroup) {
@@ -42,9 +39,9 @@ class EntraM365GroupUserListCommand extends GraphCommand {
             let users = [];
             if (!args.options.role || args.options.role === 'Owner') {
                 const owners = await this.getUsers(args.options, 'Owners', groupId, logger);
-                owners.forEach(owner => users.push({ ...owner, roles: ['Owner'], userType: 'Owner' }));
+                owners.forEach(owner => users.push({ ...owner, roles: ['Owner'] }));
             }
-            if (!args.options.role || args.options.role === 'Member' || args.options.role === 'Guest') {
+            if (!args.options.role || args.options.role === 'Member') {
                 const members = await this.getUsers(args.options, 'Members', groupId, logger);
                 members.forEach((member) => {
                     const user = users.find((u) => u.id === member.id);
@@ -57,7 +54,7 @@ class EntraM365GroupUserListCommand extends GraphCommand {
                 });
             }
             if (args.options.role) {
-                users = users.filter(i => i.userType === args.options.role);
+                users = users.filter(i => i.roles.indexOf(args.options.role) > -1);
             }
             await logger.log(users);
         }
@@ -128,7 +125,7 @@ _EntraM365GroupUserListCommand_instances = new WeakSet(), _EntraM365GroupUserLis
         option: "-n, --groupDisplayName [groupDisplayName]"
     }, {
         option: "-r, --role [type]",
-        autocomplete: ["Owner", "Member", "Guest"]
+        autocomplete: ["Owner", "Member"]
     }, {
         option: "-p, --properties [properties]"
     }, {
@@ -144,8 +141,8 @@ _EntraM365GroupUserListCommand_instances = new WeakSet(), _EntraM365GroupUserLis
             return `${args.options.groupId} is not a valid GUID`;
         }
         if (args.options.role) {
-            if (['Owner', 'Member', 'Guest'].indexOf(args.options.role) === -1) {
-                return `${args.options.role} is not a valid role value. Allowed values Owner|Member|Guest`;
+            if (['Owner', 'Member'].indexOf(args.options.role) === -1) {
+                return `${args.options.role} is not a valid role value. Allowed values Owner|Member`;
             }
         }
         return true;

package/dist/m365/outlook/commands/message/message-get.js

@@ -30,20 +30,20 @@ class OutlookMessageGetCommand extends GraphCommand {
             }
             let requestUrl = '';
             if (isAppOnlyAccessToken) {
-                if (!args.options.userId && !args.options.userPrincipalName) {
-                    throw `The option 'userId' or 'userPrincipalName' is required when retrieving an email using app only credentials`;
+                if (!args.options.userId && !args.options.userName) {
+                    throw `The option 'userId' or 'userName' is required when retrieving an email using app only credentials`;
                 }
-                if (args.options.userId && args.options.userPrincipalName) {
-                    throw `Both options 'userId' and 'userPrincipalName' cannot be set when retrieving an email using app only credentials`;
+                if (args.options.userId && args.options.userName) {
+                    throw `Both options 'userId' and 'userName' cannot be set when retrieving an email using app only credentials`;
                 }
-                requestUrl += `users/${args.options.userId ? args.options.userId : args.options.userPrincipalName}`;
+                requestUrl += `users/${args.options.userId ? args.options.userId : args.options.userName}`;
             }
             else {
-                if (args.options.userId && args.options.userPrincipalName) {
-                    throw `Both options 'userId' and 'userPrincipalName' cannot be set when retrieving an email using delegated credentials`;
+                if (args.options.userId && args.options.userName) {
+                    throw `Both options 'userId' and 'userName' cannot be set when retrieving an email using delegated credentials`;
                 }
-                if (args.options.userId || args.options.userPrincipalName) {
-                    requestUrl += `users/${args.options.userId ? args.options.userId : args.options.userPrincipalName}`;
+                if (args.options.userId || args.options.userName) {
+                    requestUrl += `users/${args.options.userId ? args.options.userId : args.options.userName}`;
                 }
                 else {
                     requestUrl += 'me';
@@ -69,7 +69,7 @@ _OutlookMessageGetCommand_instances = new WeakSet(), _OutlookMessageGetCommand_i
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             userId: typeof args.options.userId !== 'undefined',
-            userPrincipalName: typeof args.options.userPrincipalName !== 'undefined'
+            userName: typeof args.options.userName !== 'undefined'
         });
     });
 }, _OutlookMessageGetCommand_initOptions = function _OutlookMessageGetCommand_initOptions() {
@@ -78,7 +78,7 @@ _OutlookMessageGetCommand_instances = new WeakSet(), _OutlookMessageGetCommand_i
     }, {
         option: '--userId [userId]'
     }, {
-        option: '--userPrincipalName [userPrincipalName]'
+        option: '--userName [userName]'
     });
 };
 export default new OutlookMessageGetCommand();

package/dist/m365/spo/commands/list/list-list.js

@@ -16,7 +16,7 @@ class SpoListListCommand extends SpoCommand {
         return 'Lists all available list in the specified site';
     }
     defaultProperties() {
-        return ['Title', 'Url', 'Id'];
+        return ['Title', 'Id'];
     }
     constructor() {
         super();
@@ -36,9 +36,6 @@ class SpoListListCommand extends SpoCommand {
                 queryParams.push(`$filter=${args.options.filter}`);
             }
             const listInstances = await odata.getAllItems(`${args.options.webUrl}/_api/web/lists?${queryParams.join('&')}`);
-            listInstances.forEach(l => {
-                l.Url = l.RootFolder.ServerRelativeUrl;
-            });
             await logger.log(listInstances);
         }
         catch (err) {

package/dist/m365/spo/commands/site/site-appcatalog-remove.js

@@ -3,7 +3,8 @@ 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 _SpoSiteAppCatalogRemoveCommand_instances, _SpoSiteAppCatalogRemoveCommand_initOptions, _SpoSiteAppCatalogRemoveCommand_initValidators;
+var _SpoSiteAppCatalogRemoveCommand_instances, _SpoSiteAppCatalogRemoveCommand_initTelemetry, _SpoSiteAppCatalogRemoveCommand_initOptions, _SpoSiteAppCatalogRemoveCommand_initValidators, _SpoSiteAppCatalogRemoveCommand_initTypes;
+import { cli } from '../../../../cli/cli.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -21,47 +22,70 @@ class SpoSiteAppCatalogRemoveCommand extends SpoCommand {
     constructor() {
         super();
         _SpoSiteAppCatalogRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteAppCatalogRemoveCommand_instances, "m", _SpoSiteAppCatalogRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppCatalogRemoveCommand_instances, "m", _SpoSiteAppCatalogRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppCatalogRemoveCommand_instances, "m", _SpoSiteAppCatalogRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAppCatalogRemoveCommand_instances, "m", _SpoSiteAppCatalogRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        const url = args.options.siteUrl;
-        try {
-            const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-            const requestDigest = await spo.getRequestDigest(spoAdminUrl);
+        const removeSiteAppcatalog = async () => {
+            const url = args.options.siteUrl;
             if (this.verbose) {
                 await logger.logToStderr(`Disabling site collection app catalog...`);
             }
-            const requestOptions = {
-                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': requestDigest.FormDigestValue
-                },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="50" ObjectPathId="49" /><ObjectPath Id="52" ObjectPathId="51" /><ObjectPath Id="54" ObjectPathId="53" /><ObjectPath Id="56" ObjectPathId="55" /><ObjectPath Id="58" ObjectPathId="57" /><Method Name="Remove" Id="59" ObjectPathId="57"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="49" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="51" ParentId="49" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method><Property Id="53" ParentId="51" Name="RootWeb" /><Property Id="55" ParentId="53" Name="TenantAppCatalog" /><Property Id="57" ParentId="55" Name="SiteCollectionAppCatalogsSites" /></ObjectPaths></Request>`
-            };
-            const res = await request.post(requestOptions);
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                throw response.ErrorInfo.ErrorMessage;
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('Site collection app catalog disabled');
+            try {
+                const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+                const requestDigest = await spo.getRequestDigest(spoAdminUrl);
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': requestDigest.FormDigestValue
+                    },
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="50" ObjectPathId="49" /><ObjectPath Id="52" ObjectPathId="51" /><ObjectPath Id="54" ObjectPathId="53" /><ObjectPath Id="56" ObjectPathId="55" /><ObjectPath Id="58" ObjectPathId="57" /><Method Name="Remove" Id="59" ObjectPathId="57"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="49" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="51" ParentId="49" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method><Property Id="53" ParentId="51" Name="RootWeb" /><Property Id="55" ParentId="53" Name="TenantAppCatalog" /><Property Id="57" ParentId="55" Name="SiteCollectionAppCatalogsSites" /></ObjectPaths></Request>`
+                };
+                const res = await request.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
+                else {
+                    if (this.verbose) {
+                        await logger.logToStderr('Site collection app catalog disabled');
+                    }
                 }
             }
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        };
+        if (args.options.force) {
+            await removeSiteAppcatalog();
         }
-        catch (err) {
-            this.handleRejectedPromise(err);
+        else {
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the app catalog from ${args.options.siteUrl}?` });
+            if (result) {
+                await removeSiteAppcatalog();
+            }
         }
     }
 }
-_SpoSiteAppCatalogRemoveCommand_instances = new WeakSet(), _SpoSiteAppCatalogRemoveCommand_initOptions = function _SpoSiteAppCatalogRemoveCommand_initOptions() {
+_SpoSiteAppCatalogRemoveCommand_instances = new WeakSet(), _SpoSiteAppCatalogRemoveCommand_initTelemetry = function _SpoSiteAppCatalogRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            force: !!args.options.force
+        });
+    });
+}, _SpoSiteAppCatalogRemoveCommand_initOptions = function _SpoSiteAppCatalogRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-u, --siteUrl <siteUrl>'
+    }, {
+        option: '-f, --force'
     });
 }, _SpoSiteAppCatalogRemoveCommand_initValidators = function _SpoSiteAppCatalogRemoveCommand_initValidators() {
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.siteUrl));
+}, _SpoSiteAppCatalogRemoveCommand_initTypes = function _SpoSiteAppCatalogRemoveCommand_initTypes() {
+    this.types.string.push('siteUrl');
 };
 export default new SpoSiteAppCatalogRemoveCommand();
 //# sourceMappingURL=site-appcatalog-remove.js.map

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-restore.js

@@ -3,7 +3,7 @@ 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 _SpoTenantRecycleBinItemRestoreCommand_instances, _SpoTenantRecycleBinItemRestoreCommand_initTelemetry, _SpoTenantRecycleBinItemRestoreCommand_initOptions, _SpoTenantRecycleBinItemRestoreCommand_initValidators, _SpoTenantRecycleBinItemRestoreCommand_initTypes;
+var _SpoTenantRecycleBinItemRestoreCommand_instances, _SpoTenantRecycleBinItemRestoreCommand_initOptions, _SpoTenantRecycleBinItemRestoreCommand_initValidators, _SpoTenantRecycleBinItemRestoreCommand_initTypes;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
@@ -22,15 +22,11 @@ class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand {
     constructor() {
         super();
         _SpoTenantRecycleBinItemRestoreCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoTenantRecycleBinItemRestoreCommand_instances, "m", _SpoTenantRecycleBinItemRestoreCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoTenantRecycleBinItemRestoreCommand_instances, "m", _SpoTenantRecycleBinItemRestoreCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoTenantRecycleBinItemRestoreCommand_instances, "m", _SpoTenantRecycleBinItemRestoreCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoTenantRecycleBinItemRestoreCommand_instances, "m", _SpoTenantRecycleBinItemRestoreCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        if (args.options.wait) {
-            await this.warn(logger, `Option 'wait' is deprecated and will be removed in the next major release.`);
-        }
         try {
             if (this.verbose) {
                 await logger.logToStderr(`Restoring site collection '${args.options.siteUrl}' from recycle bin.`);
@@ -62,13 +58,6 @@ class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand {
                 };
                 await request.post(restoreOptions);
             }
-            // Here, we return a fixed response because this new API endpoint doesn't return a response while the previous API did.
-            // This has to be removed in the next major release.
-            await logger.log({
-                HasTimedout: false,
-                IsComplete: !!args.options.wait,
-                PollingInterval: 15000
-            });
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
@@ -79,23 +68,14 @@ class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand {
         return sites[0].GroupId;
     }
 }
-_SpoTenantRecycleBinItemRestoreCommand_instances = new WeakSet(), _SpoTenantRecycleBinItemRestoreCommand_initTelemetry = function _SpoTenantRecycleBinItemRestoreCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            wait: !!args.options.wait
-        });
-    });
-}, _SpoTenantRecycleBinItemRestoreCommand_initOptions = function _SpoTenantRecycleBinItemRestoreCommand_initOptions() {
+_SpoTenantRecycleBinItemRestoreCommand_instances = new WeakSet(), _SpoTenantRecycleBinItemRestoreCommand_initOptions = function _SpoTenantRecycleBinItemRestoreCommand_initOptions() {
     this.options.unshift({
         option: '-u, --siteUrl <siteUrl>'
-    }, {
-        option: '--wait'
     });
 }, _SpoTenantRecycleBinItemRestoreCommand_initValidators = function _SpoTenantRecycleBinItemRestoreCommand_initValidators() {
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.siteUrl));
 }, _SpoTenantRecycleBinItemRestoreCommand_initTypes = function _SpoTenantRecycleBinItemRestoreCommand_initTypes() {
     this.types.string.push('siteUrl');
-    this.types.boolean.push('wait');
 };
 export default new SpoTenantRecycleBinItemRestoreCommand();
 //# sourceMappingURL=tenant-recyclebinitem-restore.js.map

package/docs/docs/cmd/app/permission/permission-add.mdx

@@ -16,10 +16,10 @@ m365 app permission add [options]
 `--appId [appId]`
 : Client ID of the Microsoft Entra app registered in the .m365rc.json file to retrieve API permissions for.
 
-`--applicationPermission [applicationPermission]`
+`--applicationPermissions [applicationPermissions]`
 : Space-separated list of application permissions to add.
 
-`--delegatedPermission [delegatedPermission]`
+`--delegatedPermissions [delegatedPermissions]`
 : Space-separated list of delegated permissions to add.
 
 `--grantAdminConsent`
@@ -37,19 +37,19 @@ If you have multiple apps registered in your .m365rc.json file, you can specify
 Adds the specified application permissions to the default app registered in the _.m365rc.json_ file while granting admin consent.
 
 ```sh
-m365 app permission add --applicationPermission 'https://graph.microsoft.com/User.ReadWrite.All https://graph.microsoft.com/User.Read.All' --grantAdminConsent
+m365 app permission add --applicationPermissions 'https://graph.microsoft.com/User.ReadWrite.All https://graph.microsoft.com/User.Read.All' --grantAdminConsent
 ```
 
 Adds the specified delegated permissions to the default app registered in the _.m365rc.json_ file without granting admin consent.
 
 ```sh
-m365 app permission add --delegatedPermission 'https://graph.microsoft.com/offline_access'
+m365 app permission add --delegatedPermissions 'https://graph.microsoft.com/offline_access'
 ```
 
 Adds the specified application and delegated permissions to a specific app registered in the _.m365rc.json_ file while granting admin consent.
 
 ```sh
-m365 app permission add --appId '1663767b-4172-4519-bfd1-28e6ff19055b' --applicationPermission 'https://graph.microsoft.com/User.ReadWrite.All https://graph.microsoft.com/User.Read.All' --delegatedPermission 'https://graph.microsoft.com/offline_access' --grantAdminConsent
+m365 app permission add --appId '1663767b-4172-4519-bfd1-28e6ff19055b' --applicationPermissions 'https://graph.microsoft.com/User.ReadWrite.All https://graph.microsoft.com/User.Read.All' --delegatedPermissions 'https://graph.microsoft.com/offline_access' --grantAdminConsent
 ```
 
 ## Response

package/docs/docs/cmd/entra/group/group-user-list.mdx

@@ -22,10 +22,10 @@ m365 aad group user list [options]
 
 ```md definition-list
 `-i, --groupId [groupId]`
-: The ID of the Entra group. Specify `groupId` or `groupDisplayName` but not both.
+: The ID of the Entra group. Specify `groupId` or `groupName` but not both.
 
-`-n, --groupDisplayName [groupDisplayName]`
-: The display name of the Entra group. Specify `groupId` or `groupDisplayName` but not both.
+`-n, --groupName [groupName]`
+: The display name of the Entra group. Specify `groupId` or `groupName` but not both.
 
 `-r, --role [role]`
 : Filter the results to only users with the given role: `Owner`, `Member`.
@@ -54,25 +54,25 @@ m365 entra group user list --groupId 03cba9da-3974-46c1-afaf-79caa2e45bbe
 List all owners from a group specified by display name.
 
 ```sh
-m365 entra group user list --groupDisplayName Developers --role Owner
+m365 entra group user list --groupName Developers --role Owner
 ```
 
 List all group users from a group specified by name. For each one return the display name, e-mail address, and manager display name.
 
 ```sh
-m365 entra group user list --groupDisplayName Developers --properties "displayName,mail,manager/displayName"
+m365 entra group user list --groupName Developers --properties "displayName,mail,manager/displayName"
 ```
 
 List all group users from a group specified by name. For each one return the display name, e-mail address, and manager information.
 
 ```sh
-m365 entra group user list --groupDisplayName Developers --properties "displayName,mail,manager/*"
+m365 entra group user list --groupName Developers --properties "displayName,mail,manager/*"
 ```
 
 List all group members that are guest users.
 
 ```sh
-m365 entra group user list --groupDisplayName Developers --filter "userType eq 'Guest'"
+m365 entra group user list --groupName Developers --filter "userType eq 'Guest'"
 ```
 
 ## Response

package/docs/docs/cmd/entra/m365group/m365group-conversation-post-list.mdx

@@ -22,10 +22,10 @@ m365 aad m365group conversation post list [options]
 
 ```md definition-list
 `-i, --groupId [groupId]`
-: The Id of the Microsoft 365 Group. You can specify the groupId or groupDisplayName, but not both.
+: The Id of the Microsoft 365 Group. You can specify the groupId or groupName, but not both.
 
-`-d, --groupDisplayName [groupDisplayName]`
-: The Displayname of the Microsoft 365 Group. You can specify the groupId or groupDisplayName, but not both.
+`-d, --groupName [groupName]`
+: The Displayname of the Microsoft 365 Group. You can specify the groupId or groupName, but not both.
 
 `-t, --threadId <threadId>`
 : The ID of the thread to retrieve details for
@@ -41,10 +41,10 @@ Lists the posts of the specific conversation of Microsoft 365 group by groupId
 m365 entra m365group conversation post list --groupId '00000000-0000-0000-0000-000000000000' --threadId 'AAQkADkwN2Q2NDg1LWQ3ZGYtNDViZi1iNGRiLTVhYjJmN2Q5NDkxZQAQAOnRAfDf71lIvrdK85FAn5E='
 ```
 
-Lists the posts of the specific conversation of Microsoft 365 group by groupDisplayName
+Lists the posts of the specific conversation of Microsoft 365 group by groupName
 
 ```sh
-m365 entra m365group conversation post list --groupDisplayName 'MyGroup' --threadId 'AAQkADkwN2Q2NDg1LWQ3ZGYtNDViZi1iNGRiLTVhYjJmN2Q5NDkxZQAQAOnRAfDf71lIvrdK85FAn5E='
+m365 entra m365group conversation post list --groupName 'MyGroup' --threadId 'AAQkADkwN2Q2NDg1LWQ3ZGYtNDViZi1iNGRiLTVhYjJmN2Q5NDkxZQAQAOnRAfDf71lIvrdK85FAn5E='
 ```
 
 ## Response

package/docs/docs/cmd/entra/m365group/m365group-recyclebinitem-list.mdx

@@ -21,7 +21,7 @@ m365 aad m365group recyclebinitem list [options]
 ## Options
 
 ```md definition-list
-`-d, --groupDisplayName [groupDisplayName]`
+`-d, --groupName [groupName]`
 : Lists groups with DisplayName starting with the specified value
 
 `-m, --groupMailNickname [groupMailNickname]`
@@ -41,7 +41,7 @@ m365 entra m365group recyclebinitem list
 List deleted Microsoft 365 Groups with display name starting with _Project_
 
 ```sh
-m365 entra m365group recyclebinitem list --groupDisplayName Project
+m365 entra m365group recyclebinitem list --groupName Project
 ```
 
 List deleted Microsoft 365 Groups mail nick name starting with _team_
@@ -53,7 +53,7 @@ m365 entra m365group recyclebinitem list --groupMailNickname team
 List deleted Microsoft 365 Groups mail nick name starting with _team_ and with display name starting with _Project_
 
 ```sh
-m365 entra m365group recyclebinitem list --groupMailNickname team --groupDisplayName Project
+m365 entra m365group recyclebinitem list --groupMailNickname team --groupName Project
 ```
 
 ## Response

package/docs/docs/cmd/entra/m365group/m365group-user-list.mdx

@@ -28,7 +28,7 @@ m365 aad m365group user list [options]
 : The display name of the Microsoft 365 group. Specify `groupId` or `groupDisplayName` but not both.
 
 `-r, --role [role]`
-: Filter the results to only users with the given role. Allowed values: `Owner`, `Member`, or (Deprecated) `Guest`.
+: Filter the results to only users with the given role. Allowed values: `Owner`, `Member`.
 
 `-p, --properties [properties]`
 : Comma-separated list of properties to retrieve.

package/docs/docs/cmd/outlook/message/message-get.mdx

@@ -19,10 +19,10 @@ m365 outlook message get [options]
 : ID of the message.
 
 `--userId [userId]`
-: ID of the user from which to retrieve the message. Specify either `userId` or `userPrincipalName`, but not both. This option is required when using application permissions.
+: ID of the user from which to retrieve the message. Specify either `userId` or `userName`, but not both. This option is required when using application permissions.
 
-`--userPrincipalName [userPrincipalName]`
-: UPN of the user from which to retrieve the message Specify either `userId` or `userPrincipalName`, but not both. This option is required when using application permissions.
+`--userName [userName]`
+: UPN of the user from which to retrieve the message Specify either `userId` or `userName`, but not both. This option is required when using application permissions.
 ```
 
 <Global />
@@ -38,7 +38,7 @@ m365 outlook message get --id AAMkAGVmMDEzMTM4LTZmYWUtNDdkNC1hMDZiLTU1OGY5OTZhYm
 Get a specific message using delegated permissions from a shared mailbox.
 
 ```sh
-m365 outlook message get --id AAMkAGVmMDEzMTM4LTZmYWUtNDdkNC1hMDZiLTU1OGY5OTZhYmY4OABGAAAAAAAiQ8W967B7TKBjgx9rVEURBwAiIsqMbYjsT5e-T7KzowPTAAAAAAEMAAAiIsqMbYjsT5e-T7KzowPTAALvuv07AAA= --userPrincipalName sharedmailbox@tenant.com
+m365 outlook message get --id AAMkAGVmMDEzMTM4LTZmYWUtNDdkNC1hMDZiLTU1OGY5OTZhYmY4OABGAAAAAAAiQ8W967B7TKBjgx9rVEURBwAiIsqMbYjsT5e-T7KzowPTAAAAAAEMAAAiIsqMbYjsT5e-T7KzowPTAALvuv07AAA= --userName sharedmailbox@tenant.com
 ```
 
 Get a specific message from a specific user retrieved by user ID using application permissions.
@@ -50,7 +50,7 @@ m365 outlook message get --id AAMkAGVmMDEzMTM4LTZmYWUtNDdkNC1hMDZiLTU1OGY5OTZhYm
 Get a specific message from a specific user retrieved by user principal name using application permissions.
 
 ```sh
-m365 outlook message get --id AAMkAGVmMDEzMTM4LTZmYWUtNDdkNC1hMDZiLTU1OGY5OTZhYmY4OABGAAAAAAAiQ8W967B7TKBjgx9rVEURBwAiIsqMbYjsT5e-T7KzowPTAAAAAAEMAAAiIsqMbYjsT5e-T7KzowPTAALvuv07AAA= --userPrincipalName user@tenant.com
+m365 outlook message get --id AAMkAGVmMDEzMTM4LTZmYWUtNDdkNC1hMDZiLTU1OGY5OTZhYmY4OABGAAAAAAAiQ8W967B7TKBjgx9rVEURBwAiIsqMbYjsT5e-T7KzowPTAAAAAAEMAAAiIsqMbYjsT5e-T7KzowPTAALvuv07AAA= --userName user@tenant.com
 ```
 
 ## Response