@pnp/cli-microsoft365 7.3.0-beta.16c6462 → 7.3.0-beta.38bb1d7

package/dist/m365/aad/commands/app/app-role-remove.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AadAppRoleRemoveCommand_instances, _AadAppRoleRemoveCommand_initTelemetry, _AadAppRoleRemoveCommand_initOptions, _AadAppRoleRemoveCommand_initValidators, _AadAppRoleRemoveCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from "../../../../utils/formatting.js";
 import { validation } from '../../../../utils/validation.js';
@@ -38,7 +38,7 @@ class AadAppRoleRemoveCommand extends GraphCommand {
             await deleteAppRole();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the app role?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the app role?` });
             if (result) {
                 await deleteAppRole();
             }
@@ -59,7 +59,7 @@ class AadAppRoleRemoveCommand extends GraphCommand {
             appRoleToDelete !== undefined &&
             appRoleToDelete.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', appRoleToDelete);
-            appRoleToDelete[0] = await Cli.handleMultipleResultsFound(`Multiple roles with name '${args.options.name}' found.`, resultAsKeyValuePair);
+            appRoleToDelete[0] = await cli.handleMultipleResultsFound(`Multiple roles with name '${args.options.name}' found.`, resultAsKeyValuePair);
         }
         if (appRoleToDelete.length === 0) {
             throw `No app role with ${appRoleDeleteIdentifierNameValue} found.`;
@@ -148,7 +148,7 @@ class AadAppRoleRemoveCommand extends GraphCommand {
             throw `No Azure AD application registration with ${applicationIdentifier} found`;
         }
         const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-        const result = (await Cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${appName}' found.`, resultAsKeyValuePair));
+        const result = (await cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${appName}' found.`, resultAsKeyValuePair));
         return result.id;
     }
 }

package/dist/m365/aad/commands/app/app-set.js

@@ -9,7 +9,7 @@ import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 class AadAppSetCommand extends GraphCommand {
     get name() {
         return commands.APP_SET;
@@ -63,7 +63,7 @@ class AadAppSetCommand extends GraphCommand {
             throw `No Azure AD application registration with ${applicationIdentifier} found`;
         }
         const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-        const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${name}' found.`, resultAsKeyValuePair);
+        const result = await cli.handleMultipleResultsFound(`Multiple Azure AD application registration with name '${name}' found.`, resultAsKeyValuePair);
         return result.id;
     }
     async configureUri(args, objectId, logger) {

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

@@ -10,7 +10,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';
+import { cli } from '../../../../cli/cli.js';
 class AadAppRoleAssignmentAddCommand extends GraphCommand {
     get name() {
         return commands.APPROLEASSIGNMENT_ADD;
@@ -52,7 +52,7 @@ class AadAppRoleAssignmentAddCommand extends GraphCommand {
             }
             if (servicePrincipalResult.value.length > 1) {
                 const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', servicePrincipalResult.value);
-                const result = await Cli.handleMultipleResultsFound(`Multiple service principal found.`, resultAsKeyValuePair);
+                const result = await cli.handleMultipleResultsFound(`Multiple service principal found.`, resultAsKeyValuePair);
                 objectId = result.id;
             }
             else {

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

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadAppRoleAssignmentRemoveCommand_instances, _AadAppRoleAssignmentRemoveCommand_initTelemetry, _AadAppRoleAssignmentRemoveCommand_initOptions, _AadAppRoleAssignmentRemoveCommand_initValidators, _AadAppRoleAssignmentRemoveCommand_initOptionSets;
 import os from 'os';
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -111,7 +111,7 @@ class AadAppRoleAssignmentRemoveCommand extends GraphCommand {
             await removeAppRoleAssignment();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the appRoleAssignment with scope ${args.options.scope} for resource ${args.options.resource}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the appRoleAssignment with scope ${args.options.scope} for resource ${args.options.resource}?` });
             if (result) {
                 await removeAppRoleAssignment();
             }

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

@@ -1,4 +1,10 @@
-import { Cli } from '../../../../cli/Cli.js';
+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 _AadGroupListCommand_instances, _a, _AadGroupListCommand_initTelemetry, _AadGroupListCommand_initOptions, _AadGroupListCommand_initValidators;
+import { cli } from '../../../../cli/cli.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -12,10 +18,52 @@ class AadGroupListCommand extends GraphCommand {
     defaultProperties() {
         return ['id', 'displayName', 'groupType'];
     }
+    constructor() {
+        super();
+        _AadGroupListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadGroupListCommand_instances, "m", _AadGroupListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadGroupListCommand_instances, "m", _AadGroupListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadGroupListCommand_instances, "m", _AadGroupListCommand_initValidators).call(this);
+    }
     async commandAction(logger, args) {
         try {
-            const groups = await odata.getAllItems(`${this.resource}/v1.0/groups`);
-            if (Cli.shouldTrimOutput(args.options.output)) {
+            let requestUrl = `${this.resource}/v1.0/groups`;
+            let useConsistencyLevelHeader = false;
+            if (args.options.type) {
+                const groupType = _a.groupTypes.find(g => g.toLowerCase() === args.options.type?.toLowerCase());
+                switch (groupType) {
+                    case 'microsoft365':
+                        requestUrl += `?$filter=groupTypes/any(c:c+eq+'Unified')`;
+                        break;
+                    case 'security':
+                        requestUrl += '?$filter=securityEnabled eq true and mailEnabled eq false';
+                        break;
+                    case 'distribution':
+                        requestUrl += '?$filter=securityEnabled eq false and mailEnabled eq true';
+                        break;
+                    case 'mailEnabledSecurity':
+                        useConsistencyLevelHeader = true;
+                        requestUrl += `?$filter=securityEnabled eq true and mailEnabled eq true and not(groupTypes/any(t:t eq 'Unified'))&$count=true`;
+                        break;
+                }
+            }
+            let groups = [];
+            if (useConsistencyLevelHeader) {
+                // While using not() function in the filter, we need to specify the ConsistencyLevel header.
+                const requestOptions = {
+                    url: requestUrl,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none',
+                        ConsistencyLevel: 'eventual'
+                    },
+                    responseType: 'json'
+                };
+                groups = await odata.getAllItems(requestOptions);
+            }
+            else {
+                groups = await odata.getAllItems(requestUrl);
+            }
+            if (cli.shouldTrimOutput(args.options.output)) {
                 groups.forEach((group) => {
                     if (group.groupTypes && group.groupTypes.length > 0 && group.groupTypes[0] === 'Unified') {
                         group.groupType = 'Microsoft 365';
@@ -38,5 +86,25 @@ class AadGroupListCommand extends GraphCommand {
         }
     }
 }
+_a = AadGroupListCommand, _AadGroupListCommand_instances = new WeakSet(), _AadGroupListCommand_initTelemetry = function _AadGroupListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            type: typeof args.options.type !== 'undefined'
+        });
+    });
+}, _AadGroupListCommand_initOptions = function _AadGroupListCommand_initOptions() {
+    this.options.unshift({
+        option: '--type [type]',
+        autocomplete: _a.groupTypes
+    });
+}, _AadGroupListCommand_initValidators = function _AadGroupListCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.type && _a.groupTypes.every(g => g.toLowerCase() !== args.options.type?.toLowerCase())) {
+            return `${args.options.type} is not a valid type value. Allowed values microsoft365|security|distribution|mailEnabledSecurity.`;
+        }
+        return true;
+    });
+};
+AadGroupListCommand.groupTypes = ['microsoft365', 'security', 'distribution', 'mailEnabledSecurity'];
 export default new AadGroupListCommand();
 //# sourceMappingURL=group-list.js.map

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

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 { cli } from '../../../../cli/cli.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import request from '../../../../request.js';
@@ -52,7 +52,7 @@ class AadGroupRemoveCommand extends GraphCommand {
             await removeGroup();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove group '${args.options.id || args.options.displayName}'?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove group '${args.options.id || args.options.displayName}'?` });
             if (result) {
                 await removeGroup();
             }

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

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AadGroupSettingRemoveCommand_instances, _AadGroupSettingRemoveCommand_initTelemetry, _AadGroupSettingRemoveCommand_initOptions, _AadGroupSettingRemoveCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -45,7 +45,7 @@ class AadGroupSettingRemoveCommand extends GraphCommand {
             await removeGroupSetting();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the group setting ${args.options.id}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the group setting ${args.options.id}?` });
             if (result) {
                 await removeGroupSetting();
             }

package/dist/m365/aad/commands/m365group/m365group-recyclebinitem-clear.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AadM365GroupRecycleBinItemClearCommand_instances, _AadM365GroupRecycleBinItemClearCommand_initTelemetry, _AadM365GroupRecycleBinItemClearCommand_initOptions;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -35,7 +35,7 @@ class AadM365GroupRecycleBinItemClearCommand extends GraphCommand {
             await clearM365GroupRecycleBinItems();
         }
         else {
-            const response = await Cli.promptForConfirmation({ message: `Are you sure you want to clear all M365 Groups from recycle bin?` });
+            const response = await cli.promptForConfirmation({ message: `Are you sure you want to clear all M365 Groups from recycle bin?` });
             if (response) {
                 await clearM365GroupRecycleBinItems();
             }

package/dist/m365/aad/commands/m365group/m365group-recyclebinitem-remove.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AadM365GroupRecycleBinItemRemoveCommand_instances, _AadM365GroupRecycleBinItemRemoveCommand_initTelemetry, _AadM365GroupRecycleBinItemRemoveCommand_initOptions, _AadM365GroupRecycleBinItemRemoveCommand_initValidators, _AadM365GroupRecycleBinItemRemoveCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -46,7 +46,7 @@ class AadM365GroupRecycleBinItemRemoveCommand extends GraphCommand {
             await removeGroup();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the group '${args.options.id || args.options.displayName || args.options.mailNickname}'?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the group '${args.options.id || args.options.displayName || args.options.mailNickname}'?` });
             if (result) {
                 await removeGroup();
             }
@@ -78,7 +78,7 @@ class AadM365GroupRecycleBinItemRemoveCommand extends GraphCommand {
         }
         if (groups.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', groups);
-            const result = await Cli.handleMultipleResultsFound(`Multiple groups with name '${displayName || mailNickname}' found.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple groups with name '${displayName || mailNickname}' found.`, resultAsKeyValuePair);
             return result.id;
         }
         return groups[0].id;

package/dist/m365/aad/commands/m365group/m365group-recyclebinitem-restore.js

@@ -9,7 +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';
+import { cli } from '../../../../cli/cli.js';
 class AadM365GroupRecycleBinItemRestoreCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_RECYCLEBINITEM_RESTORE;
@@ -71,7 +71,7 @@ class AadM365GroupRecycleBinItemRestoreCommand extends GraphCommand {
         }
         if (groups.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', groups);
-            const result = await Cli.handleMultipleResultsFound(`Multiple groups with name '${displayName || mailNickname}' found.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple groups with name '${displayName || mailNickname}' found.`, resultAsKeyValuePair);
             return result.id;
         }
         return groups[0].id;

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

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AadM365GroupRemoveCommand_instances, _AadM365GroupRemoveCommand_initTelemetry, _AadM365GroupRemoveCommand_initOptions, _AadM365GroupRemoveCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
 import { validation } from '../../../../utils/validation.js';
@@ -56,7 +56,7 @@ class AadM365GroupRemoveCommand extends GraphCommand {
             await removeGroup();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the group ${args.options.id}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the group ${args.options.id}?` });
             if (result) {
                 await removeGroup();
             }

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

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AadM365GroupTeamifyCommand_instances, _AadM365GroupTeamifyCommand_initTelemetry, _AadM365GroupTeamifyCommand_initOptions, _AadM365GroupTeamifyCommand_initValidators, _AadM365GroupTeamifyCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -44,7 +44,7 @@ class AadM365GroupTeamifyCommand extends GraphCommand {
         }
         if (response.value.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
-            const result = await Cli.handleMultipleResultsFound(`Multiple Microsoft 365 Groups with name '${options.mailNickname}' found.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple Microsoft 365 Groups with name '${options.mailNickname}' found.`, resultAsKeyValuePair);
             return result.id;
         }
         return groupItem.id;

package/dist/m365/aad/commands/m365group/m365group-user-remove.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AadM365GroupUserRemoveCommand_instances, _AadM365GroupUserRemoveCommand_initTelemetry, _AadM365GroupUserRemoveCommand_initOptions, _AadM365GroupUserRemoveCommand_initValidators, _AadM365GroupUserRemoveCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -92,7 +92,7 @@ class AadM365GroupUserRemoveCommand extends GraphCommand {
             await removeUser();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove ${args.options.userName} from the ${(typeof args.options.groupId !== 'undefined' ? 'group' : 'team')} ${groupId}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove ${args.options.userName} from the ${(typeof args.options.groupId !== 'undefined' ? 'group' : 'team')} ${groupId}?` });
             if (result) {
                 await removeUser();
             }

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

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AadOAuth2GrantRemoveCommand_instances, _AadOAuth2GrantRemoveCommand_initOptions;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -44,7 +44,7 @@ class AadOAuth2GrantRemoveCommand extends GraphCommand {
             await removeOauth2Grant();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the OAuth2 permissions for ${args.options.grantId}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the OAuth2 permissions for ${args.options.grantId}?` });
             if (result) {
                 await removeOauth2Grant();
             }

package/dist/m365/aad/commands/siteclassification/siteclassification-disable.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AadSiteClassificationDisableCommand_instances, _AadSiteClassificationDisableCommand_initTelemetry, _AadSiteClassificationDisableCommand_initOptions;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -63,7 +63,7 @@ class AadSiteClassificationDisableCommand extends GraphCommand {
             await disableSiteClassification();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to disable site classification?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to disable site classification?` });
             if (result) {
                 await disableSiteClassification();
             }

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

@@ -9,7 +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';
+import { cli } from '../../../../cli/cli.js';
 class AadSpAddCommand extends GraphCommand {
     get name() {
         return commands.SP_ADD;
@@ -50,7 +50,7 @@ class AadSpAddCommand extends GraphCommand {
         }
         if (response.value.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('appId', response.value);
-            const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD apps with name '${args.options.appName}' found.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple Azure AD apps with name '${args.options.appName}' found.`, resultAsKeyValuePair);
             return result.appId;
         }
         return spItem.appId;

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

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AadSpGetCommand_instances, _AadSpGetCommand_initTelemetry, _AadSpGetCommand_initOptions, _AadSpGetCommand_initValidators, _AadSpGetCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -50,7 +50,7 @@ class AadSpGetCommand extends GraphCommand {
         }
         if (response.value.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
-            const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD apps with name '${args.options.appDisplayName}' found.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple Azure AD apps with name '${args.options.appDisplayName}' found.`, resultAsKeyValuePair);
             return result.id;
         }
         return spItem.id;

package/dist/m365/aad/commands/user/user-get.js

@@ -9,7 +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';
+import { cli } from '../../../../cli/cli.js';
 class AadUserGetCommand extends GraphCommand {
     get name() {
         return commands.USER_GET;
@@ -59,7 +59,7 @@ class AadUserGetCommand extends GraphCommand {
             }
             if (res.value.length > 1) {
                 const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-                const result = await Cli.handleMultipleResultsFound(`Multiple users with ${identifier} found.`, resultAsKeyValuePair);
+                const result = await cli.handleMultipleResultsFound(`Multiple users with ${identifier} found.`, resultAsKeyValuePair);
                 await logger.log(result);
             }
             else {

package/dist/m365/aad/commands/user/user-license-remove.js

@@ -7,7 +7,7 @@ var _AadUserLicenseRemoveCommand_instances, _AadUserLicenseRemoveCommand_initTel
 import commands from '../../commands.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 class AadUserLicenseRemoveCommand extends GraphCommand {
     get name() {
@@ -32,7 +32,7 @@ class AadUserLicenseRemoveCommand extends GraphCommand {
             await this.deleteUserLicenses(args);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the licenses for the user '${args.options.userId || args.options.userName}'?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the licenses for the user '${args.options.userId || args.options.userName}'?` });
             if (result) {
                 await this.deleteUserLicenses(args);
             }

package/dist/m365/aad/commands/user/user-recyclebinitem-clear.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AadUserRecycleBinItemClearCommand_instances, _AadUserRecycleBinItemClearCommand_initTelemetry, _AadUserRecycleBinItemClearCommand_initOptions;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -63,7 +63,7 @@ class AadUserRecycleBinItemClearCommand extends GraphCommand {
             await clearRecycleBinUsers();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: 'Are you sure you want to permanently delete all deleted users?' });
+            const result = await cli.promptForConfirmation({ message: 'Are you sure you want to permanently delete all deleted users?' });
             if (result) {
                 await clearRecycleBinUsers();
             }

package/dist/m365/aad/commands/user/user-recyclebinitem-remove.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AadUserRecycleBinItemRemoveCommand_instances, _AadUserRecycleBinItemRemoveCommand_initTelemetry, _AadUserRecycleBinItemRemoveCommand_initOptions, _AadUserRecycleBinItemRemoveCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -43,7 +43,7 @@ class AadUserRecycleBinItemRemoveCommand extends GraphCommand {
             await clearRecycleBinItem();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to permanently delete the user with id ${args.options.id}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to permanently delete the user with id ${args.options.id}?` });
             if (result) {
                 await clearRecycleBinItem();
             }

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

@@ -7,7 +7,7 @@ var _AadUserRemoveCommand_instances, _AadUserRemoveCommand_initTelemetry, _AadUs
 import commands from '../../commands.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 class AadUserRemoveCommand extends GraphCommand {
     get name() {
@@ -32,7 +32,7 @@ class AadUserRemoveCommand extends GraphCommand {
             await this.deleteUser(args);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove user '${args.options.id || args.options.userName}'?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove user '${args.options.id || args.options.userName}'?` });
             if (result) {
                 await this.deleteUser(args);
             }

package/dist/m365/aad/commands.js

@@ -4,14 +4,17 @@ export default {
     ADMINISTRATIVEUNIT_GET: `${prefix} administrativeunit get`,
     ADMINISTRATIVEUNIT_LIST: `${prefix} administrativeunit list`,
     ADMINISTRATIVEUNIT_REMOVE: `${prefix} administrativeunit remove`,
+    ADMINISTRATIVEUNIT_MEMBER_ADD: `${prefix} administrativeunit member add`,
+    ADMINISTRATIVEUNIT_MEMBER_LIST: `${prefix} administrativeunit member list`,
     APP_ADD: `${prefix} app add`,
     APP_GET: `${prefix} app get`,
     APP_LIST: `${prefix} app list`,
     APP_REMOVE: `${prefix} app remove`,
+    APP_SET: `${prefix} app set`,
+    APP_PERMISSION_ADD: `${prefix} app permission add`,
     APP_ROLE_ADD: `${prefix} app role add`,
     APP_ROLE_LIST: `${prefix} app role list`,
     APP_ROLE_REMOVE: `${prefix} app role remove`,
-    APP_SET: `${prefix} app set`,
     APPROLEASSIGNMENT_ADD: `${prefix} approleassignment add`,
     APPROLEASSIGNMENT_LIST: `${prefix} approleassignment list`,
     APPROLEASSIGNMENT_REMOVE: `${prefix} approleassignment remove`,

package/dist/m365/app/commands/app-get.js

@@ -1,4 +1,4 @@
-import { Cli } from '../../../cli/Cli.js';
+import { cli } from '../../../cli/cli.js';
 import aadAppGetCommand from '../../aad/commands/app/app-get.js';
 import AppCommand from '../../base/AppCommand.js';
 import commands from '../commands.js';
@@ -17,7 +17,7 @@ class AppGetCommand extends AppCommand {
             verbose: args.options.verbose
         };
         try {
-            const appGetOutput = await Cli.executeCommandWithOutput(aadAppGetCommand, { options: { ...options, _: [] } });
+            const appGetOutput = await cli.executeCommandWithOutput(aadAppGetCommand, { options: { ...options, _: [] } });
             if (this.verbose) {
                 await logger.logToStderr(appGetOutput.stderr);
             }

package/dist/m365/app/commands/app-open.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AppOpenCommand_instances, _AppOpenCommand_initTelemetry, _AppOpenCommand_initOptions;
-import { Cli } from '../../../cli/Cli.js';
+import { cli } from '../../../cli/cli.js';
 import { settingsNames } from '../../../settingsNames.js';
 import { browserUtil } from '../../../utils/browserUtil.js';
 import AppCommand from '../../base/AppCommand.js';
@@ -33,7 +33,7 @@ class AppOpenCommand extends AppCommand {
     async logOrOpenUrl(args, logger) {
         const previewPrefix = args.options.preview === true ? "preview." : "";
         const url = `https://${previewPrefix}portal.azure.com/#blade/Microsoft_AAD_RegisteredApps/ApplicationMenuBlade/Overview/appId/${this.appId}/isMSAApp/`;
-        if (Cli.getInstance().getSettingWithDefaultValue(settingsNames.autoOpenLinksInBrowser, false) === false) {
+        if (cli.getSettingWithDefaultValue(settingsNames.autoOpenLinksInBrowser, false) === false) {
             await logger.log(`Use a web browser to open the page ${url}`);
             return;
         }

package/dist/m365/app/commands/permission/permission-list.js

@@ -1,4 +1,4 @@
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import appGetCommand from '../../../aad/commands/app/app-get.js';
 import AppCommand from '../../../base/AppCommand.js';
@@ -186,7 +186,7 @@ class AppPermissionListCommand extends AppCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        const output = await Cli.executeCommandWithOutput(appGetCommand, { options: { ...options, _: [] } });
+        const output = await cli.executeCommandWithOutput(appGetCommand, { options: { ...options, _: [] } });
         if (this.debug) {
             await logger.logToStderr(output.stderr);
         }

package/dist/m365/base/AppCommand.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AppCommand_instances, _AppCommand_initOptions, _AppCommand_initValidators;
 import fs from 'fs';
-import { Cli } from '../../cli/Cli.js';
+import { cli } from '../../cli/cli.js';
 import Command, { CommandError } from '../../Command.js';
 import { validation } from '../../utils/validation.js';
 import { formatting } from '../../utils/formatting.js';
@@ -54,7 +54,7 @@ class AppCommand extends Command {
         }
         if (this.m365rcJson.apps.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('appIdIndex', this.m365rcJson.apps);
-            const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD apps found in ${m365rcJsonPath}.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple Azure AD apps found in ${m365rcJsonPath}.`, resultAsKeyValuePair);
             this.appId = this.m365rcJson.apps[result.appIdIndex].appId;
             await super.action(logger, args);
         }