@pnp/cli-microsoft365 11.7.0-beta.71e4ac5 → 11.7.0-beta.b9f508d

package/dist/m365/entra/commands/user/user-license-add.js

@@ -5,6 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _EntraUserLicenseAddCommand_instances, _EntraUserLicenseAddCommand_initTelemetry, _EntraUserLicenseAddCommand_initOptions, _EntraUserLicenseAddCommand_initValidators, _EntraUserLicenseAddCommand_initOptionSets;
 import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -27,7 +28,7 @@ class EntraUserLicenseAddCommand extends GraphCommand {
         const addLicenses = args.options.ids.split(',').map(x => { return { "disabledPlans": [], "skuId": x }; });
         const requestBody = { "addLicenses": addLicenses, "removeLicenses": [] };
         const requestOptions = {
-            url: `${this.resource}/v1.0/users/${args.options.userId || args.options.userName}/assignLicense`,
+            url: `${this.resource}/v1.0/users/${formatting.encodeQueryParameter(args.options.userId || args.options.userName)}/assignLicense`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },

package/dist/m365/entra/commands/user/user-license-list.js

@@ -4,13 +4,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _EntraUserLicenseListCommand_instances, _EntraUserLicenseListCommand_initTelemetry, _EntraUserLicenseListCommand_initOptions, _EntraUserLicenseListCommand_initValidators, _EntraUserLicenseListCommand_initOptionSets;
-import { accessToken } from '../../../../utils/accessToken.js';
 import { odata } from '../../../../utils/odata.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 auth from '../../../../Auth.js';
-class EntraUserLicenseListCommand extends GraphCommand {
+import GraphDelegatedCommand from '../../../base/GraphDelegatedCommand.js';
+class EntraUserLicenseListCommand extends GraphDelegatedCommand {
     get name() {
         return commands.USER_LICENSE_LIST;
     }
@@ -29,16 +28,12 @@ class EntraUserLicenseListCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraUserLicenseListCommand_instances, "m", _EntraUserLicenseListCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.connection.accessTokens[this.resource].accessToken);
-        if (isAppOnlyAccessToken && !args.options.userId && !args.options.userName) {
-            this.handleError(`Specify at least 'userId' or 'userName' when using application permissions.`);
-        }
         if (this.verbose) {
             await logger.logToStderr(`Retrieving licenses from user: ${args.options.userId || args.options.userName || 'current user'}.`);
         }
         let requestUrl = `${this.resource}/v1.0/`;
         if (args.options.userId || args.options.userName) {
-            requestUrl += `users/${args.options.userId || args.options.userName}`;
+            requestUrl += `users/${formatting.encodeQueryParameter(args.options.userId || args.options.userName)}`;
         }
         else {
             requestUrl += 'me';

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

@@ -7,6 +7,7 @@ var _EntraUserLicenseRemoveCommand_instances, _EntraUserLicenseRemoveCommand_ini
 import commands from '../../commands.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
+import { formatting } from '../../../../utils/formatting.js';
 import { cli } from '../../../../cli/cli.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 class EntraUserLicenseRemoveCommand extends GraphCommand {
@@ -42,7 +43,7 @@ class EntraUserLicenseRemoveCommand extends GraphCommand {
         const removeLicenses = args.options.ids.split(',');
         const requestBody = { "addLicenses": [], "removeLicenses": removeLicenses };
         const requestOptions = {
-            url: `${this.resource}/v1.0/users/${args.options.userId || args.options.userName}/assignLicense`,
+            url: `${this.resource}/v1.0/users/${formatting.encodeQueryParameter(args.options.userId || args.options.userName)}/assignLicense`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },

package/dist/m365/outlook/commands/event/event-cancel.js

@@ -0,0 +1,103 @@
+import auth from '../../../../Auth.js';
+import request from '../../../../request.js';
+import { accessToken } from '../../../../utils/accessToken.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 { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().alias('i'),
+    userId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID.`
+    }).optional(),
+    userName: z.string()
+        .refine(upn => validation.isValidUserPrincipalName(upn) === true, {
+        error: e => `'${e.input}' is not a valid user principal name for option 'userName'.`
+    })
+        .optional(),
+    comment: z.string().optional(),
+    force: z.boolean().optional().alias('f')
+});
+class OutlookEventCancelCommand extends GraphCommand {
+    get name() {
+        return commands.EVENT_CANCEL;
+    }
+    get description() {
+        return 'Cancels a calendar event';
+    }
+    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) {
+        const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.connection.accessTokens[auth.defaultResource].accessToken);
+        let principalUrl = '';
+        const token = auth.connection.accessTokens[auth.defaultResource].accessToken;
+        if (isAppOnlyAccessToken) {
+            if (!args.options.userId && !args.options.userName) {
+                throw `The option 'userId' or 'userName' is required when cancelling an event using application permissions.`;
+            }
+        }
+        else {
+            if (args.options.userId) {
+                const currentUserId = accessToken.getUserIdFromAccessToken(token);
+                if (args.options.userId !== currentUserId) {
+                    throw `You can only cancel your own events when using delegated permissions. The specified userId '${args.options.userId}' does not match the current user '${currentUserId}'.`;
+                }
+            }
+            if (args.options.userName) {
+                const currentUserName = accessToken.getUserNameFromAccessToken(token);
+                if (args.options.userName.toLowerCase() !== currentUserName.toLowerCase()) {
+                    throw `You can only cancel your own events when using delegated permissions. The specified userName '${args.options.userName}' does not match the current user '${currentUserName}'.`;
+                }
+            }
+        }
+        if (args.options.userId || args.options.userName) {
+            const userIdentifier = args.options.userId ?? args.options.userName;
+            principalUrl += `users('${userIdentifier}')`;
+        }
+        else {
+            principalUrl += 'me';
+        }
+        const cancelEvent = async () => {
+            try {
+                if (this.verbose) {
+                    await logger.logToStderr(`Cancelling event with id '${args.options.id}'...`);
+                }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/${principalUrl}/events/${args.options.id}/cancel`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none',
+                        'content-type': 'application/json'
+                    },
+                    data: {
+                        comment: args.options.comment
+                    }
+                };
+                await request.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        };
+        if (args.options.force) {
+            await cancelEvent();
+        }
+        else {
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to cancel event with id '${args.options.id}'?` });
+            if (result) {
+                await cancelEvent();
+            }
+        }
+    }
+}
+export default new OutlookEventCancelCommand();
+//# sourceMappingURL=event-cancel.js.map

package/dist/m365/outlook/commands/event/event-remove.js

@@ -0,0 +1,104 @@
+import auth from '../../../../Auth.js';
+import request from '../../../../request.js';
+import { accessToken } from '../../../../utils/accessToken.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 { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string().alias('i'),
+    userId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID.`
+    }).optional(),
+    userName: z.string()
+        .refine(upn => validation.isValidUserPrincipalName(upn) === true, {
+        error: e => `'${e.input}' is not a valid user principal name for option 'userName'.`
+    })
+        .optional(),
+    permanent: z.boolean().optional(),
+    force: z.boolean().optional().alias('f')
+});
+class OutlookEventRemoveCommand extends GraphCommand {
+    get name() {
+        return commands.EVENT_REMOVE;
+    }
+    get description() {
+        return 'Removes an event from a calendar';
+    }
+    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) {
+        const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.connection.accessTokens[auth.defaultResource].accessToken);
+        const token = auth.connection.accessTokens[auth.defaultResource].accessToken;
+        if (isAppOnlyAccessToken) {
+            if (!args.options.userId && !args.options.userName) {
+                throw `The option 'userId' or 'userName' is required when removing an event using application permissions.`;
+            }
+        }
+        else {
+            if (args.options.userId) {
+                const currentUserId = accessToken.getUserIdFromAccessToken(token);
+                if (args.options.userId !== currentUserId) {
+                    throw `You can only remove your own events when using delegated permissions. The specified userId '${args.options.userId}' does not match the current user '${currentUserId}'.`;
+                }
+            }
+            if (args.options.userName) {
+                const currentUserName = accessToken.getUserNameFromAccessToken(token);
+                if (args.options.userName.toLowerCase() !== currentUserName.toLowerCase()) {
+                    throw `You can only remove your own events when using delegated permissions. The specified userName '${args.options.userName}' does not match the current user '${currentUserName}'.`;
+                }
+            }
+        }
+        let principalUrl = '';
+        const userIdentifier = args.options.userId ?? args.options.userName;
+        if (userIdentifier) {
+            principalUrl += `users('${userIdentifier}')`;
+        }
+        else {
+            principalUrl += 'me';
+        }
+        const removeEvent = async () => {
+            try {
+                if (this.verbose) {
+                    await logger.logToStderr(`Removing event with id '${args.options.id}'...`);
+                }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/${principalUrl}/events/${args.options.id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    }
+                };
+                if (args.options.permanent) {
+                    requestOptions.url += '/permanentDelete';
+                    await request.post(requestOptions);
+                }
+                else {
+                    await request.delete(requestOptions);
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        };
+        if (args.options.force) {
+            await removeEvent();
+        }
+        else {
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove event with id '${args.options.id}'?` });
+            if (result) {
+                await removeEvent();
+            }
+        }
+    }
+}
+export default new OutlookEventRemoveCommand();
+//# sourceMappingURL=event-remove.js.map

package/dist/m365/outlook/commands.js

@@ -4,7 +4,9 @@ export default {
     CALENDAR_GET: `${prefix} calendar get`,
     CALENDAR_REMOVE: `${prefix} calendar remove`,
     CALENDARGROUP_LIST: `${prefix} calendargroup list`,
+    EVENT_CANCEL: `${prefix} event cancel`,
     EVENT_LIST: `${prefix} event list`,
+    EVENT_REMOVE: `${prefix} event remove`,
     MAIL_SEARCHFOLDER_ADD: `${prefix} mail searchfolder add`,
     MAIL_SEND: `${prefix} mail send`,
     MAILBOX_SETTINGS_GET: `${prefix} mailbox settings get`,