@pnp/cli-microsoft365 7.0.0-beta.f1037e1 → 7.0.0

package/dist/m365/aad/commands/{o365group/o365group-recyclebinitem-clear.js → m365group/m365group-recyclebinitem-clear.js}

@@ -3,27 +3,27 @@ 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 _AadO365GroupRecycleBinItemClearCommand_instances, _AadO365GroupRecycleBinItemClearCommand_initTelemetry, _AadO365GroupRecycleBinItemClearCommand_initOptions;
+var _AadM365GroupRecycleBinItemClearCommand_instances, _AadM365GroupRecycleBinItemClearCommand_initTelemetry, _AadM365GroupRecycleBinItemClearCommand_initOptions;
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class AadO365GroupRecycleBinItemClearCommand extends GraphCommand {
+class AadM365GroupRecycleBinItemClearCommand extends GraphCommand {
     get name() {
-        return commands.O365GROUP_RECYCLEBINITEM_CLEAR;
+        return commands.M365GROUP_RECYCLEBINITEM_CLEAR;
     }
     get description() {
-        return 'Clears all O365 Groups from recycle bin.';
+        return 'Clears all M365 Groups from recycle bin.';
     }
     constructor() {
         super();
-        _AadO365GroupRecycleBinItemClearCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadO365GroupRecycleBinItemClearCommand_instances, "m", _AadO365GroupRecycleBinItemClearCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupRecycleBinItemClearCommand_instances, "m", _AadO365GroupRecycleBinItemClearCommand_initOptions).call(this);
+        _AadM365GroupRecycleBinItemClearCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadM365GroupRecycleBinItemClearCommand_instances, "m", _AadM365GroupRecycleBinItemClearCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupRecycleBinItemClearCommand_instances, "m", _AadM365GroupRecycleBinItemClearCommand_initOptions).call(this);
     }
     async commandAction(logger, args) {
-        const clearO365GroupRecycleBinItems = async () => {
+        const clearM365GroupRecycleBinItems = async () => {
             try {
                 await this.processRecycleBinItemsClear();
             }
@@ -32,17 +32,17 @@ class AadO365GroupRecycleBinItemClearCommand extends GraphCommand {
             }
         };
         if (args.options.force) {
-            await clearO365GroupRecycleBinItems();
+            await clearM365GroupRecycleBinItems();
         }
         else {
             const response = await Cli.prompt({
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to clear all O365 Groups from recycle bin ?`
+                message: `Are you sure you want to clear all M365 Groups from recycle bin ?`
             });
             if (response.continue) {
-                await clearO365GroupRecycleBinItems();
+                await clearM365GroupRecycleBinItems();
             }
         }
     }
@@ -67,16 +67,16 @@ class AadO365GroupRecycleBinItemClearCommand extends GraphCommand {
         await Promise.all(deletePromises);
     }
 }
-_AadO365GroupRecycleBinItemClearCommand_instances = new WeakSet(), _AadO365GroupRecycleBinItemClearCommand_initTelemetry = function _AadO365GroupRecycleBinItemClearCommand_initTelemetry() {
+_AadM365GroupRecycleBinItemClearCommand_instances = new WeakSet(), _AadM365GroupRecycleBinItemClearCommand_initTelemetry = function _AadM365GroupRecycleBinItemClearCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             force: typeof args.options.force !== 'undefined'
         });
     });
-}, _AadO365GroupRecycleBinItemClearCommand_initOptions = function _AadO365GroupRecycleBinItemClearCommand_initOptions() {
+}, _AadM365GroupRecycleBinItemClearCommand_initOptions = function _AadM365GroupRecycleBinItemClearCommand_initOptions() {
     this.options.unshift({
         option: '-f, --force'
     });
 };
-export default new AadO365GroupRecycleBinItemClearCommand();
-//# sourceMappingURL=o365group-recyclebinitem-clear.js.map
+export default new AadM365GroupRecycleBinItemClearCommand();
+//# sourceMappingURL=m365group-recyclebinitem-clear.js.map

package/dist/m365/aad/commands/{o365group/o365group-recyclebinitem-list.js → m365group/m365group-recyclebinitem-list.js}

@@ -3,23 +3,23 @@ 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 _AadO365GroupRecycleBinItemListCommand_instances, _AadO365GroupRecycleBinItemListCommand_initTelemetry, _AadO365GroupRecycleBinItemListCommand_initOptions;
+var _AadM365GroupRecycleBinItemListCommand_instances, _AadM365GroupRecycleBinItemListCommand_initTelemetry, _AadM365GroupRecycleBinItemListCommand_initOptions;
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class AadO365GroupRecycleBinItemListCommand extends GraphCommand {
+class AadM365GroupRecycleBinItemListCommand extends GraphCommand {
     get name() {
-        return commands.O365GROUP_RECYCLEBINITEM_LIST;
+        return commands.M365GROUP_RECYCLEBINITEM_LIST;
     }
     get description() {
         return 'Lists Microsoft 365 Groups deleted in the current tenant';
     }
     constructor() {
         super();
-        _AadO365GroupRecycleBinItemListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadO365GroupRecycleBinItemListCommand_instances, "m", _AadO365GroupRecycleBinItemListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupRecycleBinItemListCommand_instances, "m", _AadO365GroupRecycleBinItemListCommand_initOptions).call(this);
+        _AadM365GroupRecycleBinItemListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadM365GroupRecycleBinItemListCommand_instances, "m", _AadM365GroupRecycleBinItemListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupRecycleBinItemListCommand_instances, "m", _AadM365GroupRecycleBinItemListCommand_initOptions).call(this);
     }
     defaultProperties() {
         return ['id', 'displayName', 'mailNickname'];
@@ -39,19 +39,19 @@ class AadO365GroupRecycleBinItemListCommand extends GraphCommand {
         }
     }
 }
-_AadO365GroupRecycleBinItemListCommand_instances = new WeakSet(), _AadO365GroupRecycleBinItemListCommand_initTelemetry = function _AadO365GroupRecycleBinItemListCommand_initTelemetry() {
+_AadM365GroupRecycleBinItemListCommand_instances = new WeakSet(), _AadM365GroupRecycleBinItemListCommand_initTelemetry = function _AadM365GroupRecycleBinItemListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             groupDisplayName: typeof args.options.groupDisplayName !== 'undefined',
             groupMailNickname: typeof args.options.groupMailNickname !== 'undefined'
         });
     });
-}, _AadO365GroupRecycleBinItemListCommand_initOptions = function _AadO365GroupRecycleBinItemListCommand_initOptions() {
+}, _AadM365GroupRecycleBinItemListCommand_initOptions = function _AadM365GroupRecycleBinItemListCommand_initOptions() {
     this.options.unshift({
         option: '-d, --groupDisplayName [groupDisplayName]'
     }, {
         option: '-m, --groupMailNickname [groupMailNickname]'
     });
 };
-export default new AadO365GroupRecycleBinItemListCommand();
-//# sourceMappingURL=o365group-recyclebinitem-list.js.map
+export default new AadM365GroupRecycleBinItemListCommand();
+//# sourceMappingURL=m365group-recyclebinitem-list.js.map

package/dist/m365/aad/commands/{o365group/o365group-recyclebinitem-remove.js → m365group/m365group-recyclebinitem-remove.js}

@@ -3,27 +3,27 @@ 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 _AadO365GroupRecycleBinItemRemoveCommand_instances, _AadO365GroupRecycleBinItemRemoveCommand_initTelemetry, _AadO365GroupRecycleBinItemRemoveCommand_initOptions, _AadO365GroupRecycleBinItemRemoveCommand_initValidators, _AadO365GroupRecycleBinItemRemoveCommand_initOptionSets;
+var _AadM365GroupRecycleBinItemRemoveCommand_instances, _AadM365GroupRecycleBinItemRemoveCommand_initTelemetry, _AadM365GroupRecycleBinItemRemoveCommand_initOptions, _AadM365GroupRecycleBinItemRemoveCommand_initValidators, _AadM365GroupRecycleBinItemRemoveCommand_initOptionSets;
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class AadO365GroupRecycleBinItemRemoveCommand extends GraphCommand {
+class AadM365GroupRecycleBinItemRemoveCommand extends GraphCommand {
     get name() {
-        return commands.O365GROUP_RECYCLEBINITEM_REMOVE;
+        return commands.M365GROUP_RECYCLEBINITEM_REMOVE;
     }
     get description() {
         return 'Permanently deletes a Microsoft 365 Group from the recycle bin in the current tenant';
     }
     constructor() {
         super();
-        _AadO365GroupRecycleBinItemRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadO365GroupRecycleBinItemRemoveCommand_instances, "m", _AadO365GroupRecycleBinItemRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupRecycleBinItemRemoveCommand_instances, "m", _AadO365GroupRecycleBinItemRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupRecycleBinItemRemoveCommand_instances, "m", _AadO365GroupRecycleBinItemRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupRecycleBinItemRemoveCommand_instances, "m", _AadO365GroupRecycleBinItemRemoveCommand_initOptionSets).call(this);
+        _AadM365GroupRecycleBinItemRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadM365GroupRecycleBinItemRemoveCommand_instances, "m", _AadM365GroupRecycleBinItemRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupRecycleBinItemRemoveCommand_instances, "m", _AadM365GroupRecycleBinItemRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupRecycleBinItemRemoveCommand_instances, "m", _AadM365GroupRecycleBinItemRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupRecycleBinItemRemoveCommand_instances, "m", _AadM365GroupRecycleBinItemRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
         const removeGroup = async () => {
@@ -82,12 +82,14 @@ class AadO365GroupRecycleBinItemRemoveCommand extends GraphCommand {
             throw Error(`The specified group '${displayName || mailNickname}' does not exist.`);
         }
         if (groups.length > 1) {
-            throw Error(`Multiple groups with name '${displayName || mailNickname}' found: ${groups.map(x => x.id).join(',')}.`);
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', groups);
+            const result = await Cli.handleMultipleResultsFound(`Multiple groups with name '${displayName || mailNickname}' found.`, resultAsKeyValuePair);
+            return result.id;
         }
         return groups[0].id;
     }
 }
-_AadO365GroupRecycleBinItemRemoveCommand_instances = new WeakSet(), _AadO365GroupRecycleBinItemRemoveCommand_initTelemetry = function _AadO365GroupRecycleBinItemRemoveCommand_initTelemetry() {
+_AadM365GroupRecycleBinItemRemoveCommand_instances = new WeakSet(), _AadM365GroupRecycleBinItemRemoveCommand_initTelemetry = function _AadM365GroupRecycleBinItemRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
@@ -96,7 +98,7 @@ _AadO365GroupRecycleBinItemRemoveCommand_instances = new WeakSet(), _AadO365Grou
             force: !!args.options.force
         });
     });
-}, _AadO365GroupRecycleBinItemRemoveCommand_initOptions = function _AadO365GroupRecycleBinItemRemoveCommand_initOptions() {
+}, _AadM365GroupRecycleBinItemRemoveCommand_initOptions = function _AadM365GroupRecycleBinItemRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id [id]'
     }, {
@@ -106,15 +108,15 @@ _AadO365GroupRecycleBinItemRemoveCommand_instances = new WeakSet(), _AadO365Grou
     }, {
         option: '-f, --force'
     });
-}, _AadO365GroupRecycleBinItemRemoveCommand_initValidators = function _AadO365GroupRecycleBinItemRemoveCommand_initValidators() {
+}, _AadM365GroupRecycleBinItemRemoveCommand_initValidators = function _AadM365GroupRecycleBinItemRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.id && !validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
     });
-}, _AadO365GroupRecycleBinItemRemoveCommand_initOptionSets = function _AadO365GroupRecycleBinItemRemoveCommand_initOptionSets() {
+}, _AadM365GroupRecycleBinItemRemoveCommand_initOptionSets = function _AadM365GroupRecycleBinItemRemoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['id', 'displayName', 'mailNickname'] });
 };
-export default new AadO365GroupRecycleBinItemRemoveCommand();
-//# sourceMappingURL=o365group-recyclebinitem-remove.js.map
+export default new AadM365GroupRecycleBinItemRemoveCommand();
+//# sourceMappingURL=m365group-recyclebinitem-remove.js.map

package/dist/m365/aad/commands/{o365group/o365group-recyclebinitem-restore.js → m365group/m365group-recyclebinitem-restore.js}

@@ -3,26 +3,27 @@ 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 _AadO365GroupRecycleBinItemRestoreCommand_instances, _AadO365GroupRecycleBinItemRestoreCommand_initTelemetry, _AadO365GroupRecycleBinItemRestoreCommand_initOptions, _AadO365GroupRecycleBinItemRestoreCommand_initValidators, _AadO365GroupRecycleBinItemRestoreCommand_initOptionSets;
+var _AadM365GroupRecycleBinItemRestoreCommand_instances, _AadM365GroupRecycleBinItemRestoreCommand_initTelemetry, _AadM365GroupRecycleBinItemRestoreCommand_initOptions, _AadM365GroupRecycleBinItemRestoreCommand_initValidators, _AadM365GroupRecycleBinItemRestoreCommand_initOptionSets;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class AadO365GroupRecycleBinItemRestoreCommand extends GraphCommand {
+import { Cli } from '../../../../cli/Cli.js';
+class AadM365GroupRecycleBinItemRestoreCommand extends GraphCommand {
     get name() {
-        return commands.O365GROUP_RECYCLEBINITEM_RESTORE;
+        return commands.M365GROUP_RECYCLEBINITEM_RESTORE;
     }
     get description() {
         return 'Restores a deleted Microsoft 365 Group';
     }
     constructor() {
         super();
-        _AadO365GroupRecycleBinItemRestoreCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadO365GroupRecycleBinItemRestoreCommand_instances, "m", _AadO365GroupRecycleBinItemRestoreCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupRecycleBinItemRestoreCommand_instances, "m", _AadO365GroupRecycleBinItemRestoreCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupRecycleBinItemRestoreCommand_instances, "m", _AadO365GroupRecycleBinItemRestoreCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupRecycleBinItemRestoreCommand_instances, "m", _AadO365GroupRecycleBinItemRestoreCommand_initOptionSets).call(this);
+        _AadM365GroupRecycleBinItemRestoreCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadM365GroupRecycleBinItemRestoreCommand_instances, "m", _AadM365GroupRecycleBinItemRestoreCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupRecycleBinItemRestoreCommand_instances, "m", _AadM365GroupRecycleBinItemRestoreCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupRecycleBinItemRestoreCommand_instances, "m", _AadM365GroupRecycleBinItemRestoreCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupRecycleBinItemRestoreCommand_instances, "m", _AadM365GroupRecycleBinItemRestoreCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -69,12 +70,14 @@ class AadO365GroupRecycleBinItemRestoreCommand extends GraphCommand {
             throw `The specified group '${displayName || mailNickname}' does not exist.`;
         }
         if (groups.length > 1) {
-            throw `Multiple groups with name '${displayName || mailNickname}' found: ${groups.map(x => x.id).join(',')}.`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', groups);
+            const result = await Cli.handleMultipleResultsFound(`Multiple groups with name '${displayName || mailNickname}' found.`, resultAsKeyValuePair);
+            return result.id;
         }
         return groups[0].id;
     }
 }
-_AadO365GroupRecycleBinItemRestoreCommand_instances = new WeakSet(), _AadO365GroupRecycleBinItemRestoreCommand_initTelemetry = function _AadO365GroupRecycleBinItemRestoreCommand_initTelemetry() {
+_AadM365GroupRecycleBinItemRestoreCommand_instances = new WeakSet(), _AadM365GroupRecycleBinItemRestoreCommand_initTelemetry = function _AadM365GroupRecycleBinItemRestoreCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
@@ -82,7 +85,7 @@ _AadO365GroupRecycleBinItemRestoreCommand_instances = new WeakSet(), _AadO365Gro
             mailNickname: typeof args.options.mailNickname !== 'undefined'
         });
     });
-}, _AadO365GroupRecycleBinItemRestoreCommand_initOptions = function _AadO365GroupRecycleBinItemRestoreCommand_initOptions() {
+}, _AadM365GroupRecycleBinItemRestoreCommand_initOptions = function _AadM365GroupRecycleBinItemRestoreCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id [id]'
     }, {
@@ -90,15 +93,15 @@ _AadO365GroupRecycleBinItemRestoreCommand_instances = new WeakSet(), _AadO365Gro
     }, {
         option: '-m, --mailNickname [mailNickname]'
     });
-}, _AadO365GroupRecycleBinItemRestoreCommand_initValidators = function _AadO365GroupRecycleBinItemRestoreCommand_initValidators() {
+}, _AadM365GroupRecycleBinItemRestoreCommand_initValidators = function _AadM365GroupRecycleBinItemRestoreCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.id && !validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
     });
-}, _AadO365GroupRecycleBinItemRestoreCommand_initOptionSets = function _AadO365GroupRecycleBinItemRestoreCommand_initOptionSets() {
+}, _AadM365GroupRecycleBinItemRestoreCommand_initOptionSets = function _AadM365GroupRecycleBinItemRestoreCommand_initOptionSets() {
     this.optionSets.push({ options: ['id', 'displayName', 'mailNickname'] });
 };
-export default new AadO365GroupRecycleBinItemRestoreCommand();
-//# sourceMappingURL=o365group-recyclebinitem-restore.js.map
+export default new AadM365GroupRecycleBinItemRestoreCommand();
+//# sourceMappingURL=m365group-recyclebinitem-restore.js.map

package/dist/m365/aad/commands/{o365group/o365group-remove.js → m365group/m365group-remove.js}

@@ -3,25 +3,26 @@ 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 _AadO365GroupRemoveCommand_instances, _AadO365GroupRemoveCommand_initTelemetry, _AadO365GroupRemoveCommand_initOptions, _AadO365GroupRemoveCommand_initValidators;
+var _AadM365GroupRemoveCommand_instances, _AadM365GroupRemoveCommand_initTelemetry, _AadM365GroupRemoveCommand_initOptions, _AadM365GroupRemoveCommand_initValidators;
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
+import { aadGroup } from '../../../../utils/aadGroup.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class AadO365GroupRemoveCommand extends GraphCommand {
+class AadM365GroupRemoveCommand extends GraphCommand {
     get name() {
-        return commands.O365GROUP_REMOVE;
+        return commands.M365GROUP_REMOVE;
     }
     get description() {
         return 'Removes an Microsoft 365 Group';
     }
     constructor() {
         super();
-        _AadO365GroupRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadO365GroupRemoveCommand_instances, "m", _AadO365GroupRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupRemoveCommand_instances, "m", _AadO365GroupRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupRemoveCommand_instances, "m", _AadO365GroupRemoveCommand_initValidators).call(this);
+        _AadM365GroupRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadM365GroupRemoveCommand_instances, "m", _AadM365GroupRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupRemoveCommand_instances, "m", _AadM365GroupRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupRemoveCommand_instances, "m", _AadM365GroupRemoveCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
         const removeGroup = async () => {
@@ -29,6 +30,10 @@ class AadO365GroupRemoveCommand extends GraphCommand {
                 await logger.logToStderr(`Removing Microsoft 365 Group: ${args.options.id}...`);
             }
             try {
+                const isUnifiedGroup = await aadGroup.isUnifiedGroup(args.options.id);
+                if (!isUnifiedGroup) {
+                    throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`);
+                }
                 const requestOptions = {
                     url: `${this.resource}/v1.0/groups/${args.options.id}`,
                     headers: {
@@ -66,14 +71,14 @@ class AadO365GroupRemoveCommand extends GraphCommand {
         }
     }
 }
-_AadO365GroupRemoveCommand_instances = new WeakSet(), _AadO365GroupRemoveCommand_initTelemetry = function _AadO365GroupRemoveCommand_initTelemetry() {
+_AadM365GroupRemoveCommand_instances = new WeakSet(), _AadM365GroupRemoveCommand_initTelemetry = function _AadM365GroupRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             force: (!(!args.options.force)).toString(),
             skipRecycleBin: args.options.skipRecycleBin
         });
     });
-}, _AadO365GroupRemoveCommand_initOptions = function _AadO365GroupRemoveCommand_initOptions() {
+}, _AadM365GroupRemoveCommand_initOptions = function _AadM365GroupRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
@@ -81,7 +86,7 @@ _AadO365GroupRemoveCommand_instances = new WeakSet(), _AadO365GroupRemoveCommand
     }, {
         option: '--skipRecycleBin'
     });
-}, _AadO365GroupRemoveCommand_initValidators = function _AadO365GroupRemoveCommand_initValidators() {
+}, _AadM365GroupRemoveCommand_initValidators = function _AadM365GroupRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
         if (!validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
@@ -89,5 +94,5 @@ _AadO365GroupRemoveCommand_instances = new WeakSet(), _AadO365GroupRemoveCommand
         return true;
     });
 };
-export default new AadO365GroupRemoveCommand();
-//# sourceMappingURL=o365group-remove.js.map
+export default new AadM365GroupRemoveCommand();
+//# sourceMappingURL=m365group-remove.js.map

package/dist/m365/aad/commands/{o365group/o365group-renew.js → m365group/m365group-renew.js}

@@ -3,29 +3,34 @@ 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 _AadO365GroupRenewCommand_instances, _AadO365GroupRenewCommand_initOptions, _AadO365GroupRenewCommand_initValidators;
+var _AadM365GroupRenewCommand_instances, _AadM365GroupRenewCommand_initOptions, _AadM365GroupRenewCommand_initValidators;
 import request from '../../../../request.js';
+import { aadGroup } from '../../../../utils/aadGroup.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class AadO365GroupRenewCommand extends GraphCommand {
+class AadM365GroupRenewCommand extends GraphCommand {
     get name() {
-        return commands.O365GROUP_RENEW;
+        return commands.M365GROUP_RENEW;
     }
     get description() {
         return `Renews Microsoft 365 group's expiration`;
     }
     constructor() {
         super();
-        _AadO365GroupRenewCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadO365GroupRenewCommand_instances, "m", _AadO365GroupRenewCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupRenewCommand_instances, "m", _AadO365GroupRenewCommand_initValidators).call(this);
+        _AadM365GroupRenewCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadM365GroupRenewCommand_instances, "m", _AadM365GroupRenewCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupRenewCommand_instances, "m", _AadM365GroupRenewCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
         if (this.verbose) {
             await logger.logToStderr(`Renewing Microsoft 365 group's expiration: ${args.options.id}...`);
         }
         try {
+            const isUnifiedGroup = await aadGroup.isUnifiedGroup(args.options.id);
+            if (!isUnifiedGroup) {
+                throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`);
+            }
             const requestOptions = {
                 url: `${this.resource}/v1.0/groups/${args.options.id}/renew/`,
                 headers: {
@@ -39,11 +44,11 @@ class AadO365GroupRenewCommand extends GraphCommand {
         }
     }
 }
-_AadO365GroupRenewCommand_instances = new WeakSet(), _AadO365GroupRenewCommand_initOptions = function _AadO365GroupRenewCommand_initOptions() {
+_AadM365GroupRenewCommand_instances = new WeakSet(), _AadM365GroupRenewCommand_initOptions = function _AadM365GroupRenewCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
     });
-}, _AadO365GroupRenewCommand_initValidators = function _AadO365GroupRenewCommand_initValidators() {
+}, _AadM365GroupRenewCommand_initValidators = function _AadM365GroupRenewCommand_initValidators() {
     this.validators.push(async (args) => {
         if (!validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
@@ -51,5 +56,5 @@ _AadO365GroupRenewCommand_instances = new WeakSet(), _AadO365GroupRenewCommand_i
         return true;
     });
 };
-export default new AadO365GroupRenewCommand();
-//# sourceMappingURL=o365group-renew.js.map
+export default new AadM365GroupRenewCommand();
+//# sourceMappingURL=m365group-renew.js.map

package/dist/m365/aad/commands/{o365group/o365group-report-activitycounts.js → m365group/m365group-report-activitycounts.js}

@@ -1,8 +1,8 @@
 import PeriodBasedReport from '../../../base/PeriodBasedReport.js';
 import commands from '../../commands.js';
-class O365GroupReportActivityCountsCommand extends PeriodBasedReport {
+class M365GroupReportActivityCountsCommand extends PeriodBasedReport {
     get name() {
-        return commands.O365GROUP_REPORT_ACTIVITYCOUNTS;
+        return commands.M365GROUP_REPORT_ACTIVITYCOUNTS;
     }
     get description() {
         return 'Get the number of group activities across group workloads';
@@ -11,5 +11,5 @@ class O365GroupReportActivityCountsCommand extends PeriodBasedReport {
         return 'getOffice365GroupsActivityCounts';
     }
 }
-export default new O365GroupReportActivityCountsCommand();
-//# sourceMappingURL=o365group-report-activitycounts.js.map
+export default new M365GroupReportActivityCountsCommand();
+//# sourceMappingURL=m365group-report-activitycounts.js.map

package/dist/m365/aad/commands/{o365group/o365group-report-activitydetail.js → m365group/m365group-report-activitydetail.js}

@@ -1,8 +1,8 @@
 import DateAndPeriodBasedReport from '../../../base/DateAndPeriodBasedReport.js';
 import commands from '../../commands.js';
-class O365GroupReportActivityDetailCommand extends DateAndPeriodBasedReport {
+class M365GroupReportActivityDetailCommand extends DateAndPeriodBasedReport {
     get name() {
-        return commands.O365GROUP_REPORT_ACTIVITYDETAIL;
+        return commands.M365GROUP_REPORT_ACTIVITYDETAIL;
     }
     get description() {
         return 'Get details about Microsoft 365 Groups activity by group';
@@ -11,5 +11,5 @@ class O365GroupReportActivityDetailCommand extends DateAndPeriodBasedReport {
         return 'getOffice365GroupsActivityDetail';
     }
 }
-export default new O365GroupReportActivityDetailCommand();
-//# sourceMappingURL=o365group-report-activitydetail.js.map
+export default new M365GroupReportActivityDetailCommand();
+//# sourceMappingURL=m365group-report-activitydetail.js.map

package/dist/m365/aad/commands/{o365group/o365group-report-activityfilecounts.js → m365group/m365group-report-activityfilecounts.js}

@@ -1,8 +1,8 @@
 import PeriodBasedReport from '../../../base/PeriodBasedReport.js';
 import commands from '../../commands.js';
-class O365GroupReportActivityFileCountsCommand extends PeriodBasedReport {
+class M365GroupReportActivityFileCountsCommand extends PeriodBasedReport {
     get name() {
-        return commands.O365GROUP_REPORT_ACTIVITYFILECOUNTS;
+        return commands.M365GROUP_REPORT_ACTIVITYFILECOUNTS;
     }
     get description() {
         return 'Get the total number of files and how many of them were active across all group sites associated with an Microsoft 365 Group';
@@ -11,5 +11,5 @@ class O365GroupReportActivityFileCountsCommand extends PeriodBasedReport {
         return 'getOffice365GroupsActivityFileCounts';
     }
 }
-export default new O365GroupReportActivityFileCountsCommand();
-//# sourceMappingURL=o365group-report-activityfilecounts.js.map
+export default new M365GroupReportActivityFileCountsCommand();
+//# sourceMappingURL=m365group-report-activityfilecounts.js.map

package/dist/m365/aad/commands/{o365group/o365group-report-activitygroupcounts.js → m365group/m365group-report-activitygroupcounts.js}

@@ -1,8 +1,8 @@
 import PeriodBasedReport from '../../../base/PeriodBasedReport.js';
 import commands from '../../commands.js';
-class O365GroupReportActivityGroupCountsCommand extends PeriodBasedReport {
+class M365GroupReportActivityGroupCountsCommand extends PeriodBasedReport {
     get name() {
-        return commands.O365GROUP_REPORT_ACTIVITYGROUPCOUNTS;
+        return commands.M365GROUP_REPORT_ACTIVITYGROUPCOUNTS;
     }
     get description() {
         return 'Get the daily total number of groups and how many of them were active based on email conversations, Yammer posts, and SharePoint file activities';
@@ -11,5 +11,5 @@ class O365GroupReportActivityGroupCountsCommand extends PeriodBasedReport {
         return 'getOffice365GroupsActivityGroupCounts';
     }
 }
-export default new O365GroupReportActivityGroupCountsCommand();
-//# sourceMappingURL=o365group-report-activitygroupcounts.js.map
+export default new M365GroupReportActivityGroupCountsCommand();
+//# sourceMappingURL=m365group-report-activitygroupcounts.js.map

package/dist/m365/aad/commands/{o365group/o365group-report-activitystorage.js → m365group/m365group-report-activitystorage.js}

@@ -1,8 +1,8 @@
 import PeriodBasedReport from '../../../base/PeriodBasedReport.js';
 import commands from '../../commands.js';
-class O365GroupReportActivityStorageCommand extends PeriodBasedReport {
+class M365GroupReportActivityStorageCommand extends PeriodBasedReport {
     get name() {
-        return commands.O365GROUP_REPORT_ACTIVITYSTORAGE;
+        return commands.M365GROUP_REPORT_ACTIVITYSTORAGE;
     }
     get description() {
         return 'Get the total storage used across all group mailboxes and group sites';
@@ -11,5 +11,5 @@ class O365GroupReportActivityStorageCommand extends PeriodBasedReport {
         return 'getOffice365GroupsActivityStorage';
     }
 }
-export default new O365GroupReportActivityStorageCommand();
-//# sourceMappingURL=o365group-report-activitystorage.js.map
+export default new M365GroupReportActivityStorageCommand();
+//# sourceMappingURL=m365group-report-activitystorage.js.map