@pnp/cli-microsoft365 10.1.0-beta.f17d225 → 10.2.0-beta.818fb50

package/dist/AuthServer.js

@@ -17,7 +17,7 @@ export class AuthServer {
             this.httpServer = http.createServer(this.httpRequest).listen(0, this.httpListener);
         };
         this.httpListener = async () => {
-            const requestState = Math.random().toString(16).substr(2, 20);
+            const requestState = Math.random().toString(16).substring(2, 22);
             const address = this.httpServer.address();
             this.generatedServerUrl = `http://localhost:${address.port}`;
             const url = `${Auth.getEndpointForResource('https://login.microsoftonline.com', this.connection.cloudType)}/${this.connection.tenant}/oauth2/authorize?response_type=code&client_id=${this.connection.appId}&redirect_uri=${this.generatedServerUrl}&state=${requestState}&resource=${this.resource}&prompt=select_account`;

package/dist/Command.js

@@ -234,7 +234,7 @@ class Command {
             if (pos1 > -1) {
                 pos = pos1;
             }
-            commandName = commandName.substr(0, pos).trim();
+            commandName = commandName.substring(0, pos).trim();
         }
         return commandName;
     }
@@ -572,7 +572,7 @@ class Command {
             logItem.name ?? logItem.Name;
     }
     getLogItemId(logItem) {
-        return logItem.id ?? logItem.Id ?? logItem.ID ??
+        return logItem.id ?? logItem.Id?.StringValue ?? logItem.Id ?? logItem.ID ??
             logItem.uniqueId ?? logItem.UniqueId ??
             logItem.objectId ?? logItem.ObjectId ??
             logItem.url ?? logItem.Url ?? logItem.URL;

package/dist/cli/cli.js

@@ -702,7 +702,7 @@ function printAvailableCommands() {
             commandsToPrint[commandName] = command;
         }
         else {
-            const subCommandsGroup = commandName.substr(0, pos);
+            const subCommandsGroup = commandName.substring(0, pos);
             if (!commandGroupsToPrint[subCommandsGroup]) {
                 commandGroupsToPrint[subCommandsGroup] = 0;
             }
@@ -867,7 +867,7 @@ function loadOptionValuesFromFiles(args) {
             !value.startsWith('@')) {
             return;
         }
-        const filePath = value.substr(1);
+        const filePath = value.substring(1);
         // if the file doesn't exist, leave as-is, if it exists replace with
         // contents from the file
         if (fs.existsSync(filePath)) {

package/dist/m365/base/AppCommand.js

@@ -53,9 +53,12 @@ class AppCommand extends Command {
             return super.action(logger, args);
         }
         if (this.m365rcJson.apps.length > 1) {
-            const resultAsKeyValuePair = formatting.convertArrayToHashTable('appIdIndex', this.m365rcJson.apps);
+            this.m365rcJson.apps.forEach((app, index) => {
+                app.appIdIndex = index;
+            });
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('appId', this.m365rcJson.apps);
             const result = await cli.handleMultipleResultsFound(`Multiple Entra apps found in ${m365rcJsonPath}.`, resultAsKeyValuePair);
-            this.appId = this.m365rcJson.apps[result.appIdIndex].appId;
+            this.appId = result.appId;
             await super.action(logger, args);
         }
     }

package/dist/m365/commands/login.js

@@ -37,8 +37,9 @@ class LoginCommand extends Command {
     }
     getRefinedSchema(schema) {
         return schema
-            .refine(options => typeof options.appId !== 'undefined' || cli.getConfig().get(settingsNames.clientId), {
-            message: `appId is required. TIP: use the "m365 setup" command to configure the default appId`
+            .refine(options => typeof options.appId !== 'undefined' || cli.getClientId(), {
+            message: `appId is required. TIP: use the "m365 setup" command to configure the default appId`,
+            path: ['appId']
         })
             .refine(options => options.authType !== 'password' || options.userName, {
             message: 'Username is required when using password authentication',

package/dist/m365/entra/commands/administrativeunit/administrativeunit-get.js

@@ -29,7 +29,7 @@ class EntraAdministrativeUnitGetCommand extends GraphCommand {
         let administrativeUnit;
         try {
             if (args.options.id) {
-                administrativeUnit = await this.getAdministrativeUnitById(args.options.id);
+                administrativeUnit = await this.getAdministrativeUnitById(args.options.id, args.options.properties);
             }
             else {
                 administrativeUnit = await entraAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.displayName);
@@ -40,9 +40,20 @@ class EntraAdministrativeUnitGetCommand extends GraphCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getAdministrativeUnitById(id) {
+    async getAdministrativeUnitById(id, properties) {
+        const queryParameters = [];
+        if (properties) {
+            const allProperties = properties.split(',');
+            const selectProperties = allProperties.filter(prop => !prop.includes('/'));
+            if (selectProperties.length > 0) {
+                queryParameters.push(`$select=${selectProperties}`);
+            }
+        }
+        const queryString = queryParameters.length > 0
+            ? `?${queryParameters.join('&')}`
+            : '';
         const requestOptions = {
-            url: `${this.resource}/v1.0/directory/administrativeUnits/${id}`,
+            url: `${this.resource}/v1.0/directory/administrativeUnits/${id}${queryString}`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -55,7 +66,8 @@ _EntraAdministrativeUnitGetCommand_instances = new WeakSet(), _EntraAdministrati
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
-            displayName: typeof args.options.displayName !== 'undefined'
+            displayName: typeof args.options.displayName !== 'undefined',
+            properties: typeof args.options.properties !== 'undefined'
         });
     });
 }, _EntraAdministrativeUnitGetCommand_initOptions = function _EntraAdministrativeUnitGetCommand_initOptions() {
@@ -63,6 +75,8 @@ _EntraAdministrativeUnitGetCommand_instances = new WeakSet(), _EntraAdministrati
         option: '-i, --id [id]'
     }, {
         option: '-n, --displayName [displayName]'
+    }, {
+        option: '-p, --properties [properties]'
     });
 }, _EntraAdministrativeUnitGetCommand_initValidators = function _EntraAdministrativeUnitGetCommand_initValidators() {
     this.validators.push(async (args) => {

package/dist/m365/entra/commands/administrativeunit/administrativeunit-list.js

@@ -1,3 +1,9 @@
+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 _EntraAdministrativeUnitListCommand_instances, _EntraAdministrativeUnitListCommand_initTelemetry, _EntraAdministrativeUnitListCommand_initOptions;
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -11,9 +17,26 @@ class EntraAdministrativeUnitListCommand extends GraphCommand {
     defaultProperties() {
         return ['id', 'displayName', 'visibility'];
     }
-    async commandAction(logger) {
+    constructor() {
+        super();
+        _EntraAdministrativeUnitListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitListCommand_instances, "m", _EntraAdministrativeUnitListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitListCommand_instances, "m", _EntraAdministrativeUnitListCommand_initOptions).call(this);
+    }
+    async commandAction(logger, args) {
+        const queryParameters = [];
+        if (args.options.properties) {
+            const allProperties = args.options.properties.split(',');
+            const selectProperties = allProperties.filter(prop => !prop.includes('/'));
+            if (selectProperties.length > 0) {
+                queryParameters.push(`$select=${selectProperties}`);
+            }
+        }
+        const queryString = queryParameters.length > 0
+            ? `?${queryParameters.join('&')}`
+            : '';
         try {
-            const results = await odata.getAllItems(`${this.resource}/v1.0/directory/administrativeUnits`);
+            const results = await odata.getAllItems(`${this.resource}/v1.0/directory/administrativeUnits${queryString}`);
             await logger.log(results);
         }
         catch (err) {
@@ -21,5 +44,14 @@ class EntraAdministrativeUnitListCommand extends GraphCommand {
         }
     }
 }
+_EntraAdministrativeUnitListCommand_instances = new WeakSet(), _EntraAdministrativeUnitListCommand_initTelemetry = function _EntraAdministrativeUnitListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            properties: typeof args.options.properties !== 'undefined'
+        });
+    });
+}, _EntraAdministrativeUnitListCommand_initOptions = function _EntraAdministrativeUnitListCommand_initOptions() {
+    this.options.unshift({ option: '-p, --properties [properties]' });
+};
 export default new EntraAdministrativeUnitListCommand();
 //# sourceMappingURL=administrativeunit-list.js.map

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

@@ -29,7 +29,7 @@ class EntraAppGetCommand extends GraphCommand {
     async commandAction(logger, args) {
         try {
             const appObjectId = await this.getAppObjectId(args);
-            const appInfo = await this.getAppInfo(appObjectId);
+            const appInfo = await this.getAppInfo(appObjectId, args.options.properties);
             const res = await this.saveAppInfo(args, appInfo, logger);
             await logger.log(res);
         }
@@ -64,9 +64,20 @@ class EntraAppGetCommand extends GraphCommand {
         const result = await cli.handleMultipleResultsFound(`Multiple Microsoft Entra application registrations with name '${name}' found.`, resultAsKeyValuePair);
         return result.id;
     }
-    async getAppInfo(appObjectId) {
+    async getAppInfo(appObjectId, properties) {
+        const queryParameters = [];
+        if (properties) {
+            const allProperties = properties.split(',');
+            const selectProperties = allProperties.filter(prop => !prop.includes('/'));
+            if (selectProperties.length > 0) {
+                queryParameters.push(`$select=${selectProperties}`);
+            }
+        }
+        const queryString = queryParameters.length > 0
+            ? `?${queryParameters.join('&')}`
+            : '';
         const requestOptions = {
-            url: `${this.resource}/v1.0/myorganization/applications/${appObjectId}`,
+            url: `${this.resource}/v1.0/myorganization/applications/${appObjectId}${queryString}`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -121,11 +132,12 @@ _EntraAppGetCommand_instances = new WeakSet(), _EntraAppGetCommand_initTelemetry
         Object.assign(this.telemetryProperties, {
             appId: typeof args.options.appId !== 'undefined',
             objectId: typeof args.options.objectId !== 'undefined',
-            name: typeof args.options.name !== 'undefined'
+            name: typeof args.options.name !== 'undefined',
+            properties: typeof args.options.properties !== 'undefined'
         });
     });
 }, _EntraAppGetCommand_initOptions = function _EntraAppGetCommand_initOptions() {
-    this.options.unshift({ option: '--appId [appId]' }, { option: '--objectId [objectId]' }, { option: '--name [name]' }, { option: '--save' });
+    this.options.unshift({ option: '--appId [appId]' }, { option: '--objectId [objectId]' }, { option: '--name [name]' }, { option: '--save' }, { option: '-p, --properties [properties]' });
 }, _EntraAppGetCommand_initValidators = function _EntraAppGetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.appId && !validation.isValidGuid(args.options.appId)) {

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

@@ -1,3 +1,9 @@
+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 _EntraAppListCommand_instances, _EntraAppListCommand_initTelemetry, _EntraAppListCommand_initOptions;
 import { odata } from "../../../../utils/odata.js";
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -8,12 +14,29 @@ class EntraAppListCommand extends GraphCommand {
     get description() {
         return 'Retrieves a list of Entra app registrations';
     }
+    constructor() {
+        super();
+        _EntraAppListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraAppListCommand_instances, "m", _EntraAppListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraAppListCommand_instances, "m", _EntraAppListCommand_initOptions).call(this);
+    }
     defaultProperties() {
         return ['appId', 'id', 'displayName', "signInAudience"];
     }
-    async commandAction(logger) {
+    async commandAction(logger, args) {
+        const queryParameters = [];
+        if (args.options.properties) {
+            const allProperties = args.options.properties.split(',');
+            const selectProperties = allProperties.filter(prop => !prop.includes('/'));
+            if (selectProperties.length > 0) {
+                queryParameters.push(`$select=${selectProperties}`);
+            }
+        }
+        const queryString = queryParameters.length > 0
+            ? `?${queryParameters.join('&')}`
+            : '';
         try {
-            const results = await odata.getAllItems(`${this.resource}/v1.0/applications`);
+            const results = await odata.getAllItems(`${this.resource}/v1.0/applications${queryString}`);
             await logger.log(results);
         }
         catch (err) {
@@ -21,5 +44,14 @@ class EntraAppListCommand extends GraphCommand {
         }
     }
 }
+_EntraAppListCommand_instances = new WeakSet(), _EntraAppListCommand_initTelemetry = function _EntraAppListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            properties: typeof args.options.properties !== 'undefined'
+        });
+    });
+}, _EntraAppListCommand_initOptions = function _EntraAppListCommand_initOptions() {
+    this.options.unshift({ option: '-p, --properties [properties]' });
+};
 export default new EntraAppListCommand();
 //# sourceMappingURL=app-list.js.map

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

@@ -17,6 +17,9 @@ class EntraEnterpriseAppAddCommand extends GraphCommand {
     get description() {
         return 'Creates an enterprise application (or service principal) for a registered Entra app';
     }
+    alias() {
+        return [commands.SP_ADD];
+    }
     constructor() {
         super();
         _EntraEnterpriseAppAddCommand_instances.add(this);

package/dist/m365/entra/commands/enterpriseapp/enterpriseapp-get.js

@@ -17,6 +17,9 @@ class EntraEnterpriseAppGetCommand extends GraphCommand {
     get description() {
         return 'Gets information about an Enterprise Application';
     }
+    alias() {
+        return [commands.SP_GET];
+    }
     constructor() {
         super();
         _EntraEnterpriseAppGetCommand_instances.add(this);

package/dist/m365/entra/commands/enterpriseapp/enterpriseapp-list.js

@@ -17,6 +17,9 @@ class EntraEnterpriseAppListCommand extends GraphCommand {
     get description() {
         return 'Lists the enterprise applications (or service principals) in Entra ID';
     }
+    alias() {
+        return [commands.SP_LIST];
+    }
     constructor() {
         super();
         _EntraEnterpriseAppListCommand_instances.add(this);

package/dist/m365/entra/commands/group/group-get.js

@@ -27,10 +27,10 @@ class EntraGroupGetCommand extends GraphCommand {
         let group;
         try {
             if (args.options.id) {
-                group = await entraGroup.getGroupById(args.options.id);
+                group = await entraGroup.getGroupById(args.options.id, args.options.properties);
             }
             else {
-                group = await entraGroup.getGroupByDisplayName(args.options.displayName);
+                group = await entraGroup.getGroupByDisplayName(args.options.displayName, args.options.properties);
             }
             await logger.log(group);
         }
@@ -44,6 +44,8 @@ _EntraGroupGetCommand_instances = new WeakSet(), _EntraGroupGetCommand_initOptio
         option: '-i, --id [id]'
     }, {
         option: '-n, --displayName [displayName]'
+    }, {
+        option: '-p, --properties [properties]'
     });
 }, _EntraGroupGetCommand_initValidators = function _EntraGroupGetCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -58,7 +60,8 @@ _EntraGroupGetCommand_instances = new WeakSet(), _EntraGroupGetCommand_initOptio
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
-            displayName: typeof args.options.displayName !== 'undefined'
+            displayName: typeof args.options.displayName !== 'undefined',
+            properties: typeof args.options.properties !== 'undefined'
         });
     });
 };

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

@@ -47,6 +47,18 @@ class EntraGroupListCommand extends GraphCommand {
                         break;
                 }
             }
+            const queryParameters = [];
+            if (args.options.properties) {
+                const allProperties = args.options.properties.split(',');
+                const selectProperties = allProperties.filter(prop => !prop.includes('/'));
+                if (selectProperties.length > 0) {
+                    queryParameters.push(`$select=${selectProperties}`);
+                }
+            }
+            const queryString = queryParameters.length > 0
+                ? `?${queryParameters.join('&')}`
+                : '';
+            requestUrl += queryString;
             let groups = [];
             if (useConsistencyLevelHeader) {
                 // While using not() function in the filter, we need to specify the ConsistencyLevel header.
@@ -89,13 +101,16 @@ class EntraGroupListCommand extends GraphCommand {
 _a = EntraGroupListCommand, _EntraGroupListCommand_instances = new WeakSet(), _EntraGroupListCommand_initTelemetry = function _EntraGroupListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            type: typeof args.options.type !== 'undefined'
+            type: typeof args.options.type !== 'undefined',
+            properties: typeof args.options.properties !== 'undefined'
         });
     });
 }, _EntraGroupListCommand_initOptions = function _EntraGroupListCommand_initOptions() {
     this.options.unshift({
         option: '--type [type]',
         autocomplete: _a.groupTypes
+    }, {
+        option: '-p, --properties [properties]'
     });
 }, _EntraGroupListCommand_initValidators = function _EntraGroupListCommand_initValidators() {
     this.validators.push(async (args) => {

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

@@ -171,7 +171,7 @@ class EntraM365GroupAddCommand extends GraphCommand {
         }
     }
     getImageContentType(imagePath) {
-        const extension = imagePath.substr(imagePath.lastIndexOf('.')).toLowerCase();
+        const extension = imagePath.substring(imagePath.lastIndexOf('.')).toLowerCase();
         switch (extension) {
             case '.png':
                 return 'image/png';

package/dist/m365/entra/commands/m365group/m365group-conversation-list.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 _EntraM365GroupConversationListCommand_instances, _EntraM365GroupConversationListCommand_initOptions, _EntraM365GroupConversationListCommand_initValidators;
+var _EntraM365GroupConversationListCommand_instances, _EntraM365GroupConversationListCommand_initOptions, _EntraM365GroupConversationListCommand_initValidators, _EntraM365GroupConversationListCommand_initOptionSets, _EntraM365GroupConversationListCommand_initTypes;
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -24,14 +24,23 @@ class EntraM365GroupConversationListCommand extends GraphCommand {
         _EntraM365GroupConversationListCommand_instances.add(this);
         __classPrivateFieldGet(this, _EntraM365GroupConversationListCommand_instances, "m", _EntraM365GroupConversationListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupConversationListCommand_instances, "m", _EntraM365GroupConversationListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupConversationListCommand_instances, "m", _EntraM365GroupConversationListCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupConversationListCommand_instances, "m", _EntraM365GroupConversationListCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving conversations for Microsoft 365 Group: ${args.options.groupId || args.options.groupName}...`);
+        }
         try {
-            const isUnifiedGroup = await entraGroup.isUnifiedGroup(args.options.groupId);
+            let groupId = args.options.groupId;
+            if (args.options.groupName) {
+                groupId = await entraGroup.getGroupIdByDisplayName(args.options.groupName);
+            }
+            const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);
             if (!isUnifiedGroup) {
-                throw Error(`Specified group with id '${args.options.groupId}' is not a Microsoft 365 group.`);
+                throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`);
             }
-            const conversations = await odata.getAllItems(`${this.resource}/v1.0/groups/${args.options.groupId}/conversations`);
+            const conversations = await odata.getAllItems(`${this.resource}/v1.0/groups/${groupId}/conversations`);
             await logger.log(conversations);
         }
         catch (err) {
@@ -41,15 +50,21 @@ class EntraM365GroupConversationListCommand extends GraphCommand {
 }
 _EntraM365GroupConversationListCommand_instances = new WeakSet(), _EntraM365GroupConversationListCommand_initOptions = function _EntraM365GroupConversationListCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --groupId <groupId>'
+        option: '-i, --groupId [groupId]'
+    }, {
+        option: '-n, --groupName [groupName]'
     });
 }, _EntraM365GroupConversationListCommand_initValidators = function _EntraM365GroupConversationListCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.groupId)) {
+        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         return true;
     });
+}, _EntraM365GroupConversationListCommand_initOptionSets = function _EntraM365GroupConversationListCommand_initOptionSets() {
+    this.optionSets.push({ options: ['groupId', 'groupName'] });
+}, _EntraM365GroupConversationListCommand_initTypes = function _EntraM365GroupConversationListCommand_initTypes() {
+    this.types.string.push('groupId', 'groupName');
 };
 export default new EntraM365GroupConversationListCommand();
 //# sourceMappingURL=m365group-conversation-list.js.map

package/dist/m365/entra/commands/m365group/m365group-get.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 _EntraM365GroupGetCommand_instances, _EntraM365GroupGetCommand_initOptions, _EntraM365GroupGetCommand_initValidators;
+var _EntraM365GroupGetCommand_instances, _EntraM365GroupGetCommand_initOptions, _EntraM365GroupGetCommand_initValidators, _EntraM365GroupGetCommand_initOptionSets, _EntraM365GroupGetCommand_initTypes;
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { validation } from '../../../../utils/validation.js';
@@ -21,15 +21,31 @@ class EntraM365GroupGetCommand extends GraphCommand {
         _EntraM365GroupGetCommand_instances.add(this);
         __classPrivateFieldGet(this, _EntraM365GroupGetCommand_instances, "m", _EntraM365GroupGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupGetCommand_instances, "m", _EntraM365GroupGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupGetCommand_instances, "m", _EntraM365GroupGetCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupGetCommand_instances, "m", _EntraM365GroupGetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         let group;
         try {
-            const isUnifiedGroup = await entraGroup.isUnifiedGroup(args.options.id);
+            if (args.options.id) {
+                group = await entraGroup.getGroupById(args.options.id);
+            }
+            else {
+                group = await entraGroup.getGroupByDisplayName(args.options.displayName);
+            }
+            const isUnifiedGroup = await entraGroup.isUnifiedGroup(group.id);
             if (!isUnifiedGroup) {
-                throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`);
+                throw Error(`Specified group with id '${group.id}' is not a Microsoft 365 group.`);
             }
-            group = await entraGroup.getGroupById(args.options.id);
+            const requestExtendedOptions = {
+                url: `${this.resource}/v1.0/groups/${group.id}?$select=allowExternalSenders,autoSubscribeNewMembers,hideFromAddressLists,hideFromOutlookClients,isSubscribedByMail`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const groupExtended = await request.get(requestExtendedOptions);
+            group = { ...group, ...groupExtended };
             if (args.options.includeSiteUrl) {
                 const requestOptions = {
                     url: `${this.resource}/v1.0/groups/${group.id}/drive?$select=webUrl`,
@@ -39,7 +55,7 @@ class EntraM365GroupGetCommand extends GraphCommand {
                     responseType: 'json'
                 };
                 const res = await request.get(requestOptions);
-                group.siteUrl = res.webUrl ? res.webUrl.substr(0, res.webUrl.lastIndexOf('/')) : '';
+                group.siteUrl = res.webUrl ? res.webUrl.substring(0, res.webUrl.lastIndexOf('/')) : '';
             }
             await logger.log(group);
         }
@@ -50,17 +66,23 @@ class EntraM365GroupGetCommand extends GraphCommand {
 }
 _EntraM365GroupGetCommand_instances = new WeakSet(), _EntraM365GroupGetCommand_initOptions = function _EntraM365GroupGetCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --displayName [displayName]'
     }, {
         option: '--includeSiteUrl'
     });
 }, _EntraM365GroupGetCommand_initValidators = function _EntraM365GroupGetCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
     });
+}, _EntraM365GroupGetCommand_initOptionSets = function _EntraM365GroupGetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'displayName'] });
+}, _EntraM365GroupGetCommand_initTypes = function _EntraM365GroupGetCommand_initTypes() {
+    this.types.string.push('id', 'displayName');
 };
 export default new EntraM365GroupGetCommand();
 //# sourceMappingURL=m365group-get.js.map

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

@@ -72,7 +72,7 @@ class EntraM365GroupListCommand extends GraphCommand {
         const res = await request.get(requestOptions);
         return {
             id: groupId,
-            url: res.webUrl ? res.webUrl.substr(0, res.webUrl.lastIndexOf('/')) : ''
+            url: res.webUrl ? res.webUrl.substring(0, res.webUrl.lastIndexOf('/')) : ''
         };
     }
 }

package/dist/m365/entra/commands/m365group/m365group-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 _EntraM365GroupRemoveCommand_instances, _EntraM365GroupRemoveCommand_initTelemetry, _EntraM365GroupRemoveCommand_initOptions, _EntraM365GroupRemoveCommand_initValidators;
+var _EntraM365GroupRemoveCommand_instances, _EntraM365GroupRemoveCommand_initTelemetry, _EntraM365GroupRemoveCommand_initOptions, _EntraM365GroupRemoveCommand_initValidators, _EntraM365GroupRemoveCommand_initOptionSets, _EntraM365GroupRemoveCommand_initTypes;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
@@ -28,23 +28,29 @@ class EntraM365GroupRemoveCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraM365GroupRemoveCommand_instances, "m", _EntraM365GroupRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupRemoveCommand_instances, "m", _EntraM365GroupRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupRemoveCommand_instances, "m", _EntraM365GroupRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupRemoveCommand_instances, "m", _EntraM365GroupRemoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupRemoveCommand_instances, "m", _EntraM365GroupRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         const removeGroup = async () => {
             if (this.verbose) {
-                await logger.logToStderr(`Removing Microsoft 365 Group: ${args.options.id}...`);
+                await logger.logToStderr(`Removing Microsoft 365 Group: ${args.options.id || args.options.displayName}...`);
             }
             try {
-                const isUnifiedGroup = await entraGroup.isUnifiedGroup(args.options.id);
+                let groupId = args.options.id;
+                if (args.options.displayName) {
+                    groupId = await entraGroup.getGroupIdByDisplayName(args.options.displayName);
+                }
+                const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);
                 if (!isUnifiedGroup) {
-                    throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`);
+                    throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`);
                 }
-                const siteUrl = await this.getM365GroupSiteUrl(logger, args.options.id);
+                const siteUrl = await this.getM365GroupSiteUrl(logger, groupId);
                 const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
                 // Delete the Microsoft 365 group site. This operation will also delete the group.
                 await this.deleteM365GroupSite(logger, siteUrl, spoAdminUrl);
                 if (args.options.skipRecycleBin) {
-                    await this.deleteM365GroupFromRecycleBin(logger, args.options.id);
+                    await this.deleteM365GroupFromRecycleBin(logger, groupId);
                     await this.deleteSiteFromRecycleBin(logger, siteUrl, spoAdminUrl);
                 }
             }
@@ -56,7 +62,7 @@ class EntraM365GroupRemoveCommand extends GraphCommand {
             await removeGroup();
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the group ${args.options.id}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the group ${args.options.id || args.options.displayName}?` });
             if (result) {
                 await removeGroup();
             }
@@ -168,7 +174,9 @@ _EntraM365GroupRemoveCommand_instances = new WeakSet(), _EntraM365GroupRemoveCom
     });
 }, _EntraM365GroupRemoveCommand_initOptions = function _EntraM365GroupRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --displayName [displayName]'
     }, {
         option: '-f, --force'
     }, {
@@ -176,11 +184,15 @@ _EntraM365GroupRemoveCommand_instances = new WeakSet(), _EntraM365GroupRemoveCom
     });
 }, _EntraM365GroupRemoveCommand_initValidators = function _EntraM365GroupRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
     });
+}, _EntraM365GroupRemoveCommand_initOptionSets = function _EntraM365GroupRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'displayName'] });
+}, _EntraM365GroupRemoveCommand_initTypes = function _EntraM365GroupRemoveCommand_initTypes() {
+    this.types.string.push('id', 'displayName');
 };
 EntraM365GroupRemoveCommand.maxRetries = 10;
 export default new EntraM365GroupRemoveCommand();