@pnp/cli-microsoft365 10.11.0-beta.c2217b6 → 10.11.0

package/dist/m365/entra/commands/app/app-role-add.js

@@ -6,10 +6,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _EntraAppRoleAddCommand_instances, _a, _EntraAppRoleAddCommand_initTelemetry, _EntraAppRoleAddCommand_initOptions, _EntraAppRoleAddCommand_initValidators, _EntraAppRoleAddCommand_initOptionSets;
 import { v4 } from 'uuid';
 import request from '../../../../request.js';
-import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { cli } from '../../../../cli/cli.js';
 import { entraApp } from '../../../../utils/entraApp.js';
 class EntraAppRoleAddCommand extends GraphCommand {
     get name() {
@@ -28,8 +26,7 @@ class EntraAppRoleAddCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         try {
-            const appId = await this.getAppObjectId(args, logger);
-            const appInfo = await this.getAppInfo(appId, logger);
+            const appInfo = await this.getAppInfo(args, logger);
             if (this.verbose) {
                 await logger.logToStderr(`Adding role ${args.options.name} to Microsoft Entra app ${appInfo.id}...`);
             }
@@ -55,19 +52,6 @@ class EntraAppRoleAddCommand extends GraphCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getAppInfo(appId, logger) {
-        if (this.verbose) {
-            await logger.logToStderr(`Retrieving information about roles for Microsoft Entra app ${appId}...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications/${appId}?$select=id,appRoles`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request.get(requestOptions);
-    }
     getAllowedMemberTypes(args) {
         switch (args.options.allowedMembers) {
             case 'usersGroups':
@@ -80,36 +64,19 @@ class EntraAppRoleAddCommand extends GraphCommand {
                 return [];
         }
     }
-    async getAppObjectId(args, logger) {
-        if (args.options.appObjectId) {
-            return args.options.appObjectId;
-        }
-        const { appId, appName } = args.options;
+    async getAppInfo(args, logger) {
+        const { appObjectId, appId, appName } = args.options;
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving information about Microsoft Entra app ${appId ? appId : appName}...`);
+            await logger.logToStderr(`Retrieving information about Microsoft Entra app ${appObjectId ? appObjectId : (appId ? appId : appName)}...`);
+        }
+        if (appObjectId) {
+            return await entraApp.getAppRegistrationByObjectId(appObjectId, ['id', 'appRoles']);
         }
-        if (appId) {
-            const app = await entraApp.getAppRegistrationByAppId(appId, ['id']);
-            return app.id;
+        else if (appId) {
+            return await entraApp.getAppRegistrationByAppId(appId, ['id', 'appRoles']);
         }
         else {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/myorganization/applications?$filter=displayName eq '${formatting.encodeQueryParameter(appName)}'&$select=id`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            const res = await request.get(requestOptions);
-            if (res.value.length === 1) {
-                return res.value[0].id;
-            }
-            if (res.value.length === 0) {
-                throw `No Microsoft Entra application registration with name ${appName} found`;
-            }
-            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-            const result = await cli.handleMultipleResultsFound(`Multiple Microsoft Entra application registrations with name '${appName}' found.`, resultAsKeyValuePair);
-            return result.id;
+            return await entraApp.getAppRegistrationByAppName(appName, ['id', 'appRoles']);
         }
     }
 }

package/dist/m365/entra/commands/app/app-role-list.js

@@ -4,12 +4,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _EntraAppRoleListCommand_instances, _EntraAppRoleListCommand_initTelemetry, _EntraAppRoleListCommand_initOptions, _EntraAppRoleListCommand_initOptionSets;
-import request from '../../../../request.js';
-import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { cli } from '../../../../cli/cli.js';
 import { entraApp } from '../../../../utils/entraApp.js';
 class EntraAppRoleListCommand extends GraphCommand {
     get name() {
@@ -51,23 +48,8 @@ class EntraAppRoleListCommand extends GraphCommand {
             return app.id;
         }
         else {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/myorganization/applications?$filter=displayName eq '${formatting.encodeQueryParameter(appName)}'&$select=id`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            const res = await request.get(requestOptions);
-            if (res.value.length === 1) {
-                return res.value[0].id;
-            }
-            if (res.value.length === 0) {
-                throw `No Microsoft Entra application registration with name ${appName} found`;
-            }
-            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-            const result = await cli.handleMultipleResultsFound(`Multiple Microsoft Entra application registrations with name '${appName}' found.`, resultAsKeyValuePair);
-            return result.id;
+            const app = await entraApp.getAppRegistrationByAppName(appName, ["id"]);
+            return app.id;
         }
     }
 }

package/dist/m365/entra/commands/app/app-role-remove.js

@@ -46,8 +46,7 @@ class EntraAppRoleRemoveCommand extends GraphCommand {
         }
     }
     async processAppRoleDelete(logger, args) {
-        const appObjectId = await this.getAppObjectId(args, logger);
-        const app = await this.getEntraApp(appObjectId, logger);
+        const app = await this.getEntraApp(args, logger);
         const appRoleDeleteIdentifierNameValue = args.options.name ? `name '${args.options.name}'` : (args.options.claim ? `claim '${args.options.claim}'` : `id '${args.options.id}'`);
         if (this.verbose) {
             await logger.logToStderr(`Deleting role with ${appRoleDeleteIdentifierNameValue} from Microsoft Entra app ${app.id}...`);
@@ -109,49 +108,19 @@ class EntraAppRoleRemoveCommand extends GraphCommand {
         };
         return request.patch(requestOptions);
     }
-    async getEntraApp(appObjectId, logger) {
+    async getEntraApp(args, logger) {
+        const { appObjectId, appId, appName } = args.options;
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving app roles information for the Microsoft Entra app ${appObjectId}...`);
+            await logger.logToStderr(`Retrieving information about Microsoft Entra app ${appObjectId ? appObjectId : (appId ? appId : appName)}...`);
         }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications/${appObjectId}?$select=id,appRoles`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request.get(requestOptions);
-    }
-    async getAppObjectId(args, logger) {
-        if (args.options.appObjectId) {
-            return args.options.appObjectId;
-        }
-        const { appId, appName } = args.options;
-        if (this.verbose) {
-            await logger.logToStderr(`Retrieving information about Microsoft Entra app ${appId ? appId : appName}...`);
+        if (appObjectId) {
+            return await entraApp.getAppRegistrationByObjectId(appObjectId, ['id', 'appRoles']);
         }
-        if (appId) {
-            const app = await entraApp.getAppRegistrationByAppId(appId, ['id']);
-            return app.id;
+        else if (appId) {
+            return await entraApp.getAppRegistrationByAppId(appId, ['id', 'appRoles']);
         }
         else {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/myorganization/applications?$filter=displayName eq '${formatting.encodeQueryParameter(appName)}'&$select=id`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            const res = await request.get(requestOptions);
-            if (res.value.length === 1) {
-                return res.value[0].id;
-            }
-            if (res.value.length === 0) {
-                throw `No Microsoft Entra application registration with name ${appName} found`;
-            }
-            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-            const result = (await cli.handleMultipleResultsFound(`Multiple Microsoft Entra application registrations with name '${appName}' found.`, resultAsKeyValuePair));
-            return result.id;
+            return await entraApp.getAppRegistrationByAppName(appName, ['id', 'appRoles']);
         }
     }
 }

package/dist/m365/entra/commands/app/app-set.js

@@ -6,10 +6,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _EntraAppSetCommand_instances, _a, _EntraAppSetCommand_initTelemetry, _EntraAppSetCommand_initOptions, _EntraAppSetCommand_initValidators, _EntraAppSetCommand_initOptionSets, _EntraAppSetCommand_initTypes;
 import fs from 'fs';
 import request from '../../../../request.js';
-import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { cli } from '../../../../cli/cli.js';
 import { optionsUtils } from '../../../../utils/optionsUtils.js';
 import { entraApp } from '../../../../utils/entraApp.js';
 class EntraAppSetCommand extends GraphCommand {
@@ -57,23 +55,8 @@ class EntraAppSetCommand extends GraphCommand {
             return app.id;
         }
         else {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/myorganization/applications?$filter=displayName eq '${formatting.encodeQueryParameter(name)}'&$select=id`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            const res = await request.get(requestOptions);
-            if (res.value.length === 1) {
-                return res.value[0].id;
-            }
-            if (res.value.length === 0) {
-                throw `No Microsoft Entra application registration with name ${name} found`;
-            }
-            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-            const result = await cli.handleMultipleResultsFound(`Multiple Microsoft Entra application registration with name '${name}' found.`, resultAsKeyValuePair);
-            return result.id;
+            const app = await entraApp.getAppRegistrationByAppName(name, ["id"]);
+            return app.id;
         }
     }
     async updateUnknownOptions(args, objectId) {

package/dist/m365/entra/commands/group/group-member-add.js

@@ -32,13 +32,16 @@ class EntraGroupMemberAddCommand extends GraphCommand {
             if (args.options.groupDisplayName) {
                 await this.warn(logger, `Option 'groupDisplayName' is deprecated and will be removed in the next major release.`);
             }
+            if (args.options.ids) {
+                await this.warn(logger, `Option 'ids' is deprecated and will be removed in the next major release. Please use 'userIds' instead.`);
+            }
             if (this.verbose) {
-                await logger.logToStderr(`Adding member(s) ${args.options.ids || args.options.userNames} to group ${args.options.groupId || args.options.groupDisplayName || args.options.groupName}...`);
+                await logger.logToStderr(`Adding member(s) ${args.options.ids || args.options.userIds || args.options.userNames || args.options.subgroupIds || args.options.subgroupNames} to group ${args.options.groupId || args.options.groupDisplayName || args.options.groupName}...`);
             }
             const groupId = await this.getGroupId(logger, args.options);
-            const userIds = await this.getUserIds(logger, args.options);
-            for (let i = 0; i < userIds.length; i += 400) {
-                const userIdsBatch = userIds.slice(i, i + 400);
+            const objectIds = await this.getObjectIds(logger, args.options);
+            for (let i = 0; i < objectIds.length; i += 400) {
+                const objectIdsBatch = objectIds.slice(i, i + 400);
                 const requestOptions = {
                     url: `${this.resource}/v1.0/$batch`,
                     headers: {
@@ -49,8 +52,8 @@ class EntraGroupMemberAddCommand extends GraphCommand {
                         requests: []
                     }
                 };
-                for (let j = 0; j < userIdsBatch.length; j += 20) {
-                    const userIdsChunk = userIdsBatch.slice(j, j + 20);
+                for (let j = 0; j < objectIdsBatch.length; j += 20) {
+                    const objectIdsChunk = objectIdsBatch.slice(j, j + 20);
                     requestOptions.data.requests.push({
                         id: j + 1,
                         method: 'PATCH',
@@ -59,7 +62,7 @@ class EntraGroupMemberAddCommand extends GraphCommand {
                             'content-type': 'application/json;odata.metadata=none'
                         },
                         body: {
-                            [`${args.options.role === 'Member' ? 'members' : 'owners'}@odata.bind`]: userIdsChunk.map(u => `${this.resource}/v1.0/directoryObjects/${u}`)
+                            [`${args.options.role === 'Member' ? 'members' : 'owners'}@odata.bind`]: objectIdsChunk.map(u => `${this.resource}/v1.0/directoryObjects/${u}`)
                         }
                     });
                 }
@@ -84,15 +87,33 @@ class EntraGroupMemberAddCommand extends GraphCommand {
         }
         return entraGroup.getGroupIdByDisplayName(options.groupDisplayName || options.groupName);
     }
+    async getObjectIds(logger, options) {
+        if (options.ids || options.userIds || options.userNames) {
+            return this.getUserIds(logger, options);
+        }
+        return this.getGroupIds(logger, options);
+    }
     async getUserIds(logger, options) {
         if (options.ids) {
             return options.ids.split(',').map(i => i.trim());
         }
+        if (options.userIds) {
+            return options.userIds.split(',').map(i => i.trim());
+        }
         if (this.verbose) {
             await logger.logToStderr('Retrieving ID(s) of user(s)...');
         }
         return entraUser.getUserIdsByUpns(options.userNames.split(',').map(u => u.trim()));
     }
+    async getGroupIds(logger, options) {
+        if (options.subgroupIds) {
+            return options.subgroupIds.split(',').map(i => i.trim());
+        }
+        if (this.verbose) {
+            await logger.logToStderr('Retrieving ID(s) of group(s)...');
+        }
+        return entraGroup.getGroupIdsByDisplayNames(options.subgroupNames.split(',').map(u => u.trim()));
+    }
 }
 _EntraGroupMemberAddCommand_instances = new WeakSet(), _EntraGroupMemberAddCommand_initTelemetry = function _EntraGroupMemberAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -101,7 +122,10 @@ _EntraGroupMemberAddCommand_instances = new WeakSet(), _EntraGroupMemberAddComma
             groupDisplayName: typeof args.options.groupDisplayName !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
             ids: typeof args.options.ids !== 'undefined',
-            userNames: typeof args.options.userNames !== 'undefined'
+            userIds: typeof args.options.userIds !== 'undefined',
+            userNames: typeof args.options.userNames !== 'undefined',
+            subgroupIds: typeof args.options.subgroupIds !== 'undefined',
+            subgroupNames: typeof args.options.subgroupNames !== 'undefined'
         });
     });
 }, _EntraGroupMemberAddCommand_initOptions = function _EntraGroupMemberAddCommand_initOptions() {
@@ -113,8 +137,14 @@ _EntraGroupMemberAddCommand_instances = new WeakSet(), _EntraGroupMemberAddComma
         option: '-n, --groupName [groupName]'
     }, {
         option: '--ids [ids]'
+    }, {
+        option: '--userIds [userIds]'
     }, {
         option: '--userNames [userNames]'
+    }, {
+        option: '--subgroupIds [subgroupIds]'
+    }, {
+        option: '--subgroupNames [subgroupNames]'
     }, {
         option: '-r, --role <role>',
         autocomplete: this.roleValues
@@ -130,21 +160,36 @@ _EntraGroupMemberAddCommand_instances = new WeakSet(), _EntraGroupMemberAddComma
                 return `The following GUIDs are invalid for the option 'ids': ${isValidGUIDArrayResult}.`;
             }
         }
+        if (args.options.userIds) {
+            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.userIds);
+            if (isValidGUIDArrayResult !== true) {
+                return `The following GUIDs are invalid for the option 'userIds': ${isValidGUIDArrayResult}.`;
+            }
+        }
         if (args.options.userNames) {
             const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.userNames);
             if (isValidUPNArrayResult !== true) {
                 return `The following user principal names are invalid for the option 'userNames': ${isValidUPNArrayResult}.`;
             }
         }
+        if (args.options.subgroupIds) {
+            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.subgroupIds);
+            if (isValidGUIDArrayResult !== true) {
+                return `The following GUIDs are invalid for the option 'subgroupIds': ${isValidGUIDArrayResult}.`;
+            }
+        }
+        if ((args.options.subgroupIds || args.options.subgroupNames) && args.options.role === 'Owner') {
+            return `Subgroups cannot be set as owners.`;
+        }
         if (this.roleValues.indexOf(args.options.role) === -1) {
             return `Option 'role' must be one of the following values: ${this.roleValues.join(', ')}.`;
         }
         return true;
     });
 }, _EntraGroupMemberAddCommand_initOptionSets = function _EntraGroupMemberAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupDisplayName', 'groupName'] }, { options: ['ids', 'userNames'] });
+    this.optionSets.push({ options: ['groupId', 'groupDisplayName', 'groupName'] }, { options: ['ids', 'userIds', 'userNames', 'subgroupIds', 'subgroupNames'] });
 }, _EntraGroupMemberAddCommand_initTypes = function _EntraGroupMemberAddCommand_initTypes() {
-    this.types.string.push('groupId', 'groupDisplayName', 'groupName', 'ids', 'userNames', 'role');
+    this.types.string.push('groupId', 'groupDisplayName', 'groupName', 'ids', 'userIds', 'userNames', 'subgroupIds', 'subgroupNames', 'role');
 };
 export default new EntraGroupMemberAddCommand();
 //# sourceMappingURL=group-member-add.js.map

package/dist/m365/entra/commands/group/group-member-set.js

@@ -32,8 +32,11 @@ class EntraGroupMemberSetCommand extends GraphCommand {
             if (args.options.groupDisplayName) {
                 await this.warn(logger, `Option 'groupDisplayName' is deprecated and will be removed in the next major release.`);
             }
+            if (args.options.ids) {
+                await this.warn(logger, `Option 'ids' is deprecated and will be removed in the next major release. Please use 'userIds' instead.`);
+            }
             if (this.verbose) {
-                await logger.logToStderr(`Adding member(s) ${args.options.ids || args.options.userNames} to role ${args.options.role} of group ${args.options.groupId || args.options.groupDisplayName || args.options.groupName}...`);
+                await logger.logToStderr(`Adding member(s) ${args.options.ids || args.options.userIds || args.options.userNames} to role ${args.options.role} of group ${args.options.groupId || args.options.groupDisplayName || args.options.groupName}...`);
             }
             const groupId = await this.getGroupId(logger, args.options);
             const userIds = await this.getUserIds(logger, args.options);
@@ -60,6 +63,9 @@ class EntraGroupMemberSetCommand extends GraphCommand {
         if (options.ids) {
             return options.ids.split(',').map(i => i.trim());
         }
+        if (options.userIds) {
+            return options.userIds.split(',').map(i => i.trim());
+        }
         if (this.verbose) {
             await logger.logToStderr('Retrieving ID(s) of user(s)...');
         }
@@ -163,6 +169,7 @@ _EntraGroupMemberSetCommand_instances = new WeakSet(), _EntraGroupMemberSetComma
             groupDisplayName: typeof args.options.groupDisplayName !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
             ids: typeof args.options.ids !== 'undefined',
+            userIds: typeof args.options.userIds !== 'undefined',
             userNames: typeof args.options.userNames !== 'undefined'
         });
     });
@@ -175,6 +182,8 @@ _EntraGroupMemberSetCommand_instances = new WeakSet(), _EntraGroupMemberSetComma
         option: '-n, --groupName [groupName]'
     }, {
         option: '--ids [ids]'
+    }, {
+        option: '--userIds [userIds]'
     }, {
         option: '--userNames [userNames]'
     }, {
@@ -192,6 +201,12 @@ _EntraGroupMemberSetCommand_instances = new WeakSet(), _EntraGroupMemberSetComma
                 return `'${isValidGUIDArrayResult}' is not a valid GUID for option 'ids'.`;
             }
         }
+        if (args.options.userIds) {
+            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.userIds);
+            if (isValidGUIDArrayResult !== true) {
+                return `The following GUIDs are invalid for the option 'userIds': ${isValidGUIDArrayResult}.`;
+            }
+        }
         if (args.options.userNames) {
             const isValidUserPrincipalNameArray = validation.isValidUserPrincipalNameArray(args.options.userNames);
             if (isValidUserPrincipalNameArray !== true) {
@@ -204,9 +219,9 @@ _EntraGroupMemberSetCommand_instances = new WeakSet(), _EntraGroupMemberSetComma
         return true;
     });
 }, _EntraGroupMemberSetCommand_initOptionSets = function _EntraGroupMemberSetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupDisplayName', 'groupName'] }, { options: ['ids', 'userNames'] });
+    this.optionSets.push({ options: ['groupId', 'groupDisplayName', 'groupName'] }, { options: ['ids', 'userIds', 'userNames'] });
 }, _EntraGroupMemberSetCommand_initTypes = function _EntraGroupMemberSetCommand_initTypes() {
-    this.types.string.push('groupId', 'groupDisplayName', 'groupName', 'ids', 'userNames', 'role');
+    this.types.string.push('groupId', 'groupDisplayName', 'groupName', 'ids', 'userIds', 'userNames', 'role');
 };
 export default new EntraGroupMemberSetCommand();
 //# sourceMappingURL=group-member-set.js.map

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

@@ -9,7 +9,7 @@ import { formatting } from '../../../../utils/formatting.js';
 import commands from '../../commands.js';
 import { Outlook } from '../../Outlook.js';
 import { cli } from '../../../../cli/cli.js';
-import DelegatedGraphCommand from '../../../base/DelegatedGraphCommand.js';
+import DelegatedGraphCommand from '../../../base/GraphDelegatedCommand.js';
 class OutlookMessageMoveCommand extends DelegatedGraphCommand {
     get name() {
         return commands.MESSAGE_MOVE;

package/dist/m365/pp/commands/managementapp/managementapp-add.js

@@ -5,11 +5,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PpManagementAppAddCommand_instances, _PpManagementAppAddCommand_initTelemetry, _PpManagementAppAddCommand_initOptions, _PpManagementAppAddCommand_initValidators, _PpManagementAppAddCommand_initOptionSets;
 import request from '../../../../request.js';
-import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
-import { cli } from '../../../../cli/cli.js';
+import { entraApp } from '../../../../utils/entraApp.js';
 class PpManagementAppAddCommand extends PowerPlatformCommand {
     get name() {
         return commands.MANAGEMENTAPP_ADD;
@@ -48,27 +47,14 @@ class PpManagementAppAddCommand extends PowerPlatformCommand {
             return args.options.appId;
         }
         const { objectId, name } = args.options;
-        const filter = objectId ?
-            `id eq '${formatting.encodeQueryParameter(objectId)}'` :
-            `displayName eq '${formatting.encodeQueryParameter(name)}'`;
-        const requestOptions = {
-            url: `https://graph.microsoft.com/v1.0/myorganization/applications?$filter=${filter}&$select=appId`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        const entraApps = await request.get((requestOptions));
-        if (entraApps.value.length === 0) {
-            const applicationIdentifier = objectId ? `ID ${objectId}` : `name ${name}`;
-            throw `No Microsoft Entra application registration with ${applicationIdentifier} found`;
+        if (objectId) {
+            const app = await entraApp.getAppRegistrationByObjectId(objectId, ['appId']);
+            return app.appId;
         }
-        if (entraApps.value.length === 1 && entraApps.value[0].appId) {
-            return entraApps.value[0].appId;
+        else {
+            const app = await entraApp.getAppRegistrationByAppName(name, ['appId']);
+            return app.appId;
         }
-        const resultAsKeyValuePair = formatting.convertArrayToHashTable('appId', entraApps.value);
-        const result = await cli.handleMultipleResultsFound(`Multiple Microsoft Entra application registrations with name '${name}' found.`, resultAsKeyValuePair);
-        return result.appId;
     }
 }
 _PpManagementAppAddCommand_instances = new WeakSet(), _PpManagementAppAddCommand_initTelemetry = function _PpManagementAppAddCommand_initTelemetry() {

package/dist/m365/spe/commands/container/container-recyclebinitem-restore.js

@@ -0,0 +1,96 @@
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import { spo } from '../../../../utils/spo.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import { spe } from '../../../../utils/spe.js';
+import { odata } from '../../../../utils/odata.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { cli } from '../../../../cli/cli.js';
+import request from '../../../../request.js';
+const options = globalOptionsZod
+    .extend({
+    containerTypeId: z.string()
+        .refine(id => validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    })).optional(),
+    containerTypeName: z.string().optional(),
+    id: z.string().optional(),
+    name: z.string().optional()
+})
+    .strict();
+class SpeContainerRecycleBinItemRestoreCommand extends GraphCommand {
+    get name() {
+        return commands.CONTAINER_RECYCLEBINITEM_RESTORE;
+    }
+    get description() {
+        return 'Restores a deleted container';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine((options) => [options.id, options.name].filter(o => o !== undefined).length === 1, {
+            message: 'Use one of the following options: id or name.'
+        })
+            .refine((options) => !options.name || [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 1, {
+            message: 'Use one of the following options when specifying the container name: containerTypeId or containerTypeName.'
+        })
+            .refine((options) => options.name || [options.containerTypeId, options.containerTypeName].filter(o => o !== undefined).length === 0, {
+            message: 'Options containerTypeId and containerTypeName are only required when restoring a container by name.'
+        });
+    }
+    async commandAction(logger, args) {
+        try {
+            const containerId = await this.getContainerId(args.options, logger);
+            if (this.verbose) {
+                await logger.logToStderr(`Restoring deleted container with ID '${containerId}'...`);
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/storage/fileStorage/deletedContainers/${containerId}/restore`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getContainerId(options, logger) {
+        if (options.id) {
+            return options.id;
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving container with name '${options.name}'...`);
+        }
+        const containerTypeId = await this.getContainerTypeId(options, logger);
+        const containers = await odata.getAllItems(`${this.resource}/v1.0/storage/fileStorage/deletedContainers?$filter=containerTypeId eq ${containerTypeId}&$select=id,displayName`);
+        const matchingContainers = containers.filter(c => c.displayName.toLowerCase() === options.name.toLowerCase());
+        if (matchingContainers.length === 0) {
+            throw new Error(`The specified container '${options.name}' does not exist.`);
+        }
+        if (matchingContainers.length > 1) {
+            const containerKeyValuePair = formatting.convertArrayToHashTable('id', matchingContainers);
+            const container = await cli.handleMultipleResultsFound(`Multiple containers with name '${options.name}' found.`, containerKeyValuePair);
+            return container.id;
+        }
+        return matchingContainers[0].id;
+    }
+    async getContainerTypeId(options, logger) {
+        if (options.containerTypeId) {
+            return options.containerTypeId;
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Getting container type with name '${options.containerTypeName}'...`);
+        }
+        const adminUrl = await spo.getSpoAdminUrl(logger, this.verbose);
+        return spe.getContainerTypeIdByName(adminUrl, options.containerTypeName);
+    }
+}
+export default new SpeContainerRecycleBinItemRestoreCommand();
+//# sourceMappingURL=container-recyclebinitem-restore.js.map

package/dist/m365/spe/commands.js

@@ -7,6 +7,7 @@ export default {
     CONTAINER_REMOVE: `${prefix} container remove`,
     CONTAINER_PERMISSION_LIST: `${prefix} container permission list`,
     CONTAINER_RECYCLEBINITEM_LIST: `${prefix} container recyclebinitem list`,
+    CONTAINER_RECYCLEBINITEM_RESTORE: `${prefix} container recyclebinitem restore`,
     CONTAINERTYPE_ADD: `${prefix} containertype add`,
     CONTAINERTYPE_GET: `${prefix} containertype get`,
     CONTAINERTYPE_LIST: `${prefix} containertype list`,

package/dist/m365/spfx/commands/project/base-project-command.js

@@ -43,6 +43,7 @@ export class BaseProjectCommand extends AnonymousCommand {
         this.readAndParseJsonFile(path.join(projectRootPath, 'tslint.json'), project, 'tsLintJsonRoot');
         this.readAndParseJsonFile(path.join(projectRootPath, 'config', 'write-manifests.json'), project, 'writeManifestsJson');
         this.readAndParseJsonFile(path.join(projectRootPath, '.yo-rc.json'), project, 'yoRcJson');
+        this.readAndParseJsonFile(path.join(projectRootPath, 'config', 'sass.json'), project, 'sassJson');
         const gulpfileJsPath = path.join(projectRootPath, 'gulpfile.js');
         if (fs.existsSync(gulpfileJsPath)) {
             project.gulpfileJs = {

package/dist/m365/spfx/commands/project/project-doctor/doctor-1.21.0.js

@@ -8,6 +8,7 @@ import { FN002013_DEVDEP_types_webpack_env } from './rules/FN002013_DEVDEP_types
 import { FN002015_DEVDEP_types_react } from './rules/FN002015_DEVDEP_types_react.js';
 import { FN002016_DEVDEP_types_react_dom } from './rules/FN002016_DEVDEP_types_react_dom.js';
 import { FN002019_DEVDEP_microsoft_rush_stack_compiler } from './rules/FN002019_DEVDEP_microsoft_rush_stack_compiler.js';
+import { FN002022_DEVDEP_typescript } from './rules/FN002022_DEVDEP_typescript.js';
 import { FN021001_PKG_spfx_deps_versions_match_project_version } from './rules/FN021001_PKG_spfx_deps_versions_match_project_version.js';
 export default [
     new FN001008_DEP_react('17'),
@@ -20,6 +21,7 @@ export default [
     new FN002016_DEVDEP_types_react_dom('17'),
     new FN002019_DEVDEP_microsoft_rush_stack_compiler(['5.3']),
     new FN002021_DEVDEP_rushstack_eslint_config('4.0.1'),
+    new FN002022_DEVDEP_typescript('~5.3.3'),
     new FN021001_PKG_spfx_deps_versions_match_project_version(true)
 ];
 //# sourceMappingURL=doctor-1.21.0.js.map

package/dist/m365/spfx/commands/project/project-doctor/doctor-1.21.1.js

@@ -8,6 +8,7 @@ import { FN002013_DEVDEP_types_webpack_env } from './rules/FN002013_DEVDEP_types
 import { FN002015_DEVDEP_types_react } from './rules/FN002015_DEVDEP_types_react.js';
 import { FN002016_DEVDEP_types_react_dom } from './rules/FN002016_DEVDEP_types_react_dom.js';
 import { FN002019_DEVDEP_microsoft_rush_stack_compiler } from './rules/FN002019_DEVDEP_microsoft_rush_stack_compiler.js';
+import { FN002022_DEVDEP_typescript } from './rules/FN002022_DEVDEP_typescript.js';
 import { FN021001_PKG_spfx_deps_versions_match_project_version } from './rules/FN021001_PKG_spfx_deps_versions_match_project_version.js';
 export default [
     new FN001008_DEP_react('17'),
@@ -20,6 +21,7 @@ export default [
     new FN002016_DEVDEP_types_react_dom('17'),
     new FN002019_DEVDEP_microsoft_rush_stack_compiler(['5.3']),
     new FN002021_DEVDEP_rushstack_eslint_config('4.0.1'),
+    new FN002022_DEVDEP_typescript('~5.3.3'),
     new FN021001_PKG_spfx_deps_versions_match_project_version(true)
 ];
 //# sourceMappingURL=doctor-1.21.1.js.map