@pnp/cli-microsoft365 12.0.0-beta.feb621e → 12.1.0-beta.0c2915d

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

@@ -1,10 +1,6 @@
-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 _EntraM365GroupUserRemoveCommand_instances, _EntraM365GroupUserRemoveCommand_initTelemetry, _EntraM365GroupUserRemoveCommand_initOptions, _EntraM365GroupUserRemoveCommand_initValidators, _EntraM365GroupUserRemoveCommand_initOptionSets, _EntraM365GroupUserRemoveCommand_initTypes;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { entraUser } from '../../../../utils/entraUser.js';
@@ -12,6 +8,22 @@ import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    teamId: z.uuid().optional(),
+    teamName: z.string().optional(),
+    groupId: z.uuid().optional().alias('i'),
+    groupName: z.string().optional(),
+    ids: z.string()
+        .refine(ids => validation.isValidGuidArray(ids) === true, {
+        error: e => `The following GUIDs are invalid for the option 'ids': ${validation.isValidGuidArray(e.input)}.`
+    }).optional(),
+    userNames: z.string()
+        .refine(names => validation.isValidUserPrincipalNameArray(names) === true, {
+        error: e => `The following user principal names are invalid for the option 'userNames': ${validation.isValidUserPrincipalNameArray(e.input)}.`
+    }).optional(),
+    force: z.boolean().optional().alias('f')
+});
 class EntraM365GroupUserRemoveCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_USER_REMOVE;
@@ -19,14 +31,25 @@ class EntraM365GroupUserRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes the specified user from specified Microsoft 365 Group or Microsoft Teams team';
     }
-    constructor() {
-        super();
-        _EntraM365GroupUserRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserRemoveCommand_instances, "m", _EntraM365GroupUserRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserRemoveCommand_instances, "m", _EntraM365GroupUserRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserRemoveCommand_instances, "m", _EntraM365GroupUserRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserRemoveCommand_instances, "m", _EntraM365GroupUserRemoveCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserRemoveCommand_instances, "m", _EntraM365GroupUserRemoveCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.groupId, opts.teamId, opts.groupName, opts.teamName].filter(o => o !== undefined).length === 1, {
+            error: 'Use one of the following options: groupId, teamId, groupName or teamName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['groupId', 'teamId', 'groupName', 'teamName']
+            }
+        })
+            .refine(opts => [opts.ids, opts.userNames].filter(o => o !== undefined).length === 1, {
+            error: 'Use one of the following options: ids or userNames.',
+            params: {
+                customCode: 'optionSet',
+                options: ['ids', 'userNames']
+            }
+        });
     }
     async commandAction(logger, args) {
         const removeUser = async () => {
@@ -94,65 +117,5 @@ class EntraM365GroupUserRemoveCommand extends GraphCommand {
         }
     }
 }
-_EntraM365GroupUserRemoveCommand_instances = new WeakSet(), _EntraM365GroupUserRemoveCommand_initTelemetry = function _EntraM365GroupUserRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: !!args.options.force,
-            teamId: typeof args.options.teamId !== 'undefined',
-            groupId: typeof args.options.groupId !== 'undefined',
-            teamName: typeof args.options.teamName !== 'undefined',
-            groupName: typeof args.options.groupName !== 'undefined',
-            ids: typeof args.options.ids !== 'undefined',
-            userNames: typeof args.options.userNames !== 'undefined'
-        });
-    });
-}, _EntraM365GroupUserRemoveCommand_initOptions = function _EntraM365GroupUserRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --groupId [groupId]'
-    }, {
-        option: '--groupName [groupName]'
-    }, {
-        option: '--teamId [teamId]'
-    }, {
-        option: '--teamName [teamName]'
-    }, {
-        option: '--ids [ids]'
-    }, {
-        option: '--userNames [userNames]'
-    }, {
-        option: '-f, --force'
-    });
-}, _EntraM365GroupUserRemoveCommand_initValidators = function _EntraM365GroupUserRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.teamId && !validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} is not a valid GUID for option 'teamId'.`;
-        }
-        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
-            return `${args.options.groupId} is not a valid GUID for option 'groupId'.`;
-        }
-        if (args.options.ids) {
-            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.ids);
-            if (isValidGUIDArrayResult !== true) {
-                return `The following GUIDs are invalid for the option 'ids': ${isValidGUIDArrayResult}.`;
-            }
-        }
-        if (args.options.userNames) {
-            const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.userNames);
-            if (isValidUPNArrayResult !== true) {
-                return `The following user principal names are invalid for the option 'userNames': ${isValidUPNArrayResult}.`;
-            }
-        }
-        return true;
-    });
-}, _EntraM365GroupUserRemoveCommand_initOptionSets = function _EntraM365GroupUserRemoveCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['groupId', 'teamId', 'groupName', 'teamName']
-    }, {
-        options: ['ids', 'userNames']
-    });
-}, _EntraM365GroupUserRemoveCommand_initTypes = function _EntraM365GroupUserRemoveCommand_initTypes() {
-    this.types.string.push('groupId', 'groupName', 'teamId', 'teamName', 'ids', 'userNames');
-    this.types.boolean.push('force');
-};
 export default new EntraM365GroupUserRemoveCommand();
 //# sourceMappingURL=m365group-user-remove.js.map

package/dist/m365/entra/commands/m365group/m365group-user-set.js

@@ -1,16 +1,33 @@
-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 _EntraM365GroupUserSetCommand_instances, _EntraM365GroupUserSetCommand_initTelemetry, _EntraM365GroupUserSetCommand_initOptions, _EntraM365GroupUserSetCommand_initValidators, _EntraM365GroupUserSetCommand_initOptionSets, _EntraM365GroupUserSetCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
-import { validation } from '../../../../utils/validation.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
+import { entraUser } from '../../../../utils/entraUser.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { entraGroup } from '../../../../utils/entraGroup.js';
-import { entraUser } from '../../../../utils/entraUser.js';
+import { zod } from '../../../../utils/zod.js';
+const RoleEnum = {
+    owner: 'owner',
+    member: 'member'
+};
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    ids: z.string()
+        .refine(ids => validation.isValidGuidArray(ids) === true, {
+        error: e => `The following GUIDs are invalid for the option 'ids': ${validation.isValidGuidArray(e.input)}.`
+    }).optional(),
+    userNames: z.string()
+        .refine(names => validation.isValidUserPrincipalNameArray(names) === true, {
+        error: e => `The following user principal names are invalid for the option 'userNames': ${validation.isValidUserPrincipalNameArray(e.input)}.`
+    }).optional(),
+    groupId: z.uuid().optional().alias('i'),
+    groupName: z.string().optional(),
+    teamId: z.uuid().optional(),
+    teamName: z.string().optional(),
+    role: zod.coercedEnum(RoleEnum).alias('r')
+});
 class EntraM365GroupUserSetCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_USER_SET;
@@ -18,15 +35,25 @@ class EntraM365GroupUserSetCommand extends GraphCommand {
     get description() {
         return 'Updates role of the specified user in the specified Microsoft 365 Group or Microsoft Teams team';
     }
-    constructor() {
-        super();
-        _EntraM365GroupUserSetCommand_instances.add(this);
-        this.allowedRoles = ['owner', 'member'];
-        __classPrivateFieldGet(this, _EntraM365GroupUserSetCommand_instances, "m", _EntraM365GroupUserSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserSetCommand_instances, "m", _EntraM365GroupUserSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserSetCommand_instances, "m", _EntraM365GroupUserSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserSetCommand_instances, "m", _EntraM365GroupUserSetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraM365GroupUserSetCommand_instances, "m", _EntraM365GroupUserSetCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.groupId, opts.groupName, opts.teamId, opts.teamName].filter(o => o !== undefined).length === 1, {
+            error: 'Use one of the following options: groupId, groupName, teamId or teamName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['groupId', 'groupName', 'teamId', 'teamName']
+            }
+        })
+            .refine(opts => [opts.ids, opts.userNames].filter(o => o !== undefined).length === 1, {
+            error: 'Use one of the following options: ids or userNames.',
+            params: {
+                customCode: 'optionSet',
+                options: ['ids', 'userNames']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -159,64 +186,5 @@ class EntraM365GroupUserSetCommand extends GraphCommand {
         return requestOptions;
     }
 }
-_EntraM365GroupUserSetCommand_instances = new WeakSet(), _EntraM365GroupUserSetCommand_initTelemetry = function _EntraM365GroupUserSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            teamId: typeof args.options.teamId !== 'undefined',
-            teamName: typeof args.options.teamName !== 'undefined',
-            groupId: typeof args.options.groupId !== 'undefined',
-            groupName: typeof args.options.groupName !== 'undefined',
-            ids: typeof args.options.ids !== 'undefined',
-            userNames: typeof args.options.userNames !== 'undefined'
-        });
-    });
-}, _EntraM365GroupUserSetCommand_initOptions = function _EntraM365GroupUserSetCommand_initOptions() {
-    this.options.unshift({
-        option: '--ids [ids]'
-    }, {
-        option: '--userNames [userNames]'
-    }, {
-        option: '-i, --groupId [groupId]'
-    }, {
-        option: '--groupName [groupName]'
-    }, {
-        option: '--teamId [teamId]'
-    }, {
-        option: '--teamName [teamName]'
-    }, {
-        option: '-r, --role <role>',
-        autocomplete: this.allowedRoles
-    });
-}, _EntraM365GroupUserSetCommand_initValidators = function _EntraM365GroupUserSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.teamId && !validation.isValidGuid(args.options.teamId)) {
-            return `'${args.options.teamId}' is not a valid GUID for option 'teamId'.`;
-        }
-        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
-            return `'${args.options.groupId}' is not a valid GUID for option 'groupId'.`;
-        }
-        if (args.options.ids) {
-            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.ids);
-            if (isValidGUIDArrayResult !== true) {
-                return `The following GUIDs are invalid for the option 'ids': ${isValidGUIDArrayResult}.`;
-            }
-        }
-        if (args.options.userNames) {
-            const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.userNames);
-            if (isValidUPNArrayResult !== true) {
-                return `The following user principal names are invalid for the option 'userNames': ${isValidUPNArrayResult}.`;
-            }
-        }
-        if (args.options.role && !this.allowedRoles.some(role => role.toLowerCase() === args.options.role.toLowerCase())) {
-            return `'${args.options.role}' is not a valid role. Allowed values are: ${this.allowedRoles.join(',')}`;
-        }
-        return true;
-    });
-}, _EntraM365GroupUserSetCommand_initOptionSets = function _EntraM365GroupUserSetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupName', 'teamId', 'teamName'] });
-    this.optionSets.push({ options: ['ids', 'userNames'] });
-}, _EntraM365GroupUserSetCommand_initTypes = function _EntraM365GroupUserSetCommand_initTypes() {
-    this.types.string.push('ids', 'userNames', 'groupId', 'groupName', 'teamId', 'teamName', 'role');
-};
 export default new EntraM365GroupUserSetCommand();
 //# sourceMappingURL=m365group-user-set.js.map

package/dist/m365/entra/commands.js

@@ -10,6 +10,8 @@ export default {
     ADMINISTRATIVEUNIT_MEMBER_REMOVE: `${prefix} administrativeunit member remove`,
     ADMINISTRATIVEUNIT_ROLEASSIGNMENT_ADD: `${prefix} administrativeunit roleassignment add`,
     AGENT_LIST: `${prefix} agent list`,
+    AGENT_BLUEPRINT_LIST: `${prefix} agent blueprint list`,
+    AGENT_BLUEPRINTPRINCIPAL_LIST: `${prefix} agent blueprintprincipal list`,
     APP_ADD: `${prefix} app add`,
     APP_GET: `${prefix} app get`,
     APP_LIST: `${prefix} app list`,

package/dist/m365/graph/commands/schemaextension/schemaextension-list.js

@@ -53,22 +53,20 @@ class GraphSchemaExtensionListCommand extends GraphCommand {
         };
         try {
             const res = await request.get(requestOptions);
-            if (res.value && res.value.length > 0) {
-                const size = args.options.pageSize ? parseInt(args.options.pageSize) : parseInt(res.value.length);
-                const result = res.value.slice(-size);
-                if (args.options.output !== 'json' && result.length > 1) {
-                    await logger.log(result.map((x) => ({
-                        id: x.id,
-                        description: x.description,
-                        targetTypes: x.targetTypes,
-                        status: x.status,
-                        owner: x.owner,
-                        properties: JSON.stringify(x.properties)
-                    })));
-                }
-                else {
-                    await logger.log(result);
-                }
+            const size = args.options.pageSize ? parseInt(args.options.pageSize) : res.value.length;
+            const result = res.value.slice(-size);
+            if (args.options.output !== 'json' && result.length > 1) {
+                await logger.log(result.map((x) => ({
+                    id: x.id,
+                    description: x.description,
+                    targetTypes: x.targetTypes,
+                    status: x.status,
+                    owner: x.owner,
+                    properties: JSON.stringify(x.properties)
+                })));
+            }
+            else {
+                await logger.log(result);
             }
         }
         catch (err) {

package/dist/m365/outlook/commands/calendargroup/calendargroup-add.js

@@ -0,0 +1,97 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import request from '../../../../request.js';
+import { accessToken } from '../../../../utils/accessToken.js';
+import auth from '../../../../Auth.js';
+import { formatting } from '../../../../utils/formatting.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    name: z.string(),
+    userId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID.`
+    }).optional(),
+    userName: z.string().refine(name => validation.isValidUserPrincipalName(name), {
+        error: e => `'${e.input}' is not a valid UPN.`
+    }).optional()
+});
+class OutlookCalendarGroupAddCommand extends GraphCommand {
+    get name() {
+        return commands.CALENDARGROUP_ADD;
+    }
+    get description() {
+        return 'Creates a new calendar group for a user';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => !(options.userId && options.userName), {
+            error: 'Specify either userId or userName, but not both.'
+        });
+    }
+    async commandAction(logger, args) {
+        try {
+            const token = await auth.ensureAccessToken(auth.defaultResource, logger, this.debug);
+            const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(token);
+            let userUrl;
+            let graphUserId;
+            if (isAppOnlyAccessToken) {
+                if (!args.options.userId && !args.options.userName) {
+                    throw 'When running with application permissions either userId or userName is required.';
+                }
+                graphUserId = (args.options.userId ?? args.options.userName);
+                userUrl = `${this.resource}/v1.0/users('${formatting.encodeQueryParameter(graphUserId)}')`;
+                if (this.verbose) {
+                    await logger.logToStderr(`Creating calendar group using application permissions for user '${graphUserId}'...`);
+                }
+            }
+            else if (args.options.userId || args.options.userName) {
+                const currentUserId = accessToken.getUserIdFromAccessToken(token);
+                const currentUserName = accessToken.getUserNameFromAccessToken(token);
+                const isOtherUser = (args.options.userId && args.options.userId.toLowerCase() !== currentUserId?.toLowerCase()) ||
+                    (args.options.userName && args.options.userName.toLowerCase() !== currentUserName?.toLowerCase());
+                if (isOtherUser) {
+                    const scopes = accessToken.getScopesFromAccessToken(token);
+                    const hasSharedScope = scopes.some(s => s === 'Calendars.ReadWrite.Shared');
+                    if (!hasSharedScope) {
+                        throw `To create calendar groups of other users, the Entra ID application used for authentication must have the Calendars.ReadWrite.Shared delegated permission assigned.`;
+                    }
+                }
+                graphUserId = (args.options.userId ?? args.options.userName);
+                userUrl = `${this.resource}/v1.0/users('${formatting.encodeQueryParameter(graphUserId)}')`;
+                if (this.verbose) {
+                    await logger.logToStderr(`Creating calendar group using delegated permissions for user '${graphUserId}'...`);
+                }
+            }
+            else {
+                graphUserId = accessToken.getUserIdFromAccessToken(token);
+                userUrl = `${this.resource}/v1.0/me`;
+                if (this.verbose) {
+                    await logger.logToStderr('Creating calendar group for the signed-in user...');
+                }
+            }
+            const requestOptions = {
+                url: `${userUrl}/calendarGroups`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json'
+                },
+                responseType: 'json',
+                data: {
+                    name: args.options.name
+                }
+            };
+            const result = await request.post(requestOptions);
+            await logger.log(result);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new OutlookCalendarGroupAddCommand();
+//# sourceMappingURL=calendargroup-add.js.map