@pnp/cli-microsoft365 10.1.0-beta.10765f6 → 10.1.0-beta.6c6be23

package/dist/Command.js

@@ -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/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/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-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();

package/dist/m365/entra/commands/m365group/m365group-renew.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 _EntraM365GroupRenewCommand_instances, _EntraM365GroupRenewCommand_initOptions, _EntraM365GroupRenewCommand_initValidators;
+var _EntraM365GroupRenewCommand_instances, _EntraM365GroupRenewCommand_initOptions, _EntraM365GroupRenewCommand_initValidators, _EntraM365GroupRenewCommand_initOptionSets, _EntraM365GroupRenewCommand_initTypes;
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { validation } from '../../../../utils/validation.js';
@@ -21,18 +21,24 @@ class EntraM365GroupRenewCommand extends GraphCommand {
         _EntraM365GroupRenewCommand_instances.add(this);
         __classPrivateFieldGet(this, _EntraM365GroupRenewCommand_instances, "m", _EntraM365GroupRenewCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupRenewCommand_instances, "m", _EntraM365GroupRenewCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupRenewCommand_instances, "m", _EntraM365GroupRenewCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupRenewCommand_instances, "m", _EntraM365GroupRenewCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         if (this.verbose) {
-            await logger.logToStderr(`Renewing Microsoft 365 group's expiration: ${args.options.id}...`);
+            await logger.logToStderr(`Renewing Microsoft 365 group's expiration: ${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 requestOptions = {
-                url: `${this.resource}/v1.0/groups/${args.options.id}/renew/`,
+                url: `${this.resource}/v1.0/groups/${groupId}/renew/`,
                 headers: {
                     'accept': 'application/json;odata.metadata=none'
                 }
@@ -46,15 +52,21 @@ class EntraM365GroupRenewCommand extends GraphCommand {
 }
 _EntraM365GroupRenewCommand_instances = new WeakSet(), _EntraM365GroupRenewCommand_initOptions = function _EntraM365GroupRenewCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --displayName [displayName]'
     });
 }, _EntraM365GroupRenewCommand_initValidators = function _EntraM365GroupRenewCommand_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;
     });
+}, _EntraM365GroupRenewCommand_initOptionSets = function _EntraM365GroupRenewCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'displayName'] });
+}, _EntraM365GroupRenewCommand_initTypes = function _EntraM365GroupRenewCommand_initTypes() {
+    this.types.string.push('id', 'displayName');
 };
 export default new EntraM365GroupRenewCommand();
 //# sourceMappingURL=m365group-renew.js.map

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

@@ -3,8 +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 _EntraM365GroupTeamifyCommand_instances, _EntraM365GroupTeamifyCommand_initTelemetry, _EntraM365GroupTeamifyCommand_initOptions, _EntraM365GroupTeamifyCommand_initValidators, _EntraM365GroupTeamifyCommand_initOptionSets;
-import { cli } from '../../../../cli/cli.js';
+var _EntraM365GroupTeamifyCommand_instances, _EntraM365GroupTeamifyCommand_initTelemetry, _EntraM365GroupTeamifyCommand_initOptions, _EntraM365GroupTeamifyCommand_initValidators, _EntraM365GroupTeamifyCommand_initOptionSets, _EntraM365GroupTeamifyCommand_initTypes;
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -25,29 +24,16 @@ class EntraM365GroupTeamifyCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraM365GroupTeamifyCommand_instances, "m", _EntraM365GroupTeamifyCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupTeamifyCommand_instances, "m", _EntraM365GroupTeamifyCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _EntraM365GroupTeamifyCommand_instances, "m", _EntraM365GroupTeamifyCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupTeamifyCommand_instances, "m", _EntraM365GroupTeamifyCommand_initTypes).call(this);
     }
     async getGroupId(options) {
         if (options.id) {
             return options.id;
         }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=mailNickname eq '${formatting.encodeQueryParameter(options.mailNickname)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        const response = await request.get(requestOptions);
-        const groupItem = response.value[0];
-        if (!groupItem) {
-            throw `The specified Microsoft 365 Group does not exist`;
+        if (options.displayName) {
+            return await entraGroup.getGroupIdByDisplayName(options.displayName);
         }
-        if (response.value.length > 1) {
-            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
-            const result = await cli.handleMultipleResultsFound(`Multiple Microsoft 365 Groups with name '${options.mailNickname}' found.`, resultAsKeyValuePair);
-            return result.id;
-        }
-        return groupItem.id;
+        return await entraGroup.getGroupIdByMailNickname(options.mailNickname);
     }
     async commandAction(logger, args) {
         try {
@@ -89,12 +75,15 @@ _EntraM365GroupTeamifyCommand_instances = new WeakSet(), _EntraM365GroupTeamifyC
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
-            mailNickname: typeof args.options.mailNickname !== 'undefined'
+            mailNickname: typeof args.options.mailNickname !== 'undefined',
+            displayName: typeof args.options.displayName !== 'undefined'
         });
     });
 }, _EntraM365GroupTeamifyCommand_initOptions = function _EntraM365GroupTeamifyCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id [id]'
+    }, {
+        option: '-n, --displayName [displayName]'
     }, {
         option: '--mailNickname [mailNickname]'
     });
@@ -106,7 +95,9 @@ _EntraM365GroupTeamifyCommand_instances = new WeakSet(), _EntraM365GroupTeamifyC
         return true;
     });
 }, _EntraM365GroupTeamifyCommand_initOptionSets = function _EntraM365GroupTeamifyCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'mailNickname'] });
+    this.optionSets.push({ options: ['id', 'displayName', 'mailNickname'] });
+}, _EntraM365GroupTeamifyCommand_initTypes = function _EntraM365GroupTeamifyCommand_initTypes() {
+    this.types.string.push('id', 'displayName', 'mailNickname');
 };
 export default new EntraM365GroupTeamifyCommand();
 //# sourceMappingURL=m365group-teamify.js.map

package/dist/m365/graph/commands/subscription/subscription-add.js

@@ -37,6 +37,7 @@ class GraphSubscriptionAddCommand extends GraphCommand {
     constructor() {
         super();
         _GraphSubscriptionAddCommand_instances.add(this);
+        this.allowedTlsVersions = ['v1_0', 'v1_1', 'v1_2', 'v1_3'];
         __classPrivateFieldGet(this, _GraphSubscriptionAddCommand_instances, "m", _GraphSubscriptionAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _GraphSubscriptionAddCommand_instances, "m", _GraphSubscriptionAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _GraphSubscriptionAddCommand_instances, "m", _GraphSubscriptionAddCommand_initValidators).call(this);
@@ -46,11 +47,15 @@ class GraphSubscriptionAddCommand extends GraphCommand {
             changeType: args.options.changeTypes,
             resource: args.options.resource,
             notificationUrl: args.options.notificationUrl,
-            expirationDateTime: await this.getExpirationDateTimeOrDefault(logger, args)
+            expirationDateTime: await this.getExpirationDateTimeOrDefault(logger, args),
+            clientState: args.options.clientState,
+            includeResourceData: args.options.includeResourceData,
+            encryptionCertificate: args.options.encryptionCertificate,
+            encryptionCertificateId: args.options.encryptionCertificateId,
+            lifecycleNotificationUrl: args.options.lifecycleNotificationUrl,
+            notificationUrlAppId: args.options.notificationUrlAppId,
+            latestSupportedTlsVersion: args.options.latestTLSVersion
         };
-        if (args.options.clientState) {
-            data["clientState"] = args.options.clientState;
-        }
         const requestOptions = {
             url: `${this.resource}/v1.0/subscriptions`,
             headers: {
@@ -123,7 +128,13 @@ _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCom
         Object.assign(this.telemetryProperties, {
             changeTypes: args.options.changeTypes,
             expirationDateTime: typeof args.options.expirationDateTime !== 'undefined',
-            clientState: typeof args.options.clientState !== 'undefined'
+            clientState: typeof args.options.clientState !== 'undefined',
+            lifecycleNotificationUrl: typeof args.options.lifecycleNotificationUrl !== 'undefined',
+            notificationUrlAppId: typeof args.options.notificationUrlAppId !== 'undefined',
+            latestTLSVersion: typeof args.options.latestTLSVersion !== 'undefined',
+            includeResourceData: !!args.options.includeResourceData,
+            encryptionCertificate: typeof args.options.encryptionCertificate !== 'undefined',
+            encryptionCertificateId: typeof args.options.encryptionCertificateId !== 'undefined'
         });
     });
 }, _GraphSubscriptionAddCommand_initOptions = function _GraphSubscriptionAddCommand_initOptions() {
@@ -138,6 +149,19 @@ _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCom
         option: '-e, --expirationDateTime [expirationDateTime]'
     }, {
         option: '-s, --clientState [clientState]'
+    }, {
+        option: '--lifecycleNotificationUrl [lifecycleNotificationUrl]'
+    }, {
+        option: '--notificationUrlAppId [notificationUrlAppId]'
+    }, {
+        option: '--latestTLSVersion [latestTLSVersion]',
+        autocomplete: this.allowedTlsVersions
+    }, {
+        option: '--includeResourceData [includeResourceData]'
+    }, {
+        option: '--encryptionCertificate [encryptionCertificate]'
+    }, {
+        option: '--encryptionCertificateId [encryptionCertificateId]'
     });
 }, _GraphSubscriptionAddCommand_initValidators = function _GraphSubscriptionAddCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -155,6 +179,23 @@ _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCom
         if (args.options.clientState && args.options.clientState.length > 128) {
             return 'The clientState value exceeds the maximum length of 128 characters';
         }
+        if (args.options.lifecycleNotificationUrl && !args.options.lifecycleNotificationUrl.toLowerCase().startsWith('https://')
+            && !args.options.lifecycleNotificationUrl.toLowerCase().startsWith('eventhub:https://')
+            && !args.options.lifecycleNotificationUrl.toLowerCase().startsWith('eventgrid:?azuresubscriptionid=')) {
+            return `The lifecycle notification URL '${args.options.lifecycleNotificationUrl}' does not start with either 'https://' or 'EventHub:https://' or 'EventGrid:?azuresubscriptionid='`;
+        }
+        if (args.options.latestTLSVersion && this.allowedTlsVersions.map(x => x.toLowerCase()).indexOf(args.options.latestTLSVersion.toLowerCase()) === -1) {
+            return `${args.options.latestTLSVersion} is not a valid TLS version. Allowed values are ${this.allowedTlsVersions.join(', ')}`;
+        }
+        if (args.options.includeResourceData && !args.options.encryptionCertificate) {
+            return `The 'encryptionCertificate' options is required to include the changed resource data`;
+        }
+        if (args.options.includeResourceData && !args.options.encryptionCertificateId) {
+            return `The 'encryptionCertificateId' options is required to include the changed resource data`;
+        }
+        if (args.options.notificationUrlAppId && !validation.isValidGuid(args.options.notificationUrlAppId)) {
+            return `${args.options.notificationUrlAppId} is not a valid GUID for the 'notificationUrlAppId'`;
+        }
         return true;
     });
 };

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

@@ -40,10 +40,10 @@ class SpoContentTypeGetCommand extends SpoCommand {
         }
         requestUrl += "/contenttypes";
         if (args.options.id) {
-            requestUrl += `('${formatting.encodeQueryParameter(args.options.id)}')`;
+            requestUrl += `('${formatting.encodeQueryParameter(args.options.id)}')?$expand=Parent`;
         }
         else if (args.options.name) {
-            requestUrl += `?$filter=Name eq '${formatting.encodeQueryParameter(args.options.name)}'`;
+            requestUrl += `?$filter=Name eq '${formatting.encodeQueryParameter(args.options.name)}'&$expand=Parent`;
         }
         const requestOptions = {
             url: requestUrl,

package/dist/m365/spo/commands/contenttype/contenttype-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 _SpoContentTypeListCommand_instances, _SpoContentTypeListCommand_initTelemetry, _SpoContentTypeListCommand_initOptions, _SpoContentTypeListCommand_initValidators;
+var _SpoContentTypeListCommand_instances, _SpoContentTypeListCommand_initTelemetry, _SpoContentTypeListCommand_initOptions, _SpoContentTypeListCommand_initValidators, _SpoContentTypeListCommand_initTypes;
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
@@ -25,12 +25,13 @@ class SpoContentTypeListCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoContentTypeListCommand_instances, "m", _SpoContentTypeListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoContentTypeListCommand_instances, "m", _SpoContentTypeListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoContentTypeListCommand_instances, "m", _SpoContentTypeListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoContentTypeListCommand_instances, "m", _SpoContentTypeListCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         try {
-            let requestUrl = `${args.options.webUrl}/_api/web/ContentTypes`;
+            let requestUrl = `${args.options.webUrl}/_api/web/ContentTypes?$expand=Parent`;
             if (args.options.category) {
-                requestUrl += `?$filter=Group eq '${formatting.encodeQueryParameter(args.options.category)}'`;
+                requestUrl += `&$filter=Group eq '${formatting.encodeQueryParameter(args.options.category)}'`;
             }
             const res = await odata.getAllItems(requestUrl);
             await logger.log(res);
@@ -54,6 +55,8 @@ _SpoContentTypeListCommand_instances = new WeakSet(), _SpoContentTypeListCommand
     });
 }, _SpoContentTypeListCommand_initValidators = function _SpoContentTypeListCommand_initValidators() {
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
+}, _SpoContentTypeListCommand_initTypes = function _SpoContentTypeListCommand_initTypes() {
+    this.types.string.push('webUrl', 'category');
 };
 export default new SpoContentTypeListCommand();
 //# sourceMappingURL=contenttype-list.js.map

package/dist/m365/spo/commands/list/list-contenttype-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 _SpoListContentTypeListCommand_instances, _SpoListContentTypeListCommand_initTelemetry, _SpoListContentTypeListCommand_initOptions, _SpoListContentTypeListCommand_initValidators, _SpoListContentTypeListCommand_initOptionSets;
+var _SpoListContentTypeListCommand_instances, _SpoListContentTypeListCommand_initTelemetry, _SpoListContentTypeListCommand_initOptions, _SpoListContentTypeListCommand_initValidators, _SpoListContentTypeListCommand_initOptionSets, _SpoListContentTypeListCommand_initTypes;
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
@@ -27,6 +27,7 @@ class SpoListContentTypeListCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoListContentTypeListCommand_instances, "m", _SpoListContentTypeListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListContentTypeListCommand_instances, "m", _SpoListContentTypeListCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoListContentTypeListCommand_instances, "m", _SpoListContentTypeListCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoListContentTypeListCommand_instances, "m", _SpoListContentTypeListCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -45,7 +46,7 @@ class SpoListContentTypeListCommand extends SpoCommand {
             requestUrl += `GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
         }
         try {
-            const res = await odata.getAllItems(`${requestUrl}/ContentTypes`);
+            const res = await odata.getAllItems(`${requestUrl}/ContentTypes?$expand=Parent`);
             await logger.log(res);
         }
         catch (err) {
@@ -86,6 +87,8 @@ _SpoListContentTypeListCommand_instances = new WeakSet(), _SpoListContentTypeLis
     });
 }, _SpoListContentTypeListCommand_initOptionSets = function _SpoListContentTypeListCommand_initOptionSets() {
     this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
+}, _SpoListContentTypeListCommand_initTypes = function _SpoListContentTypeListCommand_initTypes() {
+    this.types.string.push('webUrl', 'listId', 'listTitle', 'listUrl');
 };
 export default new SpoListContentTypeListCommand();
 //# sourceMappingURL=list-contenttype-list.js.map