@pnp/cli-microsoft365 10.8.0-beta.a51d886 → 10.8.0

package/dist/cli/cli.js

@@ -406,7 +406,7 @@ async function loadCommandFromFile(commandFileUrl) {
     catch { }
 }
 function getCommandInfo(command, filePath = '', helpFilePath = '') {
-    const options = command.schema ? zod.schemaToOptions(command.schema) : getCommandOptions(command);
+    const options = command.schema ? zod.schemaToOptionInfo(command.schema) : getCommandOptions(command);
     command.optionsInfo = options;
     return {
         aliases: command.alias(),

package/dist/config.js

@@ -18,6 +18,7 @@ export default {
         'https://graph.microsoft.com/Directory.ReadWrite.All',
         'https://graph.microsoft.com/ExternalConnection.ReadWrite.All',
         'https://graph.microsoft.com/ExternalItem.ReadWrite.All',
+        'https://graph.microsoft.com/FileStorageContainer.Selected',
         'https://graph.microsoft.com/Group.ReadWrite.All',
         'https://graph.microsoft.com/IdentityProvider.ReadWrite.All',
         'https://graph.microsoft.com/InformationProtectionPolicy.Read',

package/dist/m365/adaptivecard/commands/adaptivecard-send.js

@@ -1,13 +1,21 @@
-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 _AdaptiveCardSendCommand_instances, _AdaptiveCardSendCommand_initTelemetry, _AdaptiveCardSendCommand_initOptions, _AdaptiveCardSendCommand_initValidators, _AdaptiveCardSendCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../Command.js';
 import request from '../../../request.js';
+import { optionsUtils } from '../../../utils/optionsUtils.js';
+import { zod } from '../../../utils/zod.js';
 import AnonymousCommand from '../../base/AnonymousCommand.js';
 import commands from '../commands.js';
-import { optionsUtils } from '../../../utils/optionsUtils.js';
+export const options = globalOptionsZod
+    .extend({
+    url: z.string(),
+    title: zod.alias('t', z.string().optional()),
+    description: zod.alias('d', z.string().optional()),
+    imageUrl: zod.alias('i', z.string().optional()),
+    actionUrl: zod.alias('a', z.string().optional()),
+    card: z.string().optional(),
+    cardData: z.string().optional()
+})
+    .and(z.any());
 class AdaptiveCardSendCommand extends AnonymousCommand {
     get name() {
         return commands.SEND;
@@ -15,19 +23,48 @@ class AdaptiveCardSendCommand extends AnonymousCommand {
     get description() {
         return 'Sends adaptive card to the specified URL';
     }
-    constructor() {
-        super();
-        _AdaptiveCardSendCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AdaptiveCardSendCommand_instances, "m", _AdaptiveCardSendCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AdaptiveCardSendCommand_instances, "m", _AdaptiveCardSendCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AdaptiveCardSendCommand_instances, "m", _AdaptiveCardSendCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AdaptiveCardSendCommand_instances, "m", _AdaptiveCardSendCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
     }
-    allowUnknownOptions() {
-        return true;
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => !options.cardData || options.card, {
+            message: 'When you specify cardData, you must also specify card.',
+            path: ['cardData']
+        })
+            .refine(options => {
+            if (options.card) {
+                try {
+                    JSON.parse(options.card);
+                    return true;
+                }
+                catch (e) {
+                    return false;
+                }
+            }
+            return true;
+        }, {
+            message: 'Specified card is not a valid JSON string.',
+            path: ['card']
+        })
+            .refine(options => {
+            if (options.cardData) {
+                try {
+                    JSON.parse(options.cardData);
+                    return true;
+                }
+                catch (e) {
+                    return false;
+                }
+            }
+            return true;
+        }, {
+            message: 'Specified cardData is not a valid JSON string.',
+            path: ['cardData']
+        });
     }
     async commandAction(logger, args) {
-        const unknownOptions = optionsUtils.getUnknownOptions(args.options, this.options);
+        const unknownOptions = optionsUtils.getUnknownOptions(args.options, zod.schemaToOptions(this.schema));
         const unknownOptionNames = Object.getOwnPropertyNames(unknownOptions);
         const card = await this.getCard(args, unknownOptionNames, unknownOptions);
         const requestOptions = {
@@ -166,55 +203,5 @@ class AdaptiveCardSendCommand extends AnonymousCommand {
         return cardData;
     }
 }
-_AdaptiveCardSendCommand_instances = new WeakSet(), _AdaptiveCardSendCommand_initTelemetry = function _AdaptiveCardSendCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            actionUrl: typeof args.options.actionUrl !== 'undefined',
-            card: typeof args.options.card !== 'undefined',
-            cardData: typeof args.options.cardData !== 'undefined',
-            description: typeof args.options.description !== 'undefined',
-            imageUrl: typeof args.options.imageUrl !== 'undefined',
-            title: typeof args.options.title !== 'undefined'
-        });
-    });
-}, _AdaptiveCardSendCommand_initOptions = function _AdaptiveCardSendCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --url <url>'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '-d, --description [description]'
-    }, {
-        option: '-i, --imageUrl [imageUrl]'
-    }, {
-        option: '-a, --actionUrl [actionUrl]'
-    }, {
-        option: '--card [card]'
-    }, {
-        option: '--cardData [cardData]'
-    });
-}, _AdaptiveCardSendCommand_initValidators = function _AdaptiveCardSendCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.card) {
-            try {
-                JSON.parse(args.options.card);
-            }
-            catch (e) {
-                return `Error while parsing the card: ${e}`;
-            }
-        }
-        if (args.options.cardData) {
-            try {
-                JSON.parse(args.options.cardData);
-            }
-            catch (e) {
-                return `Error while parsing card data: ${e}`;
-            }
-        }
-        return true;
-    });
-}, _AdaptiveCardSendCommand_initOptionSets = function _AdaptiveCardSendCommand_initOptionSets() {
-    this.optionSets.push({ options: ['title', 'card'] });
-};
 export default new AdaptiveCardSendCommand();
 //# sourceMappingURL=adaptivecard-send.js.map

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

@@ -1,6 +1,6 @@
-import AppCommand from '../../base/AppCommand.js';
-import commands from '../commands.js';
 import { entraApp } from '../../../utils/entraApp.js';
+import AppCommand, { appCommandOptions } from '../../base/AppCommand.js';
+import commands from '../commands.js';
 class AppGetCommand extends AppCommand {
     get name() {
         return commands.GET;
@@ -8,6 +8,9 @@ class AppGetCommand extends AppCommand {
     get description() {
         return 'Retrieves information about the current Microsoft Entra app';
     }
+    get schema() {
+        return appCommandOptions;
+    }
     async commandAction(logger, args) {
         try {
             const app = await entraApp.getAppRegistrationByAppId(args.options.appId);

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

@@ -1,14 +1,14 @@
-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 _AppOpenCommand_instances, _AppOpenCommand_initTelemetry, _AppOpenCommand_initOptions;
+import { z } from 'zod';
 import { cli } from '../../../cli/cli.js';
 import { settingsNames } from '../../../settingsNames.js';
 import { browserUtil } from '../../../utils/browserUtil.js';
-import AppCommand from '../../base/AppCommand.js';
+import AppCommand, { appCommandOptions } from '../../base/AppCommand.js';
 import commands from '../commands.js';
+const options = appCommandOptions
+    .extend({
+    preview: z.boolean().optional().default(false)
+})
+    .strict();
 class AppOpenCommand extends AppCommand {
     get name() {
         return commands.OPEN;
@@ -16,11 +16,8 @@ class AppOpenCommand extends AppCommand {
     get description() {
         return 'Opens Microsoft Entra app in the Microsoft Entra ID portal';
     }
-    constructor() {
-        super();
-        _AppOpenCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AppOpenCommand_instances, "m", _AppOpenCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AppOpenCommand_instances, "m", _AppOpenCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -41,15 +38,5 @@ class AppOpenCommand extends AppCommand {
         await browserUtil.open(url);
     }
 }
-_AppOpenCommand_instances = new WeakSet(), _AppOpenCommand_initTelemetry = function _AppOpenCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appId: typeof args.options.appId !== 'undefined',
-            preview: typeof args.options.preview !== 'undefined'
-        });
-    });
-}, _AppOpenCommand_initOptions = function _AppOpenCommand_initOptions() {
-    this.options.unshift({ option: '--appId [appId]' }, { option: '--preview' });
-};
 export default new AppOpenCommand();
 //# sourceMappingURL=app-open.js.map

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

@@ -1,14 +1,16 @@
-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 _AppPermissionAddCommand_instances, _AppPermissionAddCommand_initTelemetry, _AppPermissionAddCommand_initOptions, _AppPermissionAddCommand_initOptionSets;
+import { z } from 'zod';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
-import AppCommand from '../../../base/AppCommand.js';
+import AppCommand, { appCommandOptions } from '../../../base/AppCommand.js';
 import commands from '../../commands.js';
+const options = appCommandOptions
+    .extend({
+    applicationPermissions: z.string().optional(),
+    delegatedPermissions: z.string().optional(),
+    grantAdminConsent: z.boolean().optional()
+})
+    .strict();
 var ScopeType;
 (function (ScopeType) {
     ScopeType["Role"] = "Role";
@@ -21,12 +23,15 @@ class AppPermissionAddCommand extends AppCommand {
     get description() {
         return 'Adds the specified application and/or delegated permissions to the current Microsoft Entra app API permissions';
     }
-    constructor() {
-        super();
-        _AppPermissionAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AppPermissionAddCommand_instances, "m", _AppPermissionAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AppPermissionAddCommand_instances, "m", _AppPermissionAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AppPermissionAddCommand_instances, "m", _AppPermissionAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => options.applicationPermissions || options.delegatedPermissions, {
+            message: 'Specify at least one of applicationPermissions or delegatedPermissions, or both.',
+            path: ['delegatedPermissions']
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -194,22 +199,5 @@ class AppPermissionAddCommand extends AppCommand {
         return request.post(requestOptions);
     }
 }
-_AppPermissionAddCommand_instances = new WeakSet(), _AppPermissionAddCommand_initTelemetry = function _AppPermissionAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appId: typeof args.options.appId !== 'undefined',
-            applicationPermissions: typeof args.options.applicationPermissions !== 'undefined',
-            delegatedPermissions: typeof args.options.delegatedPermissions !== 'undefined',
-            grantAdminConsent: !!args.options.grantAdminConsent
-        });
-    });
-}, _AppPermissionAddCommand_initOptions = function _AppPermissionAddCommand_initOptions() {
-    this.options.unshift({ option: '--appId [appId]' }, { option: '--applicationPermissions [applicationPermissions]' }, { option: '--delegatedPermissions [delegatedPermissions]' }, { option: '--grantAdminConsent' });
-}, _AppPermissionAddCommand_initOptionSets = function _AppPermissionAddCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['applicationPermissions', 'delegatedPermissions'],
-        runsWhen: (args) => args.options.delegatedPermissions === undefined && args.options.applicationPermissions === undefined
-    });
-};
 export default new AppPermissionAddCommand();
 //# sourceMappingURL=permission-add.js.map

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

@@ -1,7 +1,7 @@
 import request from '../../../../request.js';
-import AppCommand from '../../../base/AppCommand.js';
-import commands from '../../commands.js';
 import { entraApp } from '../../../../utils/entraApp.js';
+import AppCommand, { appCommandOptions } from '../../../base/AppCommand.js';
+import commands from '../../commands.js';
 var GetServicePrincipal;
 (function (GetServicePrincipal) {
     GetServicePrincipal[GetServicePrincipal["withPermissions"] = 0] = "withPermissions";
@@ -14,6 +14,9 @@ class AppPermissionListCommand extends AppCommand {
     get description() {
         return 'Lists API permissions for the current Microsoft Entra app';
     }
+    get schema() {
+        return appCommandOptions;
+    }
     async commandAction(logger) {
         try {
             const servicePrincipal = await this.getServicePrincipal({ appId: this.appId }, logger, GetServicePrincipal.withPermissions);

package/dist/m365/base/AppCommand.js

@@ -1,23 +1,18 @@
-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 _AppCommand_instances, _AppCommand_initOptions, _AppCommand_initValidators;
 import fs from 'fs';
+import { z } from 'zod';
 import { cli } from '../../cli/cli.js';
-import Command, { CommandError } from '../../Command.js';
-import { validation } from '../../utils/validation.js';
+import Command, { CommandError, globalOptionsZod } from '../../Command.js';
 import { formatting } from '../../utils/formatting.js';
-class AppCommand extends Command {
+export const appCommandOptions = globalOptionsZod
+    .extend({
+    appId: z.string().uuid().optional()
+});
+export default class AppCommand extends Command {
     get resource() {
         return 'https://graph.microsoft.com';
     }
-    constructor() {
-        super();
-        _AppCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AppCommand_instances, "m", _AppCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AppCommand_instances, "m", _AppCommand_initValidators).call(this);
+    get schema() {
+        return appCommandOptions;
     }
     async action(logger, args) {
         const m365rcJsonPath = '.m365rc.json';
@@ -63,15 +58,4 @@ class AppCommand extends Command {
         }
     }
 }
-_AppCommand_instances = new WeakSet(), _AppCommand_initOptions = function _AppCommand_initOptions() {
-    this.options.unshift({ option: '--appId [appId]' });
-}, _AppCommand_initValidators = function _AppCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
-            return `${args.options.appId} is not a valid GUID`;
-        }
-        return true;
-    });
-};
-export default AppCommand;
 //# sourceMappingURL=AppCommand.js.map

package/dist/m365/booking/commands/business/business-get.js

@@ -1,14 +1,17 @@
-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 _BookingBusinessGetCommand_instances, _BookingBusinessGetCommand_initTelemetry, _BookingBusinessGetCommand_initOptions, _BookingBusinessGetCommand_initOptionSets;
+import { z } from 'zod';
+import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { zod } from '../../../../utils/zod.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { cli } from '../../../../cli/cli.js';
+const options = globalOptionsZod
+    .extend({
+    id: zod.alias('i', z.string().optional()),
+    name: zod.alias('n', z.string().optional())
+})
+    .strict();
 class BookingBusinessGetCommand extends GraphCommand {
     get name() {
         return commands.BUSINESS_GET;
@@ -16,12 +19,14 @@ class BookingBusinessGetCommand extends GraphCommand {
     get description() {
         return 'Retrieve the specified Microsoft Bookings business.';
     }
-    constructor() {
-        super();
-        _BookingBusinessGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _BookingBusinessGetCommand_instances, "m", _BookingBusinessGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _BookingBusinessGetCommand_instances, "m", _BookingBusinessGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _BookingBusinessGetCommand_instances, "m", _BookingBusinessGetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => options.id || options.name, {
+            message: 'Specify either id or name'
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -65,17 +70,5 @@ class BookingBusinessGetCommand extends GraphCommand {
         return bookingBusinesses[0].id;
     }
 }
-_BookingBusinessGetCommand_instances = new WeakSet(), _BookingBusinessGetCommand_initTelemetry = function _BookingBusinessGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined'
-        });
-    });
-}, _BookingBusinessGetCommand_initOptions = function _BookingBusinessGetCommand_initOptions() {
-    this.options.unshift({ option: '-i, --id [id]' }, { option: '-n, --name [name]' });
-}, _BookingBusinessGetCommand_initOptionSets = function _BookingBusinessGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
-};
 export default new BookingBusinessGetCommand();
 //# sourceMappingURL=business-get.js.map

package/dist/m365/cli/commands/app/app-reconsent.js

@@ -0,0 +1,103 @@
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import auth from '../../../../Auth.js';
+import config from '../../../../config.js';
+import { urlUtil } from '../../../../utils/urlUtil.js';
+import request from '../../../../request.js';
+import { cli } from '../../../../cli/cli.js';
+import { settingsNames } from '../../../../settingsNames.js';
+import { browserUtil } from '../../../../utils/browserUtil.js';
+import { entraApp } from '../../../../utils/entraApp.js';
+import { entraServicePrincipal } from '../../../../utils/entraServicePrincipal.js';
+class CliAppReconsentCommand extends GraphCommand {
+    get name() {
+        return commands.APP_RECONSENT;
+    }
+    get description() {
+        return 'Reconsent all permission scopes used in CLI for Microsoft 365';
+    }
+    async commandAction(logger) {
+        try {
+            const appId = auth.connection.appId;
+            if (this.verbose) {
+                await logger.logToStderr(`Adding all missing permission scopes used in CLI for Microsoft 365 to application with ID '${appId}'...`);
+            }
+            const application = await entraApp.getAppRegistrationByAppId(appId, ['requiredResourceAccess', 'id']);
+            await this.addCliAppScopes(logger, application.requiredResourceAccess);
+            await this.updateAppScopes(logger, application.id, application.requiredResourceAccess);
+            const consentUrl = `https://login.microsoftonline.com/${auth.connection.tenant}/adminconsent?client_id=${appId}`;
+            await logger.log(`To consent to the new scopes for your Microsoft Entra application registration, please navigate to the following URL: ${consentUrl}`);
+            if (cli.getSettingWithDefaultValue(settingsNames.autoOpenLinksInBrowser, false)) {
+                await browserUtil.open(consentUrl);
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async addCliAppScopes(logger, appScopes) {
+        const allCliScopes = config.allScopes;
+        const servicePrincipals = await entraServicePrincipal.getServicePrincipals('displayName,appId,oauth2PermissionScopes,servicePrincipalNames');
+        if (this.verbose) {
+            await logger.logToStderr(`Verifying if all ${allCliScopes.length} permission scopes are present in the app registration...`);
+        }
+        for (const cliScope of allCliScopes) {
+            // Extract service principal name and scope from the URL string
+            const spName = urlUtil.removeTrailingSlashes(cliScope.substring(0, cliScope.lastIndexOf('/')));
+            const scopeName = cliScope.substring(cliScope.lastIndexOf('/') + 1);
+            // Find the matching service principal by name
+            const servicePrincipal = servicePrincipals.find(sp => sp.servicePrincipalNames?.some(name => urlUtil.removeTrailingSlashes(name).toLowerCase() === spName.toLowerCase()));
+            if (!servicePrincipal) {
+                if (this.verbose) {
+                    await logger.logToStderr(`Service principal with name '${spName}' not found. Skipping scope '${scopeName}'.`);
+                }
+                continue;
+            }
+            // Find the matching scope in the service principal
+            const scope = servicePrincipal.oauth2PermissionScopes?.find(s => s.value?.toLowerCase() === scopeName.toLowerCase());
+            if (!scope) {
+                if (this.verbose) {
+                    await logger.logToStderr(`Scope '${scopeName}' not found in service principal '${spName}'. Skipping scope...`);
+                }
+                continue;
+            }
+            // Check if the service principal is already present in the app registration
+            let appSp = appScopes.find(sp => sp.resourceAppId?.toLowerCase() === servicePrincipal.appId.toLowerCase());
+            if (!appSp) {
+                // Service principal is not present in the app registration, let's add it
+                appSp = {
+                    resourceAppId: servicePrincipal.appId,
+                    resourceAccess: []
+                };
+                appScopes.push(appSp);
+            }
+            // Check if the scope is already present in the app registration
+            const isAppScopePresent = appSp.resourceAccess.some(s => s.id?.toLowerCase() === scope.id.toLowerCase());
+            if (!isAppScopePresent) {
+                // Scope is not present in the app registration, let's add it
+                appSp.resourceAccess.push({
+                    id: scope.id,
+                    type: 'Scope'
+                });
+            }
+        }
+    }
+    async updateAppScopes(logger, appId, appScopes) {
+        if (this.verbose) {
+            await logger.logToStderr(`Updating permission scopes of application with ID '${appId}'...`);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/applications/${appId}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json',
+            data: {
+                requiredResourceAccess: appScopes
+            }
+        };
+        await request.patch(requestOptions);
+    }
+}
+export default new CliAppReconsentCommand();
+//# sourceMappingURL=app-reconsent.js.map

package/dist/m365/cli/commands.js

@@ -1,5 +1,6 @@
 const prefix = 'cli';
 export default {
+    APP_RECONSENT: `${prefix} app reconsent`,
     COMPLETION_CLINK_UPDATE: `${prefix} completion clink update`,
     COMPLETION_PWSH_SETUP: `${prefix} completion pwsh setup`,
     COMPLETION_PWSH_UPDATE: `${prefix} completion pwsh update`,

package/dist/m365/context/commands/context-remove.js

@@ -1,14 +1,15 @@
-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 _ContextRemoveCommand_instances, _ContextRemoveCommand_initTelemetry, _ContextRemoveCommand_initOptions;
 import fs from 'fs';
+import { z } from 'zod';
 import { cli } from '../../../cli/cli.js';
-import { CommandError } from '../../../Command.js';
+import { CommandError, globalOptionsZod } from '../../../Command.js';
+import { zod } from '../../../utils/zod.js';
 import AnonymousCommand from '../../base/AnonymousCommand.js';
 import commands from '../commands.js';
+const options = globalOptionsZod
+    .extend({
+    force: zod.alias('f', z.boolean().optional())
+})
+    .strict();
 class ContextRemoveCommand extends AnonymousCommand {
     get name() {
         return commands.REMOVE;
@@ -16,20 +17,17 @@ class ContextRemoveCommand extends AnonymousCommand {
     get description() {
         return 'Removes the CLI for Microsoft 365 context in the current working folder';
     }
-    constructor() {
-        super();
-        _ContextRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _ContextRemoveCommand_instances, "m", _ContextRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _ContextRemoveCommand_instances, "m", _ContextRemoveCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (args.options.force) {
-            await this.removeContext();
+            this.removeContext();
         }
         else {
             const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the context?` });
             if (result) {
-                await this.removeContext();
+                this.removeContext();
             }
         }
     }
@@ -70,16 +68,5 @@ class ContextRemoveCommand extends AnonymousCommand {
         }
     }
 }
-_ContextRemoveCommand_instances = new WeakSet(), _ContextRemoveCommand_initTelemetry = function _ContextRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: !!args.options.force
-        });
-    });
-}, _ContextRemoveCommand_initOptions = function _ContextRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-f, --force'
-    });
-};
 export default new ContextRemoveCommand();
 //# sourceMappingURL=context-remove.js.map