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

package/dist/m365/aad/commands/group/group-remove.js

@@ -0,0 +1,98 @@
+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 _AadGroupRemoveCommand_instances, _AadGroupRemoveCommand_initTelemetry, _AadGroupRemoveCommand_initOptions, _AadGroupRemoveCommand_initOptionSets, _AadGroupRemoveCommand_initValidators, _AadGroupRemoveCommand_initTypes;
+import { Cli } from '../../../../cli/Cli.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import request from '../../../../request.js';
+import { aadGroup } from '../../../../utils/aadGroup.js';
+import { validation } from '../../../../utils/validation.js';
+class AadGroupRemoveCommand extends GraphCommand {
+    get name() {
+        return commands.GROUP_REMOVE;
+    }
+    get description() {
+        return 'Removes an Azure AD group';
+    }
+    constructor() {
+        super();
+        _AadGroupRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadGroupRemoveCommand_instances, "m", _AadGroupRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadGroupRemoveCommand_instances, "m", _AadGroupRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadGroupRemoveCommand_instances, "m", _AadGroupRemoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _AadGroupRemoveCommand_instances, "m", _AadGroupRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadGroupRemoveCommand_instances, "m", _AadGroupRemoveCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        const removeGroup = async () => {
+            if (this.verbose) {
+                await logger.logToStderr(`Removing group ${args.options.id || args.options.displayName}...`);
+            }
+            try {
+                let groupId = args.options.id;
+                if (args.options.displayName) {
+                    groupId = await aadGroup.getGroupIdByDisplayName(args.options.displayName);
+                }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/groups/${groupId}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    }
+                };
+                await request.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        };
+        if (args.options.force) {
+            await removeGroup();
+        }
+        else {
+            const result = await Cli.prompt({
+                type: 'confirm',
+                name: 'continue',
+                default: false,
+                message: `Are you sure you want to remove group '${args.options.id || args.options.displayName}'?`
+            });
+            if (result.continue) {
+                await removeGroup();
+            }
+        }
+    }
+}
+_AadGroupRemoveCommand_instances = new WeakSet(), _AadGroupRemoveCommand_initTelemetry = function _AadGroupRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: args.options.id !== 'undefined',
+            displayName: args.options.displayName !== 'undefined',
+            force: !!args.options.force
+        });
+    });
+}, _AadGroupRemoveCommand_initOptions = function _AadGroupRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --displayName [displayName]'
+    }, {
+        option: '-f, --force'
+    });
+}, _AadGroupRemoveCommand_initOptionSets = function _AadGroupRemoveCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['id', 'displayName']
+    });
+}, _AadGroupRemoveCommand_initValidators = function _AadGroupRemoveCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID for option id.`;
+        }
+        return true;
+    });
+}, _AadGroupRemoveCommand_initTypes = function _AadGroupRemoveCommand_initTypes() {
+    this.types.string.push('id', 'displayName');
+};
+export default new AadGroupRemoveCommand();
+//# sourceMappingURL=group-remove.js.map

package/dist/m365/aad/commands/{o365group/o365group-add.js → m365group/m365group-add.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 _AadO365GroupAddCommand_instances, _AadO365GroupAddCommand_initTelemetry, _AadO365GroupAddCommand_initOptions, _AadO365GroupAddCommand_initTypes, _AadO365GroupAddCommand_initValidators;
+var _AadM365GroupAddCommand_instances, _AadM365GroupAddCommand_initTelemetry, _AadM365GroupAddCommand_initOptions, _AadM365GroupAddCommand_initTypes, _AadM365GroupAddCommand_initValidators;
 import { setTimeout } from 'timers/promises';
 import fs from 'fs';
 import path from 'path';
@@ -11,41 +11,43 @@ import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class AadO365GroupAddCommand extends GraphCommand {
+class AadM365GroupAddCommand extends GraphCommand {
     get name() {
-        return commands.O365GROUP_ADD;
+        return commands.M365GROUP_ADD;
     }
     get description() {
         return 'Creates a Microsoft 365 Group';
     }
     constructor() {
         super();
-        _AadO365GroupAddCommand_instances.add(this);
+        _AadM365GroupAddCommand_instances.add(this);
         this.pollingInterval = 500;
-        __classPrivateFieldGet(this, _AadO365GroupAddCommand_instances, "m", _AadO365GroupAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupAddCommand_instances, "m", _AadO365GroupAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupAddCommand_instances, "m", _AadO365GroupAddCommand_initTypes).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupAddCommand_instances, "m", _AadO365GroupAddCommand_initValidators).call(this);
+        this.allowedVisibilities = ['Private', 'Public', 'HiddenMembership'];
+        __classPrivateFieldGet(this, _AadM365GroupAddCommand_instances, "m", _AadM365GroupAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupAddCommand_instances, "m", _AadM365GroupAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupAddCommand_instances, "m", _AadM365GroupAddCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupAddCommand_instances, "m", _AadM365GroupAddCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
         let group;
         let ownerIds = [];
         let memberIds = [];
         const resourceBehaviorOptionsCollection = [];
+        const resolvedVisibility = args.options.visibility || 'Public';
         if (this.verbose) {
-            await logger.logToStderr(`Creating Microsoft 365 Group...`);
+            await logger.logToStderr('Creating Microsoft 365 Group...');
         }
         if (args.options.allowMembersToPost) {
-            resourceBehaviorOptionsCollection.push("allowMembersToPost");
+            resourceBehaviorOptionsCollection.push('AllowOnlyMembersToPost');
         }
         if (args.options.hideGroupInOutlook) {
-            resourceBehaviorOptionsCollection.push("hideGroupInOutlook");
+            resourceBehaviorOptionsCollection.push('HideGroupInOutlook');
         }
         if (args.options.subscribeNewGroupMembers) {
-            resourceBehaviorOptionsCollection.push("subscribeNewGroupMembers");
+            resourceBehaviorOptionsCollection.push('SubscribeNewGroupMembers');
         }
         if (args.options.welcomeEmailDisabled) {
-            resourceBehaviorOptionsCollection.push("welcomeEmailDisabled");
+            resourceBehaviorOptionsCollection.push('WelcomeEmailDisabled');
         }
         const requestOptions = {
             url: `${this.resource}/v1.0/groups`,
@@ -63,7 +65,7 @@ class AadO365GroupAddCommand extends GraphCommand {
                 mailNickname: args.options.mailNickname,
                 resourceBehaviorOptions: resourceBehaviorOptionsCollection,
                 securityEnabled: false,
-                visibility: args.options.isPrivate ? 'Private' : 'Public'
+                visibility: resolvedVisibility
             }
         };
         try {
@@ -87,7 +89,7 @@ class AadO365GroupAddCommand extends GraphCommand {
                     },
                     data: fs.readFileSync(fullPath)
                 };
-                await this.setGroupLogo(requestOptionsPhoto, AadO365GroupAddCommand.numRepeat, logger);
+                await this.setGroupLogo(requestOptionsPhoto, AadM365GroupAddCommand.numRepeat, logger);
             }
             if (ownerIds.length !== 0) {
                 await Promise.all(ownerIds.map(ownerId => request.post({
@@ -159,7 +161,7 @@ class AadO365GroupAddCommand extends GraphCommand {
         }
         catch (err) {
             if (--retryLeft > 0) {
-                await setTimeout(this.pollingInterval * (AadO365GroupAddCommand.numRepeat - retryLeft));
+                await setTimeout(this.pollingInterval * (AadM365GroupAddCommand.numRepeat - retryLeft));
                 await this.setGroupLogo(requestOptions, retryLeft, logger);
             }
             else {
@@ -179,20 +181,20 @@ class AadO365GroupAddCommand extends GraphCommand {
         }
     }
 }
-_AadO365GroupAddCommand_instances = new WeakSet(), _AadO365GroupAddCommand_initTelemetry = function _AadO365GroupAddCommand_initTelemetry() {
+_AadM365GroupAddCommand_instances = new WeakSet(), _AadM365GroupAddCommand_initTelemetry = function _AadM365GroupAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             owners: typeof args.options.owners !== 'undefined',
             members: typeof args.options.members !== 'undefined',
             logoPath: typeof args.options.logoPath !== 'undefined',
-            isPrivate: typeof args.options.isPrivate !== 'undefined',
-            allowMembersToPost: args.options.allowMembersToPost,
-            hideGroupInOutlook: args.options.hideGroupInOutlook,
-            subscribeNewGroupMembers: args.options.subscribeNewGroupMembers,
-            welcomeEmailDisabled: args.options.welcomeEmailDisabled
+            visibility: typeof args.options.visibility !== 'undefined',
+            allowMembersToPost: !!args.options.allowMembersToPost,
+            hideGroupInOutlook: !!args.options.hideGroupInOutlook,
+            subscribeNewGroupMembers: !!args.options.subscribeNewGroupMembers,
+            welcomeEmailDisabled: !!args.options.welcomeEmailDisabled
         });
     });
-}, _AadO365GroupAddCommand_initOptions = function _AadO365GroupAddCommand_initOptions() {
+}, _AadM365GroupAddCommand_initOptions = function _AadM365GroupAddCommand_initOptions() {
     this.options.unshift({
         option: '-n, --displayName <displayName>'
     }, {
@@ -204,7 +206,8 @@ _AadO365GroupAddCommand_instances = new WeakSet(), _AadO365GroupAddCommand_initT
     }, {
         option: '--members [members]'
     }, {
-        option: '--isPrivate'
+        option: '--visibility [visibility]',
+        autocomplete: this.allowedVisibilities
     }, {
         option: '--allowMembersToPost [allowMembersToPost]',
         autocomplete: ['true', 'false']
@@ -220,9 +223,9 @@ _AadO365GroupAddCommand_instances = new WeakSet(), _AadO365GroupAddCommand_initT
     }, {
         option: '-l, --logoPath [logoPath]'
     });
-}, _AadO365GroupAddCommand_initTypes = function _AadO365GroupAddCommand_initTypes() {
+}, _AadM365GroupAddCommand_initTypes = function _AadM365GroupAddCommand_initTypes() {
     this.types.boolean.push('allowMembersToPost', 'hideGroupInOutlook', 'subscribeNewGroupMembers', 'welcomeEmailDisabled');
-}, _AadO365GroupAddCommand_initValidators = function _AadO365GroupAddCommand_initValidators() {
+}, _AadM365GroupAddCommand_initValidators = function _AadM365GroupAddCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.owners) {
             const owners = args.options.owners.split(',').map(o => o.trim());
@@ -240,6 +243,9 @@ _AadO365GroupAddCommand_instances = new WeakSet(), _AadO365GroupAddCommand_initT
                 }
             }
         }
+        if (args.options.mailNickname.indexOf(' ') !== -1) {
+            return 'The option mailNickname cannot contain spaces.';
+        }
         if (args.options.logoPath) {
             const fullPath = path.resolve(args.options.logoPath);
             if (!fs.existsSync(fullPath)) {
@@ -249,9 +255,12 @@ _AadO365GroupAddCommand_instances = new WeakSet(), _AadO365GroupAddCommand_initT
                 return `Path '${fullPath}' points to a directory`;
             }
         }
+        if (args.options.visibility && this.allowedVisibilities.map(x => x.toLowerCase()).indexOf(args.options.visibility.toLowerCase()) === -1) {
+            return `${args.options.visibility} is not a valid visibility. Allowed values are ${this.allowedVisibilities.join(', ')}`;
+        }
         return true;
     });
 };
-AadO365GroupAddCommand.numRepeat = 15;
-export default new AadO365GroupAddCommand();
-//# sourceMappingURL=o365group-add.js.map
+AadM365GroupAddCommand.numRepeat = 15;
+export default new AadM365GroupAddCommand();
+//# sourceMappingURL=m365group-add.js.map

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

@@ -3,14 +3,15 @@ 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 _AadO365GroupConversationListCommand_instances, _AadO365GroupConversationListCommand_initOptions, _AadO365GroupConversationListCommand_initValidators;
+var _AadM365GroupConversationListCommand_instances, _AadM365GroupConversationListCommand_initOptions, _AadM365GroupConversationListCommand_initValidators;
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class AadO365GroupConversationListCommand extends GraphCommand {
+import { aadGroup } from '../../../../utils/aadGroup.js';
+class AadM365GroupConversationListCommand extends GraphCommand {
     get name() {
-        return commands.O365GROUP_CONVERSATION_LIST;
+        return commands.M365GROUP_CONVERSATION_LIST;
     }
     get description() {
         return 'Lists conversations for the specified Microsoft 365 group';
@@ -20,12 +21,16 @@ class AadO365GroupConversationListCommand extends GraphCommand {
     }
     constructor() {
         super();
-        _AadO365GroupConversationListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadO365GroupConversationListCommand_instances, "m", _AadO365GroupConversationListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupConversationListCommand_instances, "m", _AadO365GroupConversationListCommand_initValidators).call(this);
+        _AadM365GroupConversationListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadM365GroupConversationListCommand_instances, "m", _AadM365GroupConversationListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupConversationListCommand_instances, "m", _AadM365GroupConversationListCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
         try {
+            const isUnifiedGroup = await aadGroup.isUnifiedGroup(args.options.groupId);
+            if (!isUnifiedGroup) {
+                throw Error(`Specified group with id '${args.options.groupId}' is not a Microsoft 365 group.`);
+            }
             const conversations = await odata.getAllItems(`${this.resource}/v1.0/groups/${args.options.groupId}/conversations`);
             await logger.log(conversations);
         }
@@ -34,11 +39,11 @@ class AadO365GroupConversationListCommand extends GraphCommand {
         }
     }
 }
-_AadO365GroupConversationListCommand_instances = new WeakSet(), _AadO365GroupConversationListCommand_initOptions = function _AadO365GroupConversationListCommand_initOptions() {
+_AadM365GroupConversationListCommand_instances = new WeakSet(), _AadM365GroupConversationListCommand_initOptions = function _AadM365GroupConversationListCommand_initOptions() {
     this.options.unshift({
         option: '-i, --groupId <groupId>'
     });
-}, _AadO365GroupConversationListCommand_initValidators = function _AadO365GroupConversationListCommand_initValidators() {
+}, _AadM365GroupConversationListCommand_initValidators = function _AadM365GroupConversationListCommand_initValidators() {
     this.validators.push(async (args) => {
         if (!validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
@@ -46,5 +51,5 @@ _AadO365GroupConversationListCommand_instances = new WeakSet(), _AadO365GroupCon
         return true;
     });
 };
-export default new AadO365GroupConversationListCommand();
-//# sourceMappingURL=o365group-conversation-list.js.map
+export default new AadM365GroupConversationListCommand();
+//# sourceMappingURL=m365group-conversation-list.js.map

package/dist/m365/aad/commands/{o365group/o365group-conversation-post-list.js → m365group/m365group-conversation-post-list.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 _AadO365GroupConversationPostListCommand_instances, _AadO365GroupConversationPostListCommand_initTelemetry, _AadO365GroupConversationPostListCommand_initOptions, _AadO365GroupConversationPostListCommand_initValidators, _AadO365GroupConversationPostListCommand_initOptionSets;
+var _AadM365GroupConversationPostListCommand_instances, _AadM365GroupConversationPostListCommand_initTelemetry, _AadM365GroupConversationPostListCommand_initOptions, _AadM365GroupConversationPostListCommand_initValidators, _AadM365GroupConversationPostListCommand_initOptionSets;
 import { aadGroup } from '../../../../utils/aadGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class AadO365GroupConversationPostListCommand extends GraphCommand {
+class AadM365GroupConversationPostListCommand extends GraphCommand {
     get name() {
-        return commands.O365GROUP_CONVERSATION_POST_LIST;
+        return commands.M365GROUP_CONVERSATION_POST_LIST;
     }
     get description() {
         return 'Lists conversation posts of a Microsoft 365 group';
     }
     constructor() {
         super();
-        _AadO365GroupConversationPostListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadO365GroupConversationPostListCommand_instances, "m", _AadO365GroupConversationPostListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupConversationPostListCommand_instances, "m", _AadO365GroupConversationPostListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupConversationPostListCommand_instances, "m", _AadO365GroupConversationPostListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupConversationPostListCommand_instances, "m", _AadO365GroupConversationPostListCommand_initOptionSets).call(this);
+        _AadM365GroupConversationPostListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadM365GroupConversationPostListCommand_instances, "m", _AadM365GroupConversationPostListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupConversationPostListCommand_instances, "m", _AadM365GroupConversationPostListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupConversationPostListCommand_instances, "m", _AadM365GroupConversationPostListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupConversationPostListCommand_instances, "m", _AadM365GroupConversationPostListCommand_initOptionSets).call(this);
     }
     defaultProperties() {
         return ['receivedDateTime', 'id'];
@@ -31,6 +31,10 @@ class AadO365GroupConversationPostListCommand extends GraphCommand {
     async commandAction(logger, args) {
         try {
             const retrievedgroupId = await this.getGroupId(args);
+            const isUnifiedGroup = await aadGroup.isUnifiedGroup(retrievedgroupId);
+            if (!isUnifiedGroup) {
+                throw Error(`Specified group with id '${retrievedgroupId}' is not a Microsoft 365 group.`);
+            }
             const posts = await odata.getAllItems(`${this.resource}/v1.0/groups/${retrievedgroupId}/threads/${args.options.threadId}/posts`);
             await logger.log(posts);
         }
@@ -46,14 +50,14 @@ class AadO365GroupConversationPostListCommand extends GraphCommand {
         return group.id;
     }
 }
-_AadO365GroupConversationPostListCommand_instances = new WeakSet(), _AadO365GroupConversationPostListCommand_initTelemetry = function _AadO365GroupConversationPostListCommand_initTelemetry() {
+_AadM365GroupConversationPostListCommand_instances = new WeakSet(), _AadM365GroupConversationPostListCommand_initTelemetry = function _AadM365GroupConversationPostListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             groupId: typeof args.options.groupId !== 'undefined',
             groupDisplayName: typeof args.options.groupDisplayName !== 'undefined'
         });
     });
-}, _AadO365GroupConversationPostListCommand_initOptions = function _AadO365GroupConversationPostListCommand_initOptions() {
+}, _AadM365GroupConversationPostListCommand_initOptions = function _AadM365GroupConversationPostListCommand_initOptions() {
     this.options.unshift({
         option: '-i, --groupId [groupId]'
     }, {
@@ -61,15 +65,15 @@ _AadO365GroupConversationPostListCommand_instances = new WeakSet(), _AadO365Grou
     }, {
         option: '-t, --threadId <threadId>'
     });
-}, _AadO365GroupConversationPostListCommand_initValidators = function _AadO365GroupConversationPostListCommand_initValidators() {
+}, _AadM365GroupConversationPostListCommand_initValidators = function _AadM365GroupConversationPostListCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         return true;
     });
-}, _AadO365GroupConversationPostListCommand_initOptionSets = function _AadO365GroupConversationPostListCommand_initOptionSets() {
+}, _AadM365GroupConversationPostListCommand_initOptionSets = function _AadM365GroupConversationPostListCommand_initOptionSets() {
     this.optionSets.push({ options: ['groupId', 'groupDisplayName'] });
 };
-export default new AadO365GroupConversationPostListCommand();
-//# sourceMappingURL=o365group-conversation-post-list.js.map
+export default new AadM365GroupConversationPostListCommand();
+//# sourceMappingURL=m365group-conversation-post-list.js.map

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

@@ -3,28 +3,32 @@ 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 _AadO365GroupGetCommand_instances, _AadO365GroupGetCommand_initOptions, _AadO365GroupGetCommand_initValidators;
+var _AadM365GroupGetCommand_instances, _AadM365GroupGetCommand_initOptions, _AadM365GroupGetCommand_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 AadO365GroupGetCommand extends GraphCommand {
+class AadM365GroupGetCommand extends GraphCommand {
     get name() {
-        return commands.O365GROUP_GET;
+        return commands.M365GROUP_GET;
     }
     get description() {
         return 'Gets information about the specified Microsoft 365 Group or Microsoft Teams team';
     }
     constructor() {
         super();
-        _AadO365GroupGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadO365GroupGetCommand_instances, "m", _AadO365GroupGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupGetCommand_instances, "m", _AadO365GroupGetCommand_initValidators).call(this);
+        _AadM365GroupGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadM365GroupGetCommand_instances, "m", _AadM365GroupGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupGetCommand_instances, "m", _AadM365GroupGetCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
         let group;
         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.`);
+            }
             group = await aadGroup.getGroupById(args.options.id);
             if (args.options.includeSiteUrl) {
                 const requestOptions = {
@@ -44,13 +48,13 @@ class AadO365GroupGetCommand extends GraphCommand {
         }
     }
 }
-_AadO365GroupGetCommand_instances = new WeakSet(), _AadO365GroupGetCommand_initOptions = function _AadO365GroupGetCommand_initOptions() {
+_AadM365GroupGetCommand_instances = new WeakSet(), _AadM365GroupGetCommand_initOptions = function _AadM365GroupGetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
         option: '--includeSiteUrl'
     });
-}, _AadO365GroupGetCommand_initValidators = function _AadO365GroupGetCommand_initValidators() {
+}, _AadM365GroupGetCommand_initValidators = function _AadM365GroupGetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (!validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
@@ -58,5 +62,5 @@ _AadO365GroupGetCommand_instances = new WeakSet(), _AadO365GroupGetCommand_initO
         return true;
     });
 };
-export default new AadO365GroupGetCommand();
-//# sourceMappingURL=o365group-get.js.map
+export default new AadM365GroupGetCommand();
+//# sourceMappingURL=m365group-get.js.map

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

@@ -3,28 +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 _AadO365GroupListCommand_instances, _AadO365GroupListCommand_initTelemetry, _AadO365GroupListCommand_initOptions, _AadO365GroupListCommand_initValidators;
+var _AadM365GroupListCommand_instances, _AadM365GroupListCommand_initTelemetry, _AadM365GroupListCommand_initOptions;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class AadO365GroupListCommand extends GraphCommand {
+class AadM365GroupListCommand extends GraphCommand {
     get name() {
-        return commands.O365GROUP_LIST;
+        return commands.M365GROUP_LIST;
     }
     get description() {
         return 'Lists Microsoft 365 Groups in the current tenant';
     }
     constructor() {
         super();
-        _AadO365GroupListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadO365GroupListCommand_instances, "m", _AadO365GroupListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupListCommand_instances, "m", _AadO365GroupListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupListCommand_instances, "m", _AadO365GroupListCommand_initValidators).call(this);
+        _AadM365GroupListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadM365GroupListCommand_instances, "m", _AadM365GroupListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupListCommand_instances, "m", _AadM365GroupListCommand_initOptions).call(this);
     }
     defaultProperties() {
-        return ['id', 'displayName', 'mailNickname', 'deletedDateTime', 'siteUrl'];
+        return ['id', 'displayName', 'mailNickname', 'siteUrl'];
     }
     async commandAction(logger, args) {
         const groupFilter = `?$filter=groupTypes/any(c:c+eq+'Unified')`;
@@ -32,13 +31,9 @@ class AadO365GroupListCommand extends GraphCommand {
         const mailNicknameFilter = args.options.mailNickname ? ` and startswith(MailNickname,'${formatting.encodeQueryParameter(args.options.mailNickname)}')` : '';
         const expandOwners = args.options.orphaned ? '&$expand=owners' : '';
         const topCount = '&$top=100';
-        let endpoint = `${this.resource}/v1.0/groups${groupFilter}${displayNameFilter}${mailNicknameFilter}${expandOwners}${topCount}`;
-        if (args.options.deleted) {
-            endpoint = `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group${groupFilter}${displayNameFilter}${mailNicknameFilter}${topCount}`;
-        }
         try {
             let groups = [];
-            groups = await odata.getAllItems(endpoint);
+            groups = await odata.getAllItems(`${this.resource}/v1.0/groups${groupFilter}${displayNameFilter}${mailNicknameFilter}${expandOwners}${topCount}`);
             if (args.options.orphaned) {
                 const orphanedGroups = [];
                 groups.forEach((group) => {
@@ -81,35 +76,25 @@ class AadO365GroupListCommand extends GraphCommand {
         };
     }
 }
-_AadO365GroupListCommand_instances = new WeakSet(), _AadO365GroupListCommand_initTelemetry = function _AadO365GroupListCommand_initTelemetry() {
+_AadM365GroupListCommand_instances = new WeakSet(), _AadM365GroupListCommand_initTelemetry = function _AadM365GroupListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             displayName: typeof args.options.displayName !== 'undefined',
             mailNickname: typeof args.options.mailNickname !== 'undefined',
             includeSiteUrl: args.options.includeSiteUrl,
-            deleted: args.options.deleted,
-            orphaned: args.options.orphaned
+            orphaned: !!args.options.orphaned
         });
     });
-}, _AadO365GroupListCommand_initOptions = function _AadO365GroupListCommand_initOptions() {
+}, _AadM365GroupListCommand_initOptions = function _AadM365GroupListCommand_initOptions() {
     this.options.unshift({
         option: '-d, --displayName [displayName]'
     }, {
         option: '-m, --mailNickname [displayName]'
     }, {
         option: '--includeSiteUrl'
-    }, {
-        option: '--deleted'
     }, {
         option: '--orphaned'
     });
-}, _AadO365GroupListCommand_initValidators = function _AadO365GroupListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.deleted && args.options.includeSiteUrl) {
-            return 'You can\'t retrieve site URLs of deleted Microsoft 365 Groups';
-        }
-        return true;
-    });
 };
-export default new AadO365GroupListCommand();
-//# sourceMappingURL=o365group-list.js.map
+export default new AadM365GroupListCommand();
+//# sourceMappingURL=m365group-list.js.map