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

package/dist/m365/aad/commands/{o365group/o365group-set.js → m365group/m365group-set.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 _AadO365GroupSetCommand_instances, _AadO365GroupSetCommand_initTelemetry, _AadO365GroupSetCommand_initOptions, _AadO365GroupSetCommand_initTypes, _AadO365GroupSetCommand_initValidators;
+var _AadM365GroupSetCommand_instances, _AadM365GroupSetCommand_initTelemetry, _AadM365GroupSetCommand_initOptions, _AadM365GroupSetCommand_initTypes, _AadM365GroupSetCommand_initValidators;
 import { setTimeout } from 'timers/promises';
 import fs from 'fs';
 import path from 'path';
@@ -11,24 +11,29 @@ import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class AadO365GroupSetCommand extends GraphCommand {
+import { aadGroup } from '../../../../utils/aadGroup.js';
+class AadM365GroupSetCommand extends GraphCommand {
     get name() {
-        return commands.O365GROUP_SET;
+        return commands.M365GROUP_SET;
     }
     get description() {
         return 'Updates Microsoft 365 Group properties';
     }
     constructor() {
         super();
-        _AadO365GroupSetCommand_instances.add(this);
+        _AadM365GroupSetCommand_instances.add(this);
         this.pollingInterval = 500;
-        __classPrivateFieldGet(this, _AadO365GroupSetCommand_instances, "m", _AadO365GroupSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupSetCommand_instances, "m", _AadO365GroupSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupSetCommand_instances, "m", _AadO365GroupSetCommand_initTypes).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupSetCommand_instances, "m", _AadO365GroupSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupSetCommand_instances, "m", _AadM365GroupSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupSetCommand_instances, "m", _AadM365GroupSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupSetCommand_instances, "m", _AadM365GroupSetCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupSetCommand_instances, "m", _AadM365GroupSetCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
         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.`);
+            }
             if (args.options.displayName || args.options.description || typeof args.options.isPrivate !== 'undefined') {
                 if (this.verbose) {
                     await logger.logToStderr(`Updating Microsoft 365 Group ${args.options.id}...`);
@@ -65,7 +70,7 @@ class AadO365GroupSetCommand extends GraphCommand {
                     },
                     data: fs.readFileSync(fullPath)
                 };
-                await this.setGroupLogo(requestOptions, AadO365GroupSetCommand.numRepeat, logger);
+                await this.setGroupLogo(requestOptions, AadM365GroupSetCommand.numRepeat, logger);
             }
             else if (this.debug) {
                 await logger.logToStderr('logoPath not set. Skipping');
@@ -135,7 +140,7 @@ class AadO365GroupSetCommand extends GraphCommand {
         }
         catch (err) {
             if (--retryLeft > 0) {
-                await setTimeout(this.pollingInterval * (AadO365GroupSetCommand.numRepeat - retryLeft));
+                await setTimeout(this.pollingInterval * (AadM365GroupSetCommand.numRepeat - retryLeft));
                 await this.setGroupLogo(requestOptions, retryLeft, logger);
             }
             else {
@@ -155,7 +160,7 @@ class AadO365GroupSetCommand extends GraphCommand {
         }
     }
 }
-_AadO365GroupSetCommand_instances = new WeakSet(), _AadO365GroupSetCommand_initTelemetry = function _AadO365GroupSetCommand_initTelemetry() {
+_AadM365GroupSetCommand_instances = new WeakSet(), _AadM365GroupSetCommand_initTelemetry = function _AadM365GroupSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             displayName: typeof args.options.displayName !== 'undefined',
@@ -166,7 +171,7 @@ _AadO365GroupSetCommand_instances = new WeakSet(), _AadO365GroupSetCommand_initT
             logoPath: typeof args.options.logoPath !== 'undefined'
         });
     });
-}, _AadO365GroupSetCommand_initOptions = function _AadO365GroupSetCommand_initOptions() {
+}, _AadM365GroupSetCommand_initOptions = function _AadM365GroupSetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
@@ -183,9 +188,9 @@ _AadO365GroupSetCommand_instances = new WeakSet(), _AadO365GroupSetCommand_initT
     }, {
         option: '-l, --logoPath [logoPath]'
     });
-}, _AadO365GroupSetCommand_initTypes = function _AadO365GroupSetCommand_initTypes() {
+}, _AadM365GroupSetCommand_initTypes = function _AadM365GroupSetCommand_initTypes() {
     this.types.boolean.push('isPrivate');
-}, _AadO365GroupSetCommand_initValidators = function _AadO365GroupSetCommand_initValidators() {
+}, _AadM365GroupSetCommand_initValidators = function _AadM365GroupSetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (!args.options.displayName &&
             !args.options.description &&
@@ -226,6 +231,6 @@ _AadO365GroupSetCommand_instances = new WeakSet(), _AadO365GroupSetCommand_initT
         return true;
     });
 };
-AadO365GroupSetCommand.numRepeat = 15;
-export default new AadO365GroupSetCommand();
-//# sourceMappingURL=o365group-set.js.map
+AadM365GroupSetCommand.numRepeat = 15;
+export default new AadM365GroupSetCommand();
+//# sourceMappingURL=m365group-set.js.map

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

@@ -3,33 +3,35 @@ 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 _AadO365GroupTeamifyCommand_instances, _AadO365GroupTeamifyCommand_initTelemetry, _AadO365GroupTeamifyCommand_initOptions, _AadO365GroupTeamifyCommand_initValidators, _AadO365GroupTeamifyCommand_initOptionSets;
+var _AadM365GroupTeamifyCommand_instances, _AadM365GroupTeamifyCommand_initTelemetry, _AadM365GroupTeamifyCommand_initOptions, _AadM365GroupTeamifyCommand_initValidators, _AadM365GroupTeamifyCommand_initOptionSets;
+import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
+import { aadGroup } from '../../../../utils/aadGroup.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 AadO365GroupTeamifyCommand extends GraphCommand {
+class AadM365GroupTeamifyCommand extends GraphCommand {
     get name() {
-        return commands.O365GROUP_TEAMIFY;
+        return commands.M365GROUP_TEAMIFY;
     }
     get description() {
         return 'Creates a new Microsoft Teams team under existing Microsoft 365 group';
     }
     constructor() {
         super();
-        _AadO365GroupTeamifyCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadO365GroupTeamifyCommand_instances, "m", _AadO365GroupTeamifyCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupTeamifyCommand_instances, "m", _AadO365GroupTeamifyCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupTeamifyCommand_instances, "m", _AadO365GroupTeamifyCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupTeamifyCommand_instances, "m", _AadO365GroupTeamifyCommand_initOptionSets).call(this);
+        _AadM365GroupTeamifyCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadM365GroupTeamifyCommand_instances, "m", _AadM365GroupTeamifyCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupTeamifyCommand_instances, "m", _AadM365GroupTeamifyCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupTeamifyCommand_instances, "m", _AadM365GroupTeamifyCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupTeamifyCommand_instances, "m", _AadM365GroupTeamifyCommand_initOptionSets).call(this);
     }
-    async getGroupId(args) {
-        if (args.options.id) {
-            return args.options.id;
+    async getGroupId(options) {
+        if (options.id) {
+            return options.id;
         }
         const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=mailNickname eq '${formatting.encodeQueryParameter(args.options.mailNickname)}'`,
+            url: `${this.resource}/v1.0/groups?$filter=mailNickname eq '${formatting.encodeQueryParameter(options.mailNickname)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -41,12 +43,19 @@ class AadO365GroupTeamifyCommand extends GraphCommand {
             throw `The specified Microsoft 365 Group does not exist`;
         }
         if (response.value.length > 1) {
-            throw `Multiple Microsoft 365 Groups with name ${args.options.mailNickname} found: ${response.value.map(x => x.id)}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
+            const result = await Cli.handleMultipleResultsFound(`Multiple Microsoft 365 Groups with name '${options.mailNickname}' found.`, resultAsKeyValuePair);
+            return result.id;
         }
         return groupItem.id;
     }
     async commandAction(logger, args) {
         try {
+            const groupId = await this.getGroupId(args.options);
+            const isUnifiedGroup = await aadGroup.isUnifiedGroup(groupId);
+            if (!isUnifiedGroup) {
+                throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`);
+            }
             const data = {
                 "memberSettings": {
                     "allowCreatePrivateChannels": true,
@@ -61,7 +70,6 @@ class AadO365GroupTeamifyCommand extends GraphCommand {
                     "giphyContentRating": "strict"
                 }
             };
-            const groupId = await this.getGroupId(args);
             const requestOptions = {
                 url: `${this.resource}/v1.0/groups/${formatting.encodeQueryParameter(groupId)}/team`,
                 headers: {
@@ -77,28 +85,28 @@ class AadO365GroupTeamifyCommand extends GraphCommand {
         }
     }
 }
-_AadO365GroupTeamifyCommand_instances = new WeakSet(), _AadO365GroupTeamifyCommand_initTelemetry = function _AadO365GroupTeamifyCommand_initTelemetry() {
+_AadM365GroupTeamifyCommand_instances = new WeakSet(), _AadM365GroupTeamifyCommand_initTelemetry = function _AadM365GroupTeamifyCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
             mailNickname: typeof args.options.mailNickname !== 'undefined'
         });
     });
-}, _AadO365GroupTeamifyCommand_initOptions = function _AadO365GroupTeamifyCommand_initOptions() {
+}, _AadM365GroupTeamifyCommand_initOptions = function _AadM365GroupTeamifyCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id [id]'
     }, {
         option: '--mailNickname [mailNickname]'
     });
-}, _AadO365GroupTeamifyCommand_initValidators = function _AadO365GroupTeamifyCommand_initValidators() {
+}, _AadM365GroupTeamifyCommand_initValidators = function _AadM365GroupTeamifyCommand_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;
     });
-}, _AadO365GroupTeamifyCommand_initOptionSets = function _AadO365GroupTeamifyCommand_initOptionSets() {
+}, _AadM365GroupTeamifyCommand_initOptionSets = function _AadM365GroupTeamifyCommand_initOptionSets() {
     this.optionSets.push({ options: ['id', 'mailNickname'] });
 };
-export default new AadO365GroupTeamifyCommand();
-//# sourceMappingURL=o365group-teamify.js.map
+export default new AadM365GroupTeamifyCommand();
+//# sourceMappingURL=m365group-teamify.js.map

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

@@ -3,16 +3,17 @@ 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 _AadO365GroupUserAddCommand_instances, _AadO365GroupUserAddCommand_initTelemetry, _AadO365GroupUserAddCommand_initOptions, _AadO365GroupUserAddCommand_initValidators, _AadO365GroupUserAddCommand_initOptionSets;
+var _AadM365GroupUserAddCommand_instances, _AadM365GroupUserAddCommand_initTelemetry, _AadM365GroupUserAddCommand_initOptions, _AadM365GroupUserAddCommand_initValidators, _AadM365GroupUserAddCommand_initOptionSets;
 import request from '../../../../request.js';
+import { aadGroup } from '../../../../utils/aadGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import teamsCommands from '../../../teams/commands.js';
 import commands from '../../commands.js';
-class AadO365GroupUserAddCommand extends GraphCommand {
+class AadM365GroupUserAddCommand extends GraphCommand {
     get name() {
-        return commands.O365GROUP_USER_ADD;
+        return commands.M365GROUP_USER_ADD;
     }
     get description() {
         return 'Adds user to specified Microsoft 365 Group or Microsoft Teams team';
@@ -22,15 +23,19 @@ class AadO365GroupUserAddCommand extends GraphCommand {
     }
     constructor() {
         super();
-        _AadO365GroupUserAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserAddCommand_instances, "m", _AadO365GroupUserAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserAddCommand_instances, "m", _AadO365GroupUserAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserAddCommand_instances, "m", _AadO365GroupUserAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserAddCommand_instances, "m", _AadO365GroupUserAddCommand_initOptionSets).call(this);
+        _AadM365GroupUserAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserAddCommand_instances, "m", _AadM365GroupUserAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserAddCommand_instances, "m", _AadM365GroupUserAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserAddCommand_instances, "m", _AadM365GroupUserAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserAddCommand_instances, "m", _AadM365GroupUserAddCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
         try {
             const providedGroupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
+            const isUnifiedGroup = await aadGroup.isUnifiedGroup(providedGroupId);
+            if (!isUnifiedGroup) {
+                throw Error(`Specified group with id '${providedGroupId}' is not a Microsoft 365 group.`);
+            }
             let requestOptions = {
                 url: `${this.resource}/v1.0/users/${formatting.encodeQueryParameter(args.options.userName)}/id`,
                 headers: {
@@ -55,7 +60,7 @@ class AadO365GroupUserAddCommand extends GraphCommand {
         }
     }
 }
-_AadO365GroupUserAddCommand_instances = new WeakSet(), _AadO365GroupUserAddCommand_initTelemetry = function _AadO365GroupUserAddCommand_initTelemetry() {
+_AadM365GroupUserAddCommand_instances = new WeakSet(), _AadM365GroupUserAddCommand_initTelemetry = function _AadM365GroupUserAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             role: args.options.role,
@@ -63,7 +68,7 @@ _AadO365GroupUserAddCommand_instances = new WeakSet(), _AadO365GroupUserAddComma
             groupId: typeof args.options.groupId !== 'undefined'
         });
     });
-}, _AadO365GroupUserAddCommand_initOptions = function _AadO365GroupUserAddCommand_initOptions() {
+}, _AadM365GroupUserAddCommand_initOptions = function _AadM365GroupUserAddCommand_initOptions() {
     this.options.unshift({
         option: '-n, --userName <userName>'
     }, {
@@ -74,7 +79,7 @@ _AadO365GroupUserAddCommand_instances = new WeakSet(), _AadO365GroupUserAddComma
         option: '-r, --role [role]',
         autocomplete: ['Owner', 'Member']
     });
-}, _AadO365GroupUserAddCommand_initValidators = function _AadO365GroupUserAddCommand_initValidators() {
+}, _AadM365GroupUserAddCommand_initValidators = function _AadM365GroupUserAddCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.teamId && !validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
@@ -89,8 +94,8 @@ _AadO365GroupUserAddCommand_instances = new WeakSet(), _AadO365GroupUserAddComma
         }
         return true;
     });
-}, _AadO365GroupUserAddCommand_initOptionSets = function _AadO365GroupUserAddCommand_initOptionSets() {
+}, _AadM365GroupUserAddCommand_initOptionSets = function _AadM365GroupUserAddCommand_initOptionSets() {
     this.optionSets.push({ options: ['groupId', 'teamId'] });
 };
-export default new AadO365GroupUserAddCommand();
-//# sourceMappingURL=o365group-user-add.js.map
+export default new AadM365GroupUserAddCommand();
+//# sourceMappingURL=m365group-user-add.js.map

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

@@ -3,27 +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 _AadO365GroupUserListCommand_instances, _AadO365GroupUserListCommand_initTelemetry, _AadO365GroupUserListCommand_initOptions, _AadO365GroupUserListCommand_initValidators;
+var _AadM365GroupUserListCommand_instances, _AadM365GroupUserListCommand_initTelemetry, _AadM365GroupUserListCommand_initOptions, _AadM365GroupUserListCommand_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 AadO365GroupUserListCommand extends GraphCommand {
+import { aadGroup } from '../../../../utils/aadGroup.js';
+class AadM365GroupUserListCommand extends GraphCommand {
     get name() {
-        return commands.O365GROUP_USER_LIST;
+        return commands.M365GROUP_USER_LIST;
     }
     get description() {
         return "Lists users for the specified Microsoft 365 group";
     }
     constructor() {
         super();
-        _AadO365GroupUserListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserListCommand_instances, "m", _AadO365GroupUserListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserListCommand_instances, "m", _AadO365GroupUserListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserListCommand_instances, "m", _AadO365GroupUserListCommand_initValidators).call(this);
+        _AadM365GroupUserListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserListCommand_instances, "m", _AadM365GroupUserListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserListCommand_instances, "m", _AadM365GroupUserListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserListCommand_instances, "m", _AadM365GroupUserListCommand_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.`);
+            }
             let users = await this.getOwners(args.options.groupId, logger);
             if (args.options.role !== 'Owner') {
                 const membersAndGuests = await this.getMembersAndGuests(args.options.groupId, logger);
@@ -59,20 +64,20 @@ class AadO365GroupUserListCommand extends GraphCommand {
         return await odata.getAllItems(endpoint);
     }
 }
-_AadO365GroupUserListCommand_instances = new WeakSet(), _AadO365GroupUserListCommand_initTelemetry = function _AadO365GroupUserListCommand_initTelemetry() {
+_AadM365GroupUserListCommand_instances = new WeakSet(), _AadM365GroupUserListCommand_initTelemetry = function _AadM365GroupUserListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             role: args.options.role
         });
     });
-}, _AadO365GroupUserListCommand_initOptions = function _AadO365GroupUserListCommand_initOptions() {
+}, _AadM365GroupUserListCommand_initOptions = function _AadM365GroupUserListCommand_initOptions() {
     this.options.unshift({
         option: "-i, --groupId <groupId>"
     }, {
         option: "-r, --role [type]",
         autocomplete: ["Owner", "Member", "Guest"]
     });
-}, _AadO365GroupUserListCommand_initValidators = function _AadO365GroupUserListCommand_initValidators() {
+}, _AadM365GroupUserListCommand_initValidators = function _AadM365GroupUserListCommand_initValidators() {
     this.validators.push(async (args) => {
         if (!validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
@@ -85,5 +90,5 @@ _AadO365GroupUserListCommand_instances = new WeakSet(), _AadO365GroupUserListCom
         return true;
     });
 };
-export default new AadO365GroupUserListCommand();
-//# sourceMappingURL=o365group-user-list.js.map
+export default new AadM365GroupUserListCommand();
+//# sourceMappingURL=m365group-user-list.js.map

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

@@ -3,17 +3,18 @@ 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 _AadO365GroupUserRemoveCommand_instances, _AadO365GroupUserRemoveCommand_initTelemetry, _AadO365GroupUserRemoveCommand_initOptions, _AadO365GroupUserRemoveCommand_initValidators, _AadO365GroupUserRemoveCommand_initOptionSets;
+var _AadM365GroupUserRemoveCommand_instances, _AadM365GroupUserRemoveCommand_initTelemetry, _AadM365GroupUserRemoveCommand_initOptions, _AadM365GroupUserRemoveCommand_initValidators, _AadM365GroupUserRemoveCommand_initOptionSets;
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
+import { aadGroup } from '../../../../utils/aadGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import teamsCommands from '../../../teams/commands.js';
 import commands from '../../commands.js';
-class AadO365GroupUserRemoveCommand extends GraphCommand {
+class AadM365GroupUserRemoveCommand extends GraphCommand {
     get name() {
-        return commands.O365GROUP_USER_REMOVE;
+        return commands.M365GROUP_USER_REMOVE;
     }
     get description() {
         return 'Removes the specified user from specified Microsoft 365 Group or Microsoft Teams team';
@@ -23,16 +24,20 @@ class AadO365GroupUserRemoveCommand extends GraphCommand {
     }
     constructor() {
         super();
-        _AadO365GroupUserRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserRemoveCommand_instances, "m", _AadO365GroupUserRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserRemoveCommand_instances, "m", _AadO365GroupUserRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserRemoveCommand_instances, "m", _AadO365GroupUserRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserRemoveCommand_instances, "m", _AadO365GroupUserRemoveCommand_initOptionSets).call(this);
+        _AadM365GroupUserRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserRemoveCommand_instances, "m", _AadM365GroupUserRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserRemoveCommand_instances, "m", _AadM365GroupUserRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserRemoveCommand_instances, "m", _AadM365GroupUserRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserRemoveCommand_instances, "m", _AadM365GroupUserRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
         const groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
         const removeUser = async () => {
             try {
+                const isUnifiedGroup = await aadGroup.isUnifiedGroup(groupId);
+                if (!isUnifiedGroup) {
+                    throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`);
+                }
                 // retrieve user
                 const user = await request.get({
                     url: `${this.resource}/v1.0/users/${formatting.encodeQueryParameter(args.options.userName)}/id`,
@@ -99,7 +104,7 @@ class AadO365GroupUserRemoveCommand extends GraphCommand {
         }
     }
 }
-_AadO365GroupUserRemoveCommand_instances = new WeakSet(), _AadO365GroupUserRemoveCommand_initTelemetry = function _AadO365GroupUserRemoveCommand_initTelemetry() {
+_AadM365GroupUserRemoveCommand_instances = new WeakSet(), _AadM365GroupUserRemoveCommand_initTelemetry = function _AadM365GroupUserRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             force: (!(!args.options.force)).toString(),
@@ -107,7 +112,7 @@ _AadO365GroupUserRemoveCommand_instances = new WeakSet(), _AadO365GroupUserRemov
             groupId: typeof args.options.groupId !== 'undefined'
         });
     });
-}, _AadO365GroupUserRemoveCommand_initOptions = function _AadO365GroupUserRemoveCommand_initOptions() {
+}, _AadM365GroupUserRemoveCommand_initOptions = function _AadM365GroupUserRemoveCommand_initOptions() {
     this.options.unshift({
         option: "-i, --groupId [groupId]"
     }, {
@@ -117,7 +122,7 @@ _AadO365GroupUserRemoveCommand_instances = new WeakSet(), _AadO365GroupUserRemov
     }, {
         option: '-f, --force'
     });
-}, _AadO365GroupUserRemoveCommand_initValidators = function _AadO365GroupUserRemoveCommand_initValidators() {
+}, _AadM365GroupUserRemoveCommand_initValidators = function _AadM365GroupUserRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.teamId && !validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
@@ -127,8 +132,8 @@ _AadO365GroupUserRemoveCommand_instances = new WeakSet(), _AadO365GroupUserRemov
         }
         return true;
     });
-}, _AadO365GroupUserRemoveCommand_initOptionSets = function _AadO365GroupUserRemoveCommand_initOptionSets() {
+}, _AadM365GroupUserRemoveCommand_initOptionSets = function _AadM365GroupUserRemoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['groupId', 'teamId'] });
 };
-export default new AadO365GroupUserRemoveCommand();
-//# sourceMappingURL=o365group-user-remove.js.map
+export default new AadM365GroupUserRemoveCommand();
+//# sourceMappingURL=m365group-user-remove.js.map

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

@@ -3,16 +3,17 @@ 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 _AadO365GroupUserSetCommand_instances, _AadO365GroupUserSetCommand_initTelemetry, _AadO365GroupUserSetCommand_initOptions, _AadO365GroupUserSetCommand_initValidators, _AadO365GroupUserSetCommand_initOptionSets;
+var _AadM365GroupUserSetCommand_instances, _AadM365GroupUserSetCommand_initTelemetry, _AadM365GroupUserSetCommand_initOptions, _AadM365GroupUserSetCommand_initValidators, _AadM365GroupUserSetCommand_initOptionSets;
 import request from '../../../../request.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import teamsCommands from '../../../teams/commands.js';
 import commands from '../../commands.js';
-class AadO365GroupUserSetCommand extends GraphCommand {
+import { aadGroup } from '../../../../utils/aadGroup.js';
+class AadM365GroupUserSetCommand extends GraphCommand {
     get name() {
-        return commands.O365GROUP_USER_SET;
+        return commands.M365GROUP_USER_SET;
     }
     get description() {
         return 'Updates role of the specified user in the specified Microsoft 365 Group or Microsoft Teams team';
@@ -22,15 +23,19 @@ class AadO365GroupUserSetCommand extends GraphCommand {
     }
     constructor() {
         super();
-        _AadO365GroupUserSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserSetCommand_instances, "m", _AadO365GroupUserSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserSetCommand_instances, "m", _AadO365GroupUserSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserSetCommand_instances, "m", _AadO365GroupUserSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AadO365GroupUserSetCommand_instances, "m", _AadO365GroupUserSetCommand_initOptionSets).call(this);
+        _AadM365GroupUserSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserSetCommand_instances, "m", _AadM365GroupUserSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserSetCommand_instances, "m", _AadM365GroupUserSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserSetCommand_instances, "m", _AadM365GroupUserSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserSetCommand_instances, "m", _AadM365GroupUserSetCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
         try {
             const groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
+            const isUnifiedGroup = await aadGroup.isUnifiedGroup(groupId);
+            if (!isUnifiedGroup) {
+                throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`);
+            }
             let users = await this.getOwners(groupId, logger);
             const membersAndGuests = await this.getMembersAndGuests(groupId, logger);
             users = users.concat(membersAndGuests);
@@ -43,7 +48,7 @@ class AadO365GroupUserSetCommand extends GraphCommand {
             }
             if (users.filter(i => args.options.userName.toUpperCase() === i.userPrincipalName.toUpperCase()).length <= 0) {
                 const userNotInGroup = (typeof args.options.groupId !== 'undefined') ?
-                    'The specified user does not belong to the given Microsoft 365 Group. Please use the \'o365group user add\' command to add new users.' :
+                    'The specified user does not belong to the given Microsoft 365 Group. Please use the \'m365group user add\' command to add new users.' :
                     'The specified user does not belong to the given Microsoft Teams team. Please use the \'graph teams user add\' command to add new users.';
                 throw new Error(userNotInGroup);
             }
@@ -113,7 +118,7 @@ class AadO365GroupUserSetCommand extends GraphCommand {
         return await odata.getAllItems(endpoint);
     }
 }
-_AadO365GroupUserSetCommand_instances = new WeakSet(), _AadO365GroupUserSetCommand_initTelemetry = function _AadO365GroupUserSetCommand_initTelemetry() {
+_AadM365GroupUserSetCommand_instances = new WeakSet(), _AadM365GroupUserSetCommand_initTelemetry = function _AadM365GroupUserSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             teamId: typeof args.options.teamId !== 'undefined',
@@ -121,7 +126,7 @@ _AadO365GroupUserSetCommand_instances = new WeakSet(), _AadO365GroupUserSetComma
             role: args.options.role
         });
     });
-}, _AadO365GroupUserSetCommand_initOptions = function _AadO365GroupUserSetCommand_initOptions() {
+}, _AadM365GroupUserSetCommand_initOptions = function _AadM365GroupUserSetCommand_initOptions() {
     this.options.unshift({
         option: "-i, --groupId [groupId]"
     }, {
@@ -132,7 +137,7 @@ _AadO365GroupUserSetCommand_instances = new WeakSet(), _AadO365GroupUserSetComma
         option: '-r, --role <role>',
         autocomplete: ['Owner', 'Member']
     });
-}, _AadO365GroupUserSetCommand_initValidators = function _AadO365GroupUserSetCommand_initValidators() {
+}, _AadM365GroupUserSetCommand_initValidators = function _AadM365GroupUserSetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.teamId && !validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
@@ -145,8 +150,8 @@ _AadO365GroupUserSetCommand_instances = new WeakSet(), _AadO365GroupUserSetComma
         }
         return true;
     });
-}, _AadO365GroupUserSetCommand_initOptionSets = function _AadO365GroupUserSetCommand_initOptionSets() {
+}, _AadM365GroupUserSetCommand_initOptionSets = function _AadM365GroupUserSetCommand_initOptionSets() {
     this.optionSets.push({ options: ['groupId', 'teamId'] });
 };
-export default new AadO365GroupUserSetCommand();
-//# sourceMappingURL=o365group-user-set.js.map
+export default new AadM365GroupUserSetCommand();
+//# sourceMappingURL=m365group-user-set.js.map

package/dist/m365/aad/commands/policy/policy-list.js

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _AadPolicyListCommand_instances, _AadPolicyListCommand_initTelemetry, _AadPolicyListCommand_initOptions, _AadPolicyListCommand_initValidators;
+var _AadPolicyListCommand_instances, _a, _AadPolicyListCommand_initTelemetry, _AadPolicyListCommand_initOptions, _AadPolicyListCommand_initValidators;
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -73,7 +73,7 @@ class AadPolicyListCommand extends GraphCommand {
         }
     }
 }
-_AadPolicyListCommand_instances = new WeakSet(), _AadPolicyListCommand_initTelemetry = function _AadPolicyListCommand_initTelemetry() {
+_a = AadPolicyListCommand, _AadPolicyListCommand_instances = new WeakSet(), _AadPolicyListCommand_initTelemetry = function _AadPolicyListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             policyType: args.options.type || 'all'
@@ -82,14 +82,14 @@ _AadPolicyListCommand_instances = new WeakSet(), _AadPolicyListCommand_initTelem
 }, _AadPolicyListCommand_initOptions = function _AadPolicyListCommand_initOptions() {
     this.options.unshift({
         option: '-t, --type [type]',
-        autocomplete: AadPolicyListCommand.supportedPolicyTypes
+        autocomplete: _a.supportedPolicyTypes
     });
 }, _AadPolicyListCommand_initValidators = function _AadPolicyListCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.type) {
             const policyType = args.options.type.toLowerCase();
-            if (!AadPolicyListCommand.supportedPolicyTypes.find(p => p.toLowerCase() === policyType)) {
-                return `${args.options.type} is not a valid type. Allowed values are ${AadPolicyListCommand.supportedPolicyTypes.join(', ')}`;
+            if (!_a.supportedPolicyTypes.find(p => p.toLowerCase() === policyType)) {
+                return `${args.options.type} is not a valid type. Allowed values are ${_a.supportedPolicyTypes.join(', ')}`;
             }
         }
         return true;

package/dist/m365/aad/commands/sp/sp-add.js

@@ -9,6 +9,7 @@ import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { Cli } from '../../../../cli/Cli.js';
 class AadSpAddCommand extends GraphCommand {
     get name() {
         return commands.SP_ADD;
@@ -48,7 +49,9 @@ class AadSpAddCommand extends GraphCommand {
             throw `The specified Azure AD app doesn't exist`;
         }
         if (response.value.length > 1) {
-            throw `Multiple Azure AD apps with name ${args.options.appName} found: ${response.value.map(x => x.appId)}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('appId', response.value);
+            const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD apps with name '${args.options.appName}' found.`, resultAsKeyValuePair);
+            return result.appId;
         }
         return spItem.appId;
     }