@pnp/cli-microsoft365 7.0.0-beta.b7c2a8d → 7.0.0-beta.c0afb7b

package/.eslintrc.cjs

@@ -57,13 +57,13 @@ const dictionary = [
   'member',
   'messaging',
   'model',
+  'm365',
   'news',
   'oauth2',
   'office365',
   'one',
   'org',
   'owner',
-  'o365',
   'permission',
   'place',
   'policy',
@@ -128,8 +128,6 @@ module.exports = {
     "mocha"
   ],
   "ignorePatterns": [
-    "**/pcf-init/assets/**",
-    "**/solution-init/assets/**",
     "**/package-generate/assets/**",
     "**/test-projects/**",
     "clientsidepages.ts",

package/dist/GlobalOptions.js

@@ -1,8 +1,2 @@
-export var Output;
-(function (Output) {
-    Output[Output["text"] = 0] = "text";
-    Output[Output["json"] = 1] = "json";
-    Output[Output["csv"] = 2] = "csv";
-    Output[Output["md"] = 3] = "md";
-})(Output || (Output = {}));
+export {};
 //# sourceMappingURL=GlobalOptions.js.map

package/dist/cli/Cli.js

@@ -761,8 +761,9 @@ export class Cli {
     }
     static log(message, ...optionalParams) {
         const cli = Cli.getInstance();
+        const spinnerSpinning = cli.spinner.isSpinning;
         /* c8 ignore next 3 */
-        if (cli.spinner.isSpinning) {
+        if (spinnerSpinning) {
             cli.spinner.stop();
         }
         if (message) {
@@ -771,15 +772,31 @@ export class Cli {
         else {
             console.log();
         }
+        // Restart the spinner if it was running before the log
+        /* c8 ignore next 3 */
+        if (spinnerSpinning) {
+            cli.spinner.start();
+        }
     }
     static async error(message, ...optionalParams) {
-        const errorOutput = await Cli.getInstance().getSettingWithDefaultValue(settingsNames.errorOutput, 'stderr');
+        const cli = Cli.getInstance();
+        const spinnerSpinning = cli.spinner.isSpinning;
+        /* c8 ignore next 3 */
+        if (spinnerSpinning) {
+            cli.spinner.stop();
+        }
+        const errorOutput = cli.getSettingWithDefaultValue(settingsNames.errorOutput, 'stderr');
         if (errorOutput === 'stdout') {
             console.log(message, ...optionalParams);
         }
         else {
             console.error(message, ...optionalParams);
         }
+        // Restart the spinner if it was running before the log
+        /* c8 ignore next 3 */
+        if (spinnerSpinning) {
+            cli.spinner.start();
+        }
     }
     static async prompt(options, answers) {
         const inquirer = await import('inquirer');

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,21 +11,21 @@ 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);
+        __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;
@@ -87,7 +87,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 +159,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,7 +179,7 @@ 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',
@@ -192,7 +192,7 @@ _AadO365GroupAddCommand_instances = new WeakSet(), _AadO365GroupAddCommand_initT
             welcomeEmailDisabled: args.options.welcomeEmailDisabled
         });
     });
-}, _AadO365GroupAddCommand_initOptions = function _AadO365GroupAddCommand_initOptions() {
+}, _AadM365GroupAddCommand_initOptions = function _AadM365GroupAddCommand_initOptions() {
     this.options.unshift({
         option: '-n, --displayName <displayName>'
     }, {
@@ -220,9 +220,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());
@@ -252,6 +252,6 @@ _AadO365GroupAddCommand_instances = new WeakSet(), _AadO365GroupAddCommand_initT
         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,14 @@ 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 {
+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,9 +20,9 @@ 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 {
@@ -34,11 +34,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 +46,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'];
@@ -46,14 +46,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 +61,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,29 +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 {
             group = await aadGroup.getGroupById(args.options.id);
+            if (!group.groupTypes.some(type => type === 'Unified')) {
+                throw `Specified group with id '${args.options.id}' is not a Microsoft 365 group.`;
+            }
             if (args.options.includeSiteUrl) {
                 const requestOptions = {
                     url: `${this.resource}/v1.0/groups/${group.id}/drive?$select=webUrl`,
@@ -44,13 +47,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 +61,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

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