@pnp/cli-microsoft365 9.0.0-beta.d6b190a → 9.0.0-beta.e16d09c

package/dist/Auth.js

@@ -691,7 +691,7 @@ export class Auth {
         const allConnections = await this.getAllConnections();
         const connection = allConnections.find(i => i.name === name);
         if (!connection) {
-            throw new CommandError(`The connection '${name}' cannot be found`);
+            throw new CommandError(`The connection '${name}' cannot be found.`);
         }
         return connection;
     }

package/dist/m365/connection/commands/connection-remove.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 _ConnectionRemoveCommand_instances, _ConnectionRemoveCommand_initTelemetry, _ConnectionRemoveCommand_initOptions;
+var _ConnectionRemoveCommand_instances, _ConnectionRemoveCommand_initTelemetry, _ConnectionRemoveCommand_initOptions, _ConnectionRemoveCommand_initTypes;
 import auth from '../../../Auth.js';
 import commands from '../commands.js';
 import Command, { CommandError } from '../../../Command.js';
@@ -20,6 +20,7 @@ class ConnectionRemoveCommand extends Command {
         _ConnectionRemoveCommand_instances.add(this);
         __classPrivateFieldGet(this, _ConnectionRemoveCommand_instances, "m", _ConnectionRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _ConnectionRemoveCommand_instances, "m", _ConnectionRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _ConnectionRemoveCommand_instances, "m", _ConnectionRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         const deleteConnection = async () => {
@@ -53,7 +54,7 @@ class ConnectionRemoveCommand extends Command {
 _ConnectionRemoveCommand_instances = new WeakSet(), _ConnectionRemoveCommand_initTelemetry = function _ConnectionRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            force: (!(!args.options.force)).toString()
+            force: !!args.options.force
         });
     });
 }, _ConnectionRemoveCommand_initOptions = function _ConnectionRemoveCommand_initOptions() {
@@ -62,6 +63,9 @@ _ConnectionRemoveCommand_instances = new WeakSet(), _ConnectionRemoveCommand_ini
     }, {
         option: '-f, --force'
     });
+}, _ConnectionRemoveCommand_initTypes = function _ConnectionRemoveCommand_initTypes() {
+    this.types.string.push('name');
+    this.types.boolean.push('force');
 };
 export default new ConnectionRemoveCommand();
 //# sourceMappingURL=connection-remove.js.map

package/dist/m365/connection/commands/connection-set.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 _ConnectionSetCommand_instances, _ConnectionSetCommand_initOptions, _ConnectionSetCommand_initValidators;
+var _ConnectionSetCommand_instances, _ConnectionSetCommand_initOptions, _ConnectionSetCommand_initValidators, _ConnectionSetCommand_initTypes;
 import auth from '../../../Auth.js';
 import commands from '../commands.js';
 import Command, { CommandError } from '../../../Command.js';
@@ -19,6 +19,7 @@ class ConnectionSetCommand extends Command {
         _ConnectionSetCommand_instances.add(this);
         __classPrivateFieldGet(this, _ConnectionSetCommand_instances, "m", _ConnectionSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _ConnectionSetCommand_instances, "m", _ConnectionSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _ConnectionSetCommand_instances, "m", _ConnectionSetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         const connection = await auth.getConnection(args.options.name);
@@ -51,6 +52,8 @@ _ConnectionSetCommand_instances = new WeakSet(), _ConnectionSetCommand_initOptio
         }
         return true;
     });
+}, _ConnectionSetCommand_initTypes = function _ConnectionSetCommand_initTypes() {
+    this.types.string.push('name', 'newName');
 };
 export default new ConnectionSetCommand();
 //# sourceMappingURL=connection-set.js.map

package/dist/m365/connection/commands/connection-use.js

@@ -3,10 +3,12 @@ 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 _ConnectionUseCommand_instances, _ConnectionUseCommand_initOptions;
+var _ConnectionUseCommand_instances, _ConnectionUseCommand_initTelemetry, _ConnectionUseCommand_initOptions, _ConnectionUseCommand_initTypes;
 import auth from '../../../Auth.js';
 import commands from '../commands.js';
 import Command, { CommandError } from '../../../Command.js';
+import { formatting } from '../../../utils/formatting.js';
+import { cli } from '../../../cli/cli.js';
 class ConnectionUseCommand extends Command {
     get name() {
         return commands.USE;
@@ -18,9 +20,20 @@ class ConnectionUseCommand extends Command {
         super();
         _ConnectionUseCommand_instances.add(this);
         __classPrivateFieldGet(this, _ConnectionUseCommand_instances, "m", _ConnectionUseCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _ConnectionUseCommand_instances, "m", _ConnectionUseCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _ConnectionUseCommand_instances, "m", _ConnectionUseCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        const connection = await auth.getConnection(args.options.name);
+        let connection;
+        if (args.options.name) {
+            connection = await auth.getConnection(args.options.name);
+        }
+        else {
+            const connections = await auth.getAllConnections();
+            connections.sort((a, b) => a.name.localeCompare(b.name));
+            const keyValuePair = formatting.convertArrayToHashTable('name', connections);
+            connection = await cli.handleMultipleResultsFound('Please select the connection you want to activate.', keyValuePair);
+        }
         if (this.verbose) {
             await logger.logToStderr(`Switching to connection '${connection.identityName}', appId: ${connection.appId}, tenantId: ${connection.identityTenantId}...`);
         }
@@ -42,10 +55,18 @@ class ConnectionUseCommand extends Command {
         await this.commandAction(logger, args);
     }
 }
-_ConnectionUseCommand_instances = new WeakSet(), _ConnectionUseCommand_initOptions = function _ConnectionUseCommand_initOptions() {
+_ConnectionUseCommand_instances = new WeakSet(), _ConnectionUseCommand_initTelemetry = function _ConnectionUseCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            name: typeof args.options.name !== 'undefined'
+        });
+    });
+}, _ConnectionUseCommand_initOptions = function _ConnectionUseCommand_initOptions() {
     this.options.unshift({
-        option: '-n, --name <name>'
+        option: '-n, --name [name]'
     });
+}, _ConnectionUseCommand_initTypes = function _ConnectionUseCommand_initTypes() {
+    this.types.string.push('name');
 };
 export default new ConnectionUseCommand();
 //# sourceMappingURL=connection-use.js.map

package/dist/m365/entra/commands/multitenant/multitenant-add.js

@@ -0,0 +1,65 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _EntraMultitenantAddCommand_instances, _EntraMultitenantAddCommand_initTelemetry, _EntraMultitenantAddCommand_initOptions, _EntraMultitenantAddCommand_initTypes;
+import request from '../../../../request.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+class EntraMultitenantAddCommand extends GraphCommand {
+    get name() {
+        return commands.MULTITENANT_ADD;
+    }
+    get description() {
+        return 'Creates a new multitenant organization';
+    }
+    constructor() {
+        super();
+        _EntraMultitenantAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraMultitenantAddCommand_instances, "m", _EntraMultitenantAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraMultitenantAddCommand_instances, "m", _EntraMultitenantAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraMultitenantAddCommand_instances, "m", _EntraMultitenantAddCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        if (this.verbose) {
+            await logger.logToStderr('Creating multitenant organization...');
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/tenantRelationships/multiTenantOrganization`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json',
+            data: {
+                description: args.options.description,
+                displayName: args.options.displayName
+            }
+        };
+        try {
+            const multitenantOrg = await request.put(requestOptions);
+            await logger.log(multitenantOrg);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+_EntraMultitenantAddCommand_instances = new WeakSet(), _EntraMultitenantAddCommand_initTelemetry = function _EntraMultitenantAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            displayName: typeof args.options.displayName !== 'undefined',
+            description: typeof args.options.description !== 'undefined'
+        });
+    });
+}, _EntraMultitenantAddCommand_initOptions = function _EntraMultitenantAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --displayName <displayName>'
+    }, {
+        option: '-d, --description [description]'
+    });
+}, _EntraMultitenantAddCommand_initTypes = function _EntraMultitenantAddCommand_initTypes() {
+    this.types.string.push('displayName', 'description');
+};
+export default new EntraMultitenantAddCommand();
+//# sourceMappingURL=multitenant-add.js.map

package/dist/m365/entra/commands/multitenant/multitenant-remove.js

@@ -0,0 +1,118 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _EntraMultitenantRemoveCommand_instances, _EntraMultitenantRemoveCommand_initTelemetry, _EntraMultitenantRemoveCommand_initOptions;
+import request from '../../../../request.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { odata } from '../../../../utils/odata.js';
+import { cli } from '../../../../cli/cli.js';
+class EntraMultitenantRemoveCommand extends GraphCommand {
+    get name() {
+        return commands.MULTITENANT_REMOVE;
+    }
+    get description() {
+        return 'Removes a multitenant organization';
+    }
+    constructor() {
+        super();
+        _EntraMultitenantRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraMultitenantRemoveCommand_instances, "m", _EntraMultitenantRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraMultitenantRemoveCommand_instances, "m", _EntraMultitenantRemoveCommand_initOptions).call(this);
+    }
+    async commandAction(logger, args) {
+        const removeMultitenantOrg = async () => {
+            try {
+                const tenantId = await this.getCurrentTenantId();
+                let tenantsId = await this.getAllTenantsIds();
+                const tenantsCount = tenantsId.length;
+                if (tenantsCount > 0) {
+                    const tasks = tenantsId
+                        .filter(x => x !== tenantId)
+                        .map(t => this.removeTenant(logger, t));
+                    await Promise.all(tasks);
+                    do {
+                        if (this.verbose) {
+                            await logger.logToStderr(`Waiting 30 seconds...`);
+                        }
+                        await new Promise(resolve => setTimeout(resolve, 30000));
+                        // from current behavior, removing tenant can take a few seconds
+                        // current tenant must be removed once all previous ones were removed
+                        if (this.verbose) {
+                            await logger.logToStderr(`Checking all tenants were removed...`);
+                        }
+                        tenantsId = await this.getAllTenantsIds();
+                        if (this.verbose) {
+                            await logger.logToStderr(`Number of removed tenants: ${tenantsCount - tenantsId.length}`);
+                        }
+                    } while (tenantsId.length !== 1);
+                    // current tenant must be removed as the last one
+                    await this.removeTenant(logger, tenantId);
+                    await logger.logToStderr('Your Multi-Tenant organization is being removed. This can take up to 2 hours.');
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        };
+        if (args.options.force) {
+            await removeMultitenantOrg();
+        }
+        else {
+            const result = await cli.promptForConfirmation({ message: 'Are you sure you want to remove multitenant organization?' });
+            if (result) {
+                await removeMultitenantOrg();
+            }
+        }
+    }
+    async getAllTenantsIds() {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/tenantRelationships/multiTenantOrganization/tenants?$select=tenantId`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const tenants = await odata.getAllItems(requestOptions);
+        return tenants.map(x => x.tenantId);
+    }
+    async getCurrentTenantId() {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/organization?$select=id`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const organizations = await odata.getAllItems(requestOptions);
+        return organizations[0].id;
+    }
+    async removeTenant(logger, tenantId) {
+        if (this.verbose) {
+            await logger.logToStderr(`Removing tenant: ${tenantId}`);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/tenantRelationships/multiTenantOrganization/tenants/${tenantId}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        await request.delete(requestOptions);
+    }
+}
+_EntraMultitenantRemoveCommand_instances = new WeakSet(), _EntraMultitenantRemoveCommand_initTelemetry = function _EntraMultitenantRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            force: !!args.options.force
+        });
+    });
+}, _EntraMultitenantRemoveCommand_initOptions = function _EntraMultitenantRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-f, --force'
+    });
+};
+export default new EntraMultitenantRemoveCommand();
+//# sourceMappingURL=multitenant-remove.js.map

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

@@ -0,0 +1,72 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _EntraMultitenantSetCommand_instances, _EntraMultitenantSetCommand_initTelemetry, _EntraMultitenantSetCommand_initOptions, _EntraMultitenantSetCommand_initValidators, _EntraMultitenantSetCommand_initTypes;
+import request from '../../../../request.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+class EntraMultitenantSetCommand extends GraphCommand {
+    get name() {
+        return commands.MULTITENANT_SET;
+    }
+    get description() {
+        return 'Updates the properties of a multitenant organization';
+    }
+    constructor() {
+        super();
+        _EntraMultitenantSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraMultitenantSetCommand_instances, "m", _EntraMultitenantSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraMultitenantSetCommand_instances, "m", _EntraMultitenantSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraMultitenantSetCommand_instances, "m", _EntraMultitenantSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraMultitenantSetCommand_instances, "m", _EntraMultitenantSetCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        if (this.verbose) {
+            await logger.logToStderr('Updating multitenant organization...');
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/tenantRelationships/multiTenantOrganization`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json',
+            data: {
+                description: args.options.description,
+                displayName: args.options.displayName
+            }
+        };
+        try {
+            await request.patch(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+_EntraMultitenantSetCommand_instances = new WeakSet(), _EntraMultitenantSetCommand_initTelemetry = function _EntraMultitenantSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            displayName: typeof args.options.displayName !== 'undefined',
+            description: typeof args.options.description !== 'undefined'
+        });
+    });
+}, _EntraMultitenantSetCommand_initOptions = function _EntraMultitenantSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --displayName [displayName]'
+    }, {
+        option: '-d, --description [description]'
+    });
+}, _EntraMultitenantSetCommand_initValidators = function _EntraMultitenantSetCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (!args.options.displayName && !args.options.description) {
+            return 'Specify either displayName or description or both.';
+        }
+        return true;
+    });
+}, _EntraMultitenantSetCommand_initTypes = function _EntraMultitenantSetCommand_initTypes() {
+    this.types.string.push('displayName', 'description');
+};
+export default new EntraMultitenantSetCommand();
+//# sourceMappingURL=multitenant-set.js.map

package/dist/m365/entra/commands.js

@@ -72,7 +72,10 @@ export default {
     M365GROUP_USER_LIST: `${prefix} m365group user list`,
     M365GROUP_USER_REMOVE: `${prefix} m365group user remove`,
     M365GROUP_USER_SET: `${prefix} m365group user set`,
+    MULTITENANT_ADD: `${prefix} multitenant add`,
     MULTITENANT_GET: `${prefix} multitenant get`,
+    MULTITENANT_REMOVE: `${prefix} multitenant remove`,
+    MULTITENANT_SET: `${prefix} multitenant set`,
     OAUTH2GRANT_ADD: `${prefix} oauth2grant add`,
     OAUTH2GRANT_LIST: `${prefix} oauth2grant list`,
     OAUTH2GRANT_REMOVE: `${prefix} oauth2grant remove`,

package/dist/m365/spo/commands/file/file-roleassignment-add.js

@@ -140,7 +140,7 @@ _SpoFileRoleAssignmentAddCommand_instances = new WeakSet(), _SpoFileRoleAssignme
     }, {
         option: '--fileUrl [fileUrl]'
     }, {
-        option: 'i, --fileId [fileId]'
+        option: '-i, --fileId [fileId]'
     }, {
         option: '--principalId [principalId]'
     }, {

package/dist/m365/spo/commands/file/file-roleinheritance-break.js

@@ -90,7 +90,7 @@ _SpoFileRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoFileRoleInher
     }, {
         option: '--fileUrl [fileUrl]'
     }, {
-        option: 'i, --fileId [fileId]'
+        option: '-i, --fileId [fileId]'
     }, {
         option: '-c, --clearExistingPermissions'
     }, {

package/dist/m365/spo/commands/file/file-roleinheritance-reset.js

@@ -88,7 +88,7 @@ _SpoFileRoleInheritanceResetCommand_instances = new WeakSet(), _SpoFileRoleInher
     }, {
         option: '--fileUrl [fileUrl]'
     }, {
-        option: 'i, --fileId [fileId]'
+        option: '-i, --fileId [fileId]'
     }, {
         option: '-f, --force'
     });

package/dist/m365/spo/commands/folder/folder-retentionlabel-ensure.js

@@ -83,7 +83,7 @@ _SpoFolderRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoFolderReten
     }, {
         option: '--folderUrl [folderUrl]'
     }, {
-        option: 'i, --folderId [folderId]'
+        option: '-i, --folderId [folderId]'
     });
 }, _SpoFolderRetentionLabelEnsureCommand_initValidators = function _SpoFolderRetentionLabelEnsureCommand_initValidators() {
     this.validators.push(async (args) => {

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

@@ -3,8 +3,9 @@ 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 _SpoListRoleAssignmentAddCommand_instances, _SpoListRoleAssignmentAddCommand_initTelemetry, _SpoListRoleAssignmentAddCommand_initOptions, _SpoListRoleAssignmentAddCommand_initValidators, _SpoListRoleAssignmentAddCommand_initOptionSets;
+var _SpoListRoleAssignmentAddCommand_instances, _SpoListRoleAssignmentAddCommand_initTelemetry, _SpoListRoleAssignmentAddCommand_initOptions, _SpoListRoleAssignmentAddCommand_initValidators, _SpoListRoleAssignmentAddCommand_initOptionSets, _SpoListRoleAssignmentAddCommand_initTypes;
 import request from '../../../../request.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
@@ -25,6 +26,7 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoListRoleAssignmentAddCommand_instances, "m", _SpoListRoleAssignmentAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListRoleAssignmentAddCommand_instances, "m", _SpoListRoleAssignmentAddCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoListRoleAssignmentAddCommand_instances, "m", _SpoListRoleAssignmentAddCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoListRoleAssignmentAddCommand_instances, "m", _SpoListRoleAssignmentAddCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -42,39 +44,48 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand {
                 const listServerRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                 requestUrl += `GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
             }
-            args.options.roleDefinitionId = await this.getRoleDefinitionId(args.options, logger);
+            const roleDefinitionId = await this.getRoleDefinitionId(args.options, logger);
+            let principalId = args.options.principalId;
             if (args.options.upn) {
-                const user = await spo.getUserByEmail(args.options.webUrl, args.options.upn, logger, this.verbose);
-                args.options.principalId = user.Id;
-                await this.addRoleAssignment(requestUrl, logger, args.options);
+                const user = await spo.ensureUser(args.options.webUrl, args.options.upn);
+                principalId = user.Id;
             }
             else if (args.options.groupName) {
                 const group = await spo.getGroupByName(args.options.webUrl, args.options.groupName, logger, this.verbose);
-                args.options.principalId = group.Id;
-                await this.addRoleAssignment(requestUrl, logger, args.options);
+                principalId = group.Id;
             }
-            else {
-                await this.addRoleAssignment(requestUrl, logger, args.options);
+            else if (args.options.entraGroupId || args.options.entraGroupName) {
+                if (this.verbose) {
+                    await logger.logToStderr('Retrieving group information...');
+                }
+                let group;
+                if (args.options.entraGroupId) {
+                    group = await entraGroup.getGroupById(args.options.entraGroupId);
+                }
+                else {
+                    group = await entraGroup.getGroupByDisplayName(args.options.entraGroupName);
+                }
+                const siteUser = await spo.ensureEntraGroup(args.options.webUrl, group);
+                principalId = siteUser.Id;
             }
+            await this.addRoleAssignment(requestUrl, principalId, roleDefinitionId);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async addRoleAssignment(requestUrl, logger, options) {
+    async addRoleAssignment(requestUrl, principalId, roleDefinitionId) {
         const requestOptions = {
-            url: `${requestUrl}roleassignments/addroleassignment(principalid='${options.principalId}',roledefid='${options.roleDefinitionId}')`,
-            method: 'POST',
+            url: `${requestUrl}roleassignments/addroleassignment(principalid='${principalId}',roledefid='${roleDefinitionId}')`,
             headers: {
-                'accept': 'application/json;odata=nometadata',
-                'content-type': 'application/json'
+                accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
         return request.post(requestOptions);
     }
     async getRoleDefinitionId(options, logger) {
-        if (!options.roleDefinitionName) {
+        if (options.roleDefinitionId) {
             return options.roleDefinitionId;
         }
         const roleDefinition = await spo.getRoleDefinitionByName(options.webUrl, options.roleDefinitionName, logger, this.verbose);
@@ -90,6 +101,8 @@ _SpoListRoleAssignmentAddCommand_instances = new WeakSet(), _SpoListRoleAssignme
             principalId: typeof args.options.principalId !== 'undefined',
             upn: typeof args.options.upn !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
+            entraGroupId: typeof args.options.entraGroupId !== 'undefined',
+            entraGroupName: typeof args.options.entraGroupName !== 'undefined',
             roleDefinitionId: typeof args.options.roleDefinitionId !== 'undefined',
             roleDefinitionName: typeof args.options.roleDefinitionName !== 'undefined'
         });
@@ -109,6 +122,10 @@ _SpoListRoleAssignmentAddCommand_instances = new WeakSet(), _SpoListRoleAssignme
         option: '--upn [upn]'
     }, {
         option: '--groupName [groupName]'
+    }, {
+        option: '--entraGroupId [entraGroupId]'
+    }, {
+        option: '--entraGroupName [entraGroupName]'
     }, {
         option: '--roleDefinitionId [roleDefinitionId]'
     }, {
@@ -121,18 +138,26 @@ _SpoListRoleAssignmentAddCommand_instances = new WeakSet(), _SpoListRoleAssignme
             return isValidSharePointUrl;
         }
         if (args.options.listId && !validation.isValidGuid(args.options.listId)) {
-            return `${args.options.listId} is not a valid GUID`;
+            return `'${args.options.listId}' is not a valid GUID for option listId.`;
+        }
+        if (args.options.upn && !validation.isValidUserPrincipalName(args.options.upn)) {
+            return `'${args.options.upn}' is not a valid user principal name for option upn.`;
+        }
+        if (args.options.principalId && !validation.isValidPositiveInteger(args.options.principalId)) {
+            return `Specified principalId '${args.options.principalId}' is not a valid number.`;
         }
-        if (args.options.principalId && isNaN(args.options.principalId)) {
-            return `Specified principalId ${args.options.principalId} is not a number`;
+        if (args.options.entraGroupId && !validation.isValidGuid(args.options.entraGroupId)) {
+            return `'${args.options.entraGroupId}' is not a valid GUID for option entraGroupId.`;
         }
-        if (args.options.roleDefinitionId && isNaN(args.options.roleDefinitionId)) {
-            return `Specified roleDefinitionId ${args.options.roleDefinitionId} is not a number`;
+        if (args.options.roleDefinitionId && !validation.isValidPositiveInteger(args.options.roleDefinitionId)) {
+            return `Specified roleDefinitionId '${args.options.roleDefinitionId}' is not a valid number.`;
         }
         return true;
     });
 }, _SpoListRoleAssignmentAddCommand_initOptionSets = function _SpoListRoleAssignmentAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['principalId', 'upn', 'groupName'] }, { options: ['roleDefinitionId', 'roleDefinitionName'] });
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['principalId', 'upn', 'groupName', 'entraGroupId', 'entraGroupName'] }, { options: ['roleDefinitionId', 'roleDefinitionName'] });
+}, _SpoListRoleAssignmentAddCommand_initTypes = function _SpoListRoleAssignmentAddCommand_initTypes() {
+    this.types.string.push('webUrl', 'listId', 'listTitle', 'listUrl', 'upn', 'groupName', 'entraGroupId', 'entraGroupName', 'roleDefinitionName');
 };
 export default new SpoListRoleAssignmentAddCommand();
 //# sourceMappingURL=list-roleassignment-add.js.map