@pnp/cli-microsoft365 7.3.0-beta.73848f3 → 7.3.0-beta.9479ed4

package/dist/index.js

@@ -1,6 +1,5 @@
 #!/usr/bin/env node
-import { Cli } from './cli/Cli.js';
-import { telemetry } from './telemetry.js';
+import { cli } from './cli/cli.js';
 import { app } from './utils/app.js';
 // required to make console.log() in combination with piped output synchronous
 // on Windows/in PowerShell so that the output is not trimmed by calling
@@ -14,12 +13,5 @@ if (!process.env.CLIMICROSOFT365_NOUPDATE) {
         updateNotifier.default({ pkg: app.packageJson() }).notify({ defer: false });
     });
 }
-try {
-    const cli = Cli.getInstance();
-    cli.execute(process.argv.slice(2));
-}
-catch (e) {
-    telemetry.trackException(e);
-    process.exit(1);
-}
+cli.execute(process.argv.slice(2));
 //# sourceMappingURL=index.js.map

package/dist/m365/aad/commands/administrativeunit/administrativeunit-member-add.js

@@ -0,0 +1,137 @@
+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 _AadAdministrativeUnitMemberAddCommand_instances, _AadAdministrativeUnitMemberAddCommand_initTelemetry, _AadAdministrativeUnitMemberAddCommand_initOptions, _AadAdministrativeUnitMemberAddCommand_initValidators, _AadAdministrativeUnitMemberAddCommand_initOptionSets;
+import { aadAdministrativeUnit } from "../../../../utils/aadAdministrativeUnit.js";
+import { aadGroup } from "../../../../utils/aadGroup.js";
+import { aadUser } from "../../../../utils/aadUser.js";
+import { validation } from "../../../../utils/validation.js";
+import GraphCommand from "../../../base/GraphCommand.js";
+import commands from "../../commands.js";
+import request from "../../../../request.js";
+import { aadDevice } from "../../../../utils/aadDevice.js";
+class AadAdministrativeUnitMemberAddCommand extends GraphCommand {
+    get name() {
+        return commands.ADMINISTRATIVEUNIT_MEMBER_ADD;
+    }
+    get description() {
+        return 'Adds a member (user, group, device) to an administrative unit';
+    }
+    constructor() {
+        super();
+        _AadAdministrativeUnitMemberAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitMemberAddCommand_instances, "m", _AadAdministrativeUnitMemberAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitMemberAddCommand_instances, "m", _AadAdministrativeUnitMemberAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitMemberAddCommand_instances, "m", _AadAdministrativeUnitMemberAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitMemberAddCommand_instances, "m", _AadAdministrativeUnitMemberAddCommand_initOptionSets).call(this);
+    }
+    async commandAction(logger, args) {
+        let administrativeUnitId = args.options.administrativeUnitId;
+        let memberType;
+        let memberId;
+        try {
+            if (args.options.administrativeUnitName) {
+                if (this.verbose) {
+                    await logger.logToStderr(`Retrieving Administrative Unit Id...`);
+                }
+                administrativeUnitId = (await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id;
+            }
+            if (args.options.userId || args.options.userName) {
+                memberType = 'users';
+                memberId = args.options.userId;
+                if (args.options.userName) {
+                    if (this.verbose) {
+                        await logger.logToStderr(`Retrieving User Id...`);
+                    }
+                    memberId = await aadUser.getUserIdByUpn(args.options.userName);
+                }
+            }
+            else if (args.options.groupId || args.options.groupName) {
+                memberType = 'groups';
+                memberId = args.options.groupId;
+                if (args.options.groupName) {
+                    if (this.verbose) {
+                        await logger.logToStderr(`Retrieving Group Id...`);
+                    }
+                    memberId = await aadGroup.getGroupIdByDisplayName(args.options.groupName);
+                }
+            }
+            else if (args.options.deviceId || args.options.deviceName) {
+                memberType = 'devices';
+                memberId = args.options.deviceId;
+                if (args.options.deviceName) {
+                    if (this.verbose) {
+                        await logger.logToStderr(`Device with name ${args.options.deviceName} retrieved, returned id: ${memberId}`);
+                    }
+                    memberId = (await aadDevice.getDeviceByDisplayName(args.options.deviceName)).id;
+                }
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/directory/administrativeUnits/${administrativeUnitId}/members/$ref`,
+                headers: {
+                    'accept': 'application/json;odata.metadata=none'
+                },
+                data: {
+                    "@odata.id": `https://graph.microsoft.com/v1.0/${memberType}/${memberId}`
+                }
+            };
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+_AadAdministrativeUnitMemberAddCommand_instances = new WeakSet(), _AadAdministrativeUnitMemberAddCommand_initTelemetry = function _AadAdministrativeUnitMemberAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            groupId: typeof args.options.groupId !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
+            deviceId: typeof args.options.deviceId !== 'undefined',
+            deviceName: typeof args.options.deviceName !== 'undefined'
+        });
+    });
+}, _AadAdministrativeUnitMemberAddCommand_initOptions = function _AadAdministrativeUnitMemberAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --administrativeUnitId [administrativeUnitId]'
+    }, {
+        option: '-n, --administrativeUnitName [administrativeUnitName]'
+    }, {
+        option: "--userId [userId]"
+    }, {
+        option: "--userName [userName]"
+    }, {
+        option: "--groupId [groupId]"
+    }, {
+        option: "--groupName [groupName]"
+    }, {
+        option: "--deviceId [deviceId]"
+    }, {
+        option: "--deviceName [deviceName]"
+    });
+}, _AadAdministrativeUnitMemberAddCommand_initValidators = function _AadAdministrativeUnitMemberAddCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.administrativeUnitId && !validation.isValidGuid(args.options.administrativeUnitId)) {
+            return `${args.options.administrativeUnitId} is not a valid GUID`;
+        }
+        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID`;
+        }
+        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
+            return `${args.options.groupId} is not a valid GUID`;
+        }
+        if (args.options.deviceId && !validation.isValidGuid(args.options.deviceId)) {
+            return `${args.options.deviceId} is not a valid GUID`;
+        }
+        return true;
+    });
+}, _AadAdministrativeUnitMemberAddCommand_initOptionSets = function _AadAdministrativeUnitMemberAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['administrativeUnitId', 'administrativeUnitName'] });
+    this.optionSets.push({ options: ['userId', 'userName', 'groupId', 'groupName', 'deviceId', 'deviceName'] });
+};
+export default new AadAdministrativeUnitMemberAddCommand();
+//# sourceMappingURL=administrativeunit-member-add.js.map

package/dist/m365/aad/commands/administrativeunit/administrativeunit-member-get.js

@@ -0,0 +1,112 @@
+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 _AadAdministrativeUnitMemberGetCommand_instances, _AadAdministrativeUnitMemberGetCommand_initTelemetry, _AadAdministrativeUnitMemberGetCommand_initOptions, _AadAdministrativeUnitMemberGetCommand_initValidators, _AadAdministrativeUnitMemberGetCommand_initOptionSets;
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js';
+import request from '../../../../request.js';
+class AadAdministrativeUnitMemberGetCommand extends GraphCommand {
+    get name() {
+        return commands.ADMINISTRATIVEUNIT_MEMBER_GET;
+    }
+    get description() {
+        return 'Retrieve a specific member (user, group, or device) of an administrative unit';
+    }
+    constructor() {
+        super();
+        _AadAdministrativeUnitMemberGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitMemberGetCommand_instances, "m", _AadAdministrativeUnitMemberGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitMemberGetCommand_instances, "m", _AadAdministrativeUnitMemberGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitMemberGetCommand_instances, "m", _AadAdministrativeUnitMemberGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitMemberGetCommand_instances, "m", _AadAdministrativeUnitMemberGetCommand_initOptionSets).call(this);
+    }
+    async commandAction(logger, args) {
+        let administrativeUnitId = args.options.administrativeUnitId;
+        try {
+            if (args.options.administrativeUnitName) {
+                if (this.verbose) {
+                    await logger.logToStderr(`Retrieving Administrative Unit Id...`);
+                }
+                administrativeUnitId = (await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id;
+            }
+            const url = this.getRequestUrl(administrativeUnitId, args.options.id, args.options);
+            const requestOptions = {
+                url: url,
+                headers: {
+                    accept: 'application/json;odata.metadata=minimal'
+                },
+                responseType: 'json'
+            };
+            const result = await request.get(requestOptions);
+            const odataType = result['@odata.type'];
+            if (odataType) {
+                result.type = odataType.replace('#microsoft.graph.', '');
+            }
+            delete result['@odata.type'];
+            delete result['@odata.context'];
+            await logger.log(result);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    getRequestUrl(administrativeUnitId, memberId, options) {
+        const queryParameters = [];
+        if (options.properties) {
+            const allProperties = options.properties.split(',');
+            const selectProperties = allProperties.filter(prop => !prop.includes('/'));
+            const expandProperties = allProperties.filter(prop => prop.includes('/'));
+            if (selectProperties.length > 0) {
+                queryParameters.push(`$select=${selectProperties}`);
+            }
+            if (expandProperties.length > 0) {
+                const fieldExpands = expandProperties.map(p => {
+                    const properties = p.split('/');
+                    return `${properties[0]}($select=${properties[1]})`;
+                });
+                queryParameters.push(`$expand=${fieldExpands.join(',')}`);
+            }
+        }
+        const queryString = queryParameters.length > 0
+            ? `?${queryParameters.join('&')}`
+            : '';
+        return `${this.resource}/v1.0/directory/administrativeUnits/${administrativeUnitId}/members/${memberId}${queryString}`;
+    }
+}
+_AadAdministrativeUnitMemberGetCommand_instances = new WeakSet(), _AadAdministrativeUnitMemberGetCommand_initTelemetry = function _AadAdministrativeUnitMemberGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            administrativeUnitId: typeof args.options.administrativeUnitId !== 'undefined',
+            administrativeUnitName: typeof args.options.administrativeUnitName !== 'undefined',
+            properties: typeof args.options.properties !== 'undefined'
+        });
+    });
+}, _AadAdministrativeUnitMemberGetCommand_initOptions = function _AadAdministrativeUnitMemberGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id <id>'
+    }, {
+        option: '-u, --administrativeUnitId [administrativeUnitId]'
+    }, {
+        option: '-n, --administrativeUnitName [administrativeUnitName]'
+    }, {
+        option: '-p, --properties [properties]'
+    });
+}, _AadAdministrativeUnitMemberGetCommand_initValidators = function _AadAdministrativeUnitMemberGetCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        if (args.options.administrativeUnitId && !validation.isValidGuid(args.options.administrativeUnitId)) {
+            return `${args.options.administrativeUnitId} is not a valid GUID`;
+        }
+        return true;
+    });
+}, _AadAdministrativeUnitMemberGetCommand_initOptionSets = function _AadAdministrativeUnitMemberGetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['administrativeUnitId', 'administrativeUnitName'] });
+};
+export default new AadAdministrativeUnitMemberGetCommand();
+//# sourceMappingURL=administrativeunit-member-get.js.map

package/dist/m365/aad/commands/administrativeunit/administrativeunit-member-list.js

@@ -0,0 +1,138 @@
+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 _AadAdministrativeUnitMemberListCommand_instances, _AadAdministrativeUnitMemberListCommand_initTelemetry, _AadAdministrativeUnitMemberListCommand_initOptions, _AadAdministrativeUnitMemberListCommand_initValidators, _AadAdministrativeUnitMemberListCommand_initOptionSets;
+import { odata } from '../../../../utils/odata.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js';
+import { validation } from '../../../../utils/validation.js';
+class AadAdministrativeUnitMemberListCommand extends GraphCommand {
+    get name() {
+        return commands.ADMINISTRATIVEUNIT_MEMBER_LIST;
+    }
+    get description() {
+        return 'Retrieves members (users, groups, or devices) of an administrative unit.';
+    }
+    defaultProperties() {
+        return ['id', 'displayName'];
+    }
+    constructor() {
+        super();
+        _AadAdministrativeUnitMemberListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitMemberListCommand_instances, "m", _AadAdministrativeUnitMemberListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitMemberListCommand_instances, "m", _AadAdministrativeUnitMemberListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitMemberListCommand_instances, "m", _AadAdministrativeUnitMemberListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitMemberListCommand_instances, "m", _AadAdministrativeUnitMemberListCommand_initOptionSets).call(this);
+    }
+    async commandAction(logger, args) {
+        let administrativeUnitId = args.options.administrativeUnitId;
+        try {
+            if (args.options.administrativeUnitName) {
+                administrativeUnitId = (await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id;
+            }
+            let results;
+            const endpoint = this.getRequestUrl(administrativeUnitId, args.options);
+            if (args.options.type) {
+                if (args.options.filter) {
+                    // While using the filter, we need to specify the ConsistencyLevel header.
+                    // Can be refactored when the header is no longer necessary.
+                    const requestOptions = {
+                        url: endpoint,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none',
+                            ConsistencyLevel: 'eventual'
+                        },
+                        responseType: 'json'
+                    };
+                    results = await odata.getAllItems(requestOptions);
+                }
+                else {
+                    results = await odata.getAllItems(endpoint);
+                }
+            }
+            else {
+                results = await odata.getAllItems(endpoint, 'minimal');
+                results.forEach(c => {
+                    const odataType = c['@odata.type'];
+                    if (odataType) {
+                        c.type = odataType.replace('#microsoft.graph.', '');
+                    }
+                    delete c['@odata.type'];
+                });
+            }
+            await logger.log(results);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    getRequestUrl(administrativeUnitId, options) {
+        const queryParameters = [];
+        if (options.properties) {
+            const allProperties = options.properties.split(',');
+            const selectProperties = allProperties.filter(prop => !prop.includes('/'));
+            const expandProperties = allProperties.filter(prop => prop.includes('/'));
+            if (selectProperties.length > 0) {
+                queryParameters.push(`$select=${selectProperties}`);
+            }
+            if (expandProperties.length > 0) {
+                const fieldExpands = expandProperties.map(p => `${p.split('/')[0]}($select=${p.split('/')[1]})`);
+                queryParameters.push(`$expand=${fieldExpands.join(',')}`);
+            }
+        }
+        if (options.filter) {
+            queryParameters.push(`$filter=${options.filter}`);
+            queryParameters.push('$count=true');
+        }
+        const queryString = queryParameters.length > 0
+            ? `?${queryParameters.join('&')}`
+            : '';
+        return options.type
+            ? `${this.resource}/v1.0/directory/administrativeUnits/${administrativeUnitId}/members/microsoft.graph.${options.type}${queryString}`
+            : `${this.resource}/v1.0/directory/administrativeUnits/${administrativeUnitId}/members${queryString}`;
+    }
+}
+_AadAdministrativeUnitMemberListCommand_instances = new WeakSet(), _AadAdministrativeUnitMemberListCommand_initTelemetry = function _AadAdministrativeUnitMemberListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            type: typeof args.options.type !== 'undefined',
+            properties: typeof args.options.properties !== 'undefined',
+            filter: typeof args.options.filter !== 'undefined'
+        });
+    });
+}, _AadAdministrativeUnitMemberListCommand_initOptions = function _AadAdministrativeUnitMemberListCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --administrativeUnitId [administrativeUnitId]'
+    }, {
+        option: '-n, --administrativeUnitName [administrativeUnitName]'
+    }, {
+        option: '-t, --type [type]',
+        autocomplete: ['user', 'group', 'device']
+    }, {
+        option: '-p, --properties [properties]'
+    }, {
+        option: '-f, --filter [filter]'
+    });
+}, _AadAdministrativeUnitMemberListCommand_initValidators = function _AadAdministrativeUnitMemberListCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.administrativeUnitId && !validation.isValidGuid(args.options.administrativeUnitId)) {
+            return `${args.options.administrativeUnitId} is not a valid GUID`;
+        }
+        if (args.options.type) {
+            if (['user', 'group', 'device'].every(type => type !== args.options.type)) {
+                return `${args.options.type} is not a valid type value. Allowed values user|group|device`;
+            }
+        }
+        if (args.options.filter && !args.options.type) {
+            return 'Filter can be specified only if type is set';
+        }
+        return true;
+    });
+}, _AadAdministrativeUnitMemberListCommand_initOptionSets = function _AadAdministrativeUnitMemberListCommand_initOptionSets() {
+    this.optionSets.push({ options: ['administrativeUnitId', 'administrativeUnitName'] });
+};
+export default new AadAdministrativeUnitMemberListCommand();
+//# sourceMappingURL=administrativeunit-member-list.js.map

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

@@ -9,7 +9,7 @@ import { validation } from "../../../../utils/validation.js";
 import request from "../../../../request.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 AadAdministrativeUnitRemoveCommand extends GraphCommand {
     get name() {
         return commands.ADMINISTRATIVEUNIT_REMOVE;
@@ -50,7 +50,7 @@ class AadAdministrativeUnitRemoveCommand extends GraphCommand {
             await removeAdministrativeUnit();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove administrative unit '${args.options.id || args.options.displayName}'?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove administrative unit '${args.options.id || args.options.displayName}'?` });
             if (result) {
                 await removeAdministrativeUnit();
             }

package/dist/m365/aad/commands/app/app-get.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 AadAppGetCommand extends GraphCommand {
     get name() {
         return commands.APP_GET;
@@ -61,7 +61,7 @@ class AadAppGetCommand 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 getAppInfo(appObjectId) {