@pnp/cli-microsoft365 8.1.0-beta.3dec9fa → 8.1.0-beta.96dc207

package/dist/Auth.js

@@ -1,31 +1,30 @@
 import { AzureCloudInstance } from '@azure/msal-common';
+import assert from 'assert';
 import { CommandError } from './Command.js';
 import { FileTokenStorage } from './auth/FileTokenStorage.js';
 import { msalCachePlugin } from './auth/msalCachePlugin.js';
 import { cli } from './cli/cli.js';
-import config from './config.js';
 import request from './request.js';
 import { settingsNames } from './settingsNames.js';
-import { browserUtil } from './utils/browserUtil.js';
 import * as accessTokenUtil from './utils/accessToken.js';
-import assert from 'assert';
+import { browserUtil } from './utils/browserUtil.js';
 export var CloudType;
 (function (CloudType) {
-    CloudType[CloudType["Public"] = 0] = "Public";
-    CloudType[CloudType["USGov"] = 1] = "USGov";
-    CloudType[CloudType["USGovHigh"] = 2] = "USGovHigh";
-    CloudType[CloudType["USGovDoD"] = 3] = "USGovDoD";
-    CloudType[CloudType["China"] = 4] = "China";
+    CloudType["Public"] = "Public";
+    CloudType["USGov"] = "USGov";
+    CloudType["USGovHigh"] = "USGovHigh";
+    CloudType["USGovDoD"] = "USGovDoD";
+    CloudType["China"] = "China";
 })(CloudType || (CloudType = {}));
 export class Connection {
     constructor() {
         this.active = false;
         this.authType = AuthType.DeviceCode;
         this.certificateType = CertificateType.Unknown;
+        // ID of the tenant where the Microsoft Entra app is registered; common if multi-tenant
+        this.tenant = 'common';
         this.cloudType = CloudType.Public;
         this.accessTokens = {};
-        this.appId = config.cliEntraAppId;
-        this.tenant = config.tenant;
         this.cloudType = CloudType.Public;
     }
     deactivate() {
@@ -44,18 +43,18 @@ export class Connection {
         this.thumbprint = undefined;
         this.spoUrl = undefined;
         this.spoTenantId = undefined;
-        this.appId = config.cliEntraAppId;
-        this.tenant = config.tenant;
+        this.appId = cli.getClientId();
+        this.tenant = cli.getTenant();
     }
 }
 export var AuthType;
 (function (AuthType) {
-    AuthType[AuthType["DeviceCode"] = 0] = "DeviceCode";
-    AuthType[AuthType["Password"] = 1] = "Password";
-    AuthType[AuthType["Certificate"] = 2] = "Certificate";
-    AuthType[AuthType["Identity"] = 3] = "Identity";
-    AuthType[AuthType["Browser"] = 4] = "Browser";
-    AuthType[AuthType["Secret"] = 5] = "Secret";
+    AuthType["DeviceCode"] = "deviceCode";
+    AuthType["Password"] = "password";
+    AuthType["Certificate"] = "certificate";
+    AuthType["Identity"] = "identity";
+    AuthType["Browser"] = "browser";
+    AuthType["Secret"] = "secret";
 })(AuthType || (AuthType = {}));
 export var CertificateType;
 (function (CertificateType) {
@@ -691,7 +690,7 @@ export class Auth {
         const allConnections = await this.getAllConnections();
         const connection = allConnections.find(i => i.name === name);
         if (!connection) {
-            throw new CommandError(`The connection '${name}' cannot be found`);
+            throw new CommandError(`The connection '${name}' cannot be found.`);
         }
         return connection;
     }
@@ -702,7 +701,7 @@ export class Auth {
         const details = {
             connectionName: connection.name,
             connectedAs: connection.identityName,
-            authType: AuthType[connection.authType],
+            authType: connection.authType,
             appId: connection.appId,
             appTenant: connection.tenant,
             cloudType: CloudType[connection.cloudType]
@@ -710,7 +709,7 @@ export class Auth {
         return details;
     }
 }
-Auth.cloudEndpoints = [];
+Auth.cloudEndpoints = {};
 Auth.initialize();
 export default new Auth();
 //# sourceMappingURL=Auth.js.map

package/dist/Command.js

@@ -5,6 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _Command_instances, _Command_initTelemetry, _Command_initOptions, _Command_initValidators;
 import os from 'os';
+import { z } from 'zod';
 import auth from './Auth.js';
 import { cli } from './cli/cli.js';
 import request from './request.js';
@@ -13,6 +14,7 @@ import { telemetry } from './telemetry.js';
 import { accessToken } from './utils/accessToken.js';
 import { md } from './utils/md.js';
 import { prompt } from './utils/prompt.js';
+import { zod } from './utils/zod.js';
 export class CommandError {
     constructor(message, code) {
         this.message = message;
@@ -25,10 +27,26 @@ export class CommandErrorWithOutput {
         this.stderr = stderr;
     }
 }
+export const globalOptionsZod = z.object({
+    query: z.string().optional(),
+    output: zod.alias('o', z.enum(['csv', 'json', 'md', 'text', 'none']).optional()),
+    debug: z.boolean().default(false),
+    verbose: z.boolean().default(false)
+});
 class Command {
     get allowedOutputs() {
         return ['csv', 'json', 'md', 'text', 'none'];
     }
+    get schema() {
+        return undefined;
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    getRefinedSchema(schema) {
+        return undefined;
+    }
+    getSchemaToParse() {
+        return this.getRefinedSchema(this.schema) ?? this.schema;
+    }
     constructor() {
         // These functions must be defined with # so that they're truly private
         // otherwise you'll get a ts2415 error (Types have separate declarations of
@@ -48,6 +66,9 @@ class Command {
             string: []
         };
         this.validators = [];
+        // metadata for command's options
+        // used for building telemetry
+        this.optionsInfo = [];
         __classPrivateFieldGet(this, _Command_instances, "m", _Command_initTelemetry).call(this);
         __classPrivateFieldGet(this, _Command_instances, "m", _Command_initOptions).call(this);
         __classPrivateFieldGet(this, _Command_instances, "m", _Command_initValidators).call(this);
@@ -90,9 +111,7 @@ class Command {
                 prompted = true;
                 await cli.error('🌶️  Provide values for the following parameters:');
             }
-            const answer = optionInfo.autocomplete !== undefined
-                ? await prompt.forSelection({ message: `${optionInfo.name}: `, choices: optionInfo.autocomplete.map((choice) => { return { name: choice, value: choice }; }) })
-                : await prompt.forInput({ message: `${optionInfo.name}: ` });
+            const answer = await cli.promptForValue(optionInfo);
             args.options[optionInfo.name] = answer;
         }
         if (prompted) {
@@ -410,8 +429,34 @@ class Command {
         return '';
     }
     getTelemetryProperties(args) {
-        this.telemetry.forEach(t => t(args));
-        return this.telemetryProperties;
+        if (this.schema) {
+            const telemetryProperties = {};
+            this.optionsInfo.forEach(o => {
+                if (o.required) {
+                    return;
+                }
+                if (typeof args.options[o.name] === 'undefined') {
+                    return;
+                }
+                switch (o.type) {
+                    case 'string':
+                        telemetryProperties[o.name] = o.autocomplete ? args.options[o.name] : typeof args.options[o.name] !== 'undefined';
+                        break;
+                    case 'boolean':
+                        telemetryProperties[o.name] = args.options[o.name];
+                        break;
+                    case 'number':
+                        telemetryProperties[o.name] = typeof args.options[o.name] !== 'undefined';
+                        break;
+                }
+                ;
+            });
+            return telemetryProperties;
+        }
+        else {
+            this.telemetry.forEach(t => t(args));
+            return this.telemetryProperties;
+        }
     }
     async getTextOutput(logStatement) {
         // display object as a list of key-value pairs

package/dist/cli/cli.js

@@ -1,22 +1,24 @@
 import Configstore from 'configstore';
 import fs from 'fs';
-import minimist from 'minimist';
 import { createRequire } from 'module';
 import os from 'os';
 import path from 'path';
 import { fileURLToPath, pathToFileURL } from 'url';
+import yargs from 'yargs-parser';
+import { ZodError } from 'zod';
 import Command, { CommandError } from '../Command.js';
 import config from '../config.js';
 import request from '../request.js';
 import { settingsNames } from '../settingsNames.js';
 import { telemetry } from '../telemetry.js';
 import { app } from '../utils/app.js';
+import { browserUtil } from '../utils/browserUtil.js';
 import { formatting } from '../utils/formatting.js';
 import { md } from '../utils/md.js';
-import { validation } from '../utils/validation.js';
 import { prompt } from '../utils/prompt.js';
+import { validation } from '../utils/validation.js';
+import { zod } from '../utils/zod.js';
 import { timings } from './timings.js';
-import { browserUtil } from '../utils/browserUtil.js';
 const require = createRequire(import.meta.url);
 const __dirname = fileURLToPath(new URL('.', import.meta.url));
 let _config;
@@ -34,6 +36,14 @@ const defaultHelpMode = 'options';
 const defaultHelpTarget = 'console';
 const helpModes = ['options', 'examples', 'remarks', 'response', 'full'];
 const helpTargets = ['console', 'web'];
+const yargsConfiguration = {
+    'parse-numbers': true,
+    'strip-aliased': true,
+    'strip-dashed': true,
+    'dot-notation': false,
+    'boolean-negation': true,
+    'camel-case-expansion': false
+};
 function getConfig() {
     if (!_config) {
         _config = new Configstore(config.configstoreName);
@@ -49,6 +59,12 @@ function getSettingWithDefaultValue(settingName, defaultValue) {
         return configuredValue;
     }
 }
+function getClientId() {
+    return cli.getSettingWithDefaultValue(settingsNames.clientId, process.env.CLIMICROSOFT365_ENTRAAPPID || process.env.CLIMICROSOFT365_AADAPPID);
+}
+function getTenant() {
+    return cli.getSettingWithDefaultValue(settingsNames.tenantId, process.env.CLIMICROSOFT365_TENANT || 'common');
+}
 async function execute(rawArgs) {
     const start = process.hrtime.bigint();
     // for completion commands we also need information about commands' options
@@ -64,7 +80,7 @@ async function execute(rawArgs) {
         rawArgs.shift();
     }
     // parse args to see if a command has been specified
-    const parsedArgs = minimist(rawArgs);
+    const parsedArgs = yargs(rawArgs);
     // load command
     await cli.loadCommandFromArgs(parsedArgs._);
     if (cli.commandToExecute) {
@@ -77,8 +93,7 @@ async function execute(rawArgs) {
             };
         }
         catch (e) {
-            const optionsWithoutShorts = removeShortOptions({ options: parsedArgs });
-            return cli.closeWithError(e.message, optionsWithoutShorts, false);
+            return cli.closeWithError(e.message, { options: parsedArgs }, false);
         }
     }
     else {
@@ -126,18 +141,54 @@ async function execute(rawArgs) {
     if (cli.optionsFromArgs.options.output === undefined) {
         cli.optionsFromArgs.options.output = cli.getSettingWithDefaultValue(settingsNames.output, 'json');
     }
-    const startValidation = process.hrtime.bigint();
-    const validationResult = await cli.commandToExecute.command.validate(cli.optionsFromArgs, cli.commandToExecute);
-    const endValidation = process.hrtime.bigint();
-    timings.validation.push(Number(endValidation - startValidation));
-    if (validationResult !== true) {
-        return cli.closeWithError(validationResult, cli.optionsFromArgs, true);
+    let finalArgs = cli.optionsFromArgs.options;
+    if (cli.commandToExecute?.command.schema) {
+        while (true) {
+            const startValidation = process.hrtime.bigint();
+            const result = cli.commandToExecute.command.getSchemaToParse().safeParse(cli.optionsFromArgs.options);
+            const endValidation = process.hrtime.bigint();
+            timings.validation.push(Number(endValidation - startValidation));
+            if (result.success) {
+                finalArgs = result.data;
+                break;
+            }
+            else {
+                const hasNonRequiredErrors = result.error.errors.some(e => e.code !== 'invalid_type' || e.received !== 'undefined');
+                const shouldPrompt = cli.getSettingWithDefaultValue(settingsNames.prompt, true);
+                if (hasNonRequiredErrors === false &&
+                    shouldPrompt) {
+                    await cli.error('🌶️  Provide values for the following parameters:');
+                    for (const error of result.error.errors) {
+                        const optionInfo = cli.commandToExecute.options.find(o => o.name === error.path.join('.'));
+                        const answer = await cli.promptForValue(optionInfo);
+                        cli.optionsFromArgs.options[error.path.join('.')] = answer;
+                    }
+                }
+                else {
+                    result.error.errors.forEach(e => {
+                        if (e.code === 'invalid_type' &&
+                            e.received === 'undefined') {
+                            e.message = `Required option not specified`;
+                        }
+                    });
+                    return cli.closeWithError(result.error, cli.optionsFromArgs, true);
+                }
+            }
+        }
+    }
+    else {
+        const startValidation = process.hrtime.bigint();
+        const validationResult = await cli.commandToExecute.command.validate(cli.optionsFromArgs, cli.commandToExecute);
+        const endValidation = process.hrtime.bigint();
+        timings.validation.push(Number(endValidation - startValidation));
+        if (validationResult !== true) {
+            return cli.closeWithError(validationResult, cli.optionsFromArgs, true);
+        }
     }
-    cli.optionsFromArgs = removeShortOptions(cli.optionsFromArgs);
     const end = process.hrtime.bigint();
     timings.core.push(Number(end - start));
     try {
-        await cli.executeCommand(cli.commandToExecute.command, cli.optionsFromArgs);
+        await cli.executeCommand(cli.commandToExecute.command, { options: finalArgs });
         const endTotal = process.hrtime.bigint();
         timings.total.push(Number(endTotal - start));
         await printTimings(rawArgs);
@@ -347,12 +398,14 @@ async function loadCommandFromFile(commandFileUrl) {
     catch { }
 }
 function getCommandInfo(command, filePath = '', helpFilePath = '') {
+    const options = command.schema ? zod.schemaToOptions(command.schema) : getCommandOptions(command);
+    command.optionsInfo = options;
     return {
         aliases: command.alias(),
         name: command.name,
         description: command.description,
         command: command,
-        options: getCommandOptions(command),
+        options,
         defaultProperties: command.defaultProperties(),
         file: filePath,
         help: helpFilePath
@@ -387,36 +440,43 @@ function getCommandOptions(command) {
     return options;
 }
 function getCommandOptionsFromArgs(args, commandInfo) {
-    const minimistOptions = {
-        alias: {}
+    const yargsOptions = {
+        alias: {},
+        configuration: yargsConfiguration
     };
     let argsToParse = args;
     if (commandInfo) {
-        const commandTypes = commandInfo.command.types;
-        if (commandTypes) {
-            minimistOptions.string = commandTypes.string;
-            // minimist will parse unused boolean options to 'false' (unused options => options that are not included in the args)
-            // But in the CLI booleans are nullable. They can can be true, false or undefined.
-            // For this reason we only pass boolean types that are actually used as arg.
-            minimistOptions.boolean = commandTypes.boolean.filter(optionName => args.some(arg => `--${optionName}` === arg || `-${optionName}` === arg));
-        }
-        minimistOptions.alias = {};
+        if (commandInfo.command.schema) {
+            yargsOptions.string = commandInfo.options.filter(o => o.type === 'string').map(o => o.name);
+            yargsOptions.boolean = commandInfo.options.filter(o => o.type === 'boolean').map(o => o.name);
+            yargsOptions.number = commandInfo.options.filter(o => o.type === 'number').map(o => o.name);
+            argsToParse = getRewrittenArgs(args, yargsOptions.boolean);
+        }
+        else {
+            const commandTypes = commandInfo.command.types;
+            if (commandTypes) {
+                yargsOptions.string = commandTypes.string;
+                // minimist will parse unused boolean options to 'false' (unused options => options that are not included in the args)
+                // But in the CLI booleans are nullable. They can can be true, false or undefined.
+                // For this reason we only pass boolean types that are actually used as arg.
+                yargsOptions.boolean = commandTypes.boolean.filter(optionName => args.some(arg => `--${optionName}` === arg || `-${optionName}` === arg));
+            }
+            argsToParse = getRewrittenArgs(args, commandTypes.boolean);
+        }
         commandInfo.options.forEach(option => {
             if (option.short && option.long) {
-                minimistOptions.alias[option.short] = option.long;
+                yargsOptions.alias[option.long] = option.short;
             }
         });
-        argsToParse = getRewrittenArgs(args, commandTypes);
     }
-    return minimist(argsToParse, minimistOptions);
+    return yargs(argsToParse, yargsOptions);
 }
 /**
  * Rewrites arguments (if necessary) before passing them into minimist.
  * Currently only boolean values are checked and fixed.
  * Args are only checked and rewritten if the option has been added to the 'types.boolean' array.
  */
-function getRewrittenArgs(args, commandTypes) {
-    const booleanTypes = commandTypes.boolean;
+function getRewrittenArgs(args, booleanTypes) {
     if (booleanTypes.length === 0) {
         return args;
     }
@@ -722,6 +782,9 @@ async function closeWithError(error, args, showHelpIfEnabled = false) {
         return process.exit(exitCode);
     }
     let errorMessage = error instanceof CommandError ? error.message : error;
+    if (error instanceof ZodError) {
+        errorMessage = error.errors.map(e => `${e.path.join('.')}: ${e.message}`).join(os.EOL);
+    }
     if ((!args.options.output || args.options.output === 'json') &&
         !cli.getSettingWithDefaultValue(settingsNames.printErrorsAsPlainText, true)) {
         errorMessage = JSON.stringify({ error: errorMessage });
@@ -760,6 +823,16 @@ async function error(message, ...optionalParams) {
         console.error(message, ...optionalParams);
     }
 }
+async function promptForValue(optionInfo) {
+    return optionInfo.autocomplete !== undefined
+        ? await prompt.forSelection({
+            message: `${optionInfo.name}: `,
+            choices: optionInfo.autocomplete.map((choice) => {
+                return { name: choice, value: choice };
+            })
+        })
+        : await prompt.forInput({ message: `${optionInfo.name}: ` });
+}
 async function promptForSelection(config) {
     const answer = await prompt.forSelection(config);
     await cli.error('');
@@ -770,6 +843,11 @@ async function promptForConfirmation(config) {
     await cli.error('');
     return answer;
 }
+async function promptForInput(config) {
+    const answer = await prompt.forInput(config);
+    await cli.error('');
+    return answer;
+}
 async function handleMultipleResultsFound(message, values) {
     const prompt = cli.getSettingWithDefaultValue(settingsNames.prompt, true);
     if (!prompt) {
@@ -780,13 +858,6 @@ async function handleMultipleResultsFound(message, values) {
     const response = await cli.promptForSelection({ message: `Please choose one:`, choices });
     return values[response];
 }
-function removeShortOptions(args) {
-    const filteredArgs = JSON.parse(JSON.stringify(args));
-    const optionsToRemove = Object.getOwnPropertyNames(args.options)
-        .filter(option => option.length === 1 || option === '--');
-    optionsToRemove.forEach(option => delete filteredArgs.options[option]);
-    return filteredArgs;
-}
 function loadOptionValuesFromFiles(args) {
     const optionNames = Object.getOwnPropertyNames(args.options);
     optionNames.forEach(option => {
@@ -811,7 +882,9 @@ export const cli = {
     closeWithError,
     commands,
     commandToExecute,
+    getClientId,
     getConfig,
+    getTenant,
     currentCommandName,
     error,
     execute,
@@ -830,7 +903,10 @@ export const cli = {
     optionsFromArgs,
     printAvailableCommands,
     promptForConfirmation,
+    promptForInput,
     promptForSelection,
-    shouldTrimOutput
+    promptForValue,
+    shouldTrimOutput,
+    yargsConfiguration
 };
 //# sourceMappingURL=cli.js.map

package/dist/config.js

@@ -1,10 +1,65 @@
-import { app } from "./utils/app.js";
-const cliEntraAppId = '31359c7f-bd7e-475c-86db-fdb8c937548e';
+import { app } from './utils/app.js';
 export default {
+    allScopes: [
+        'https://graph.windows.net/Directory.AccessAsUser.All',
+        'https://management.azure.com/user_impersonation',
+        'https://admin.services.crm.dynamics.com/user_impersonation',
+        'https://graph.microsoft.com/AppCatalog.ReadWrite.All',
+        'https://graph.microsoft.com/AuditLog.Read.All',
+        'https://graph.microsoft.com/Bookings.Read.All',
+        'https://graph.microsoft.com/Calendars.Read',
+        'https://graph.microsoft.com/ChannelMember.ReadWrite.All',
+        'https://graph.microsoft.com/ChannelMessage.Read.All',
+        'https://graph.microsoft.com/ChannelMessage.ReadWrite',
+        'https://graph.microsoft.com/ChannelMessage.Send',
+        'https://graph.microsoft.com/ChannelSettings.ReadWrite.All',
+        'https://graph.microsoft.com/Chat.ReadWrite',
+        'https://graph.microsoft.com/Directory.AccessAsUser.All',
+        '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/Group.ReadWrite.All',
+        'https://graph.microsoft.com/IdentityProvider.ReadWrite.All',
+        'https://graph.microsoft.com/InformationProtectionPolicy.Read',
+        'https://graph.microsoft.com/Mail.Read.Shared',
+        'https://graph.microsoft.com/Mail.ReadWrite',
+        'https://graph.microsoft.com/Mail.Send',
+        'https://graph.microsoft.com/Notes.ReadWrite.All',
+        'https://graph.microsoft.com/OnlineMeetingArtifact.Read.All',
+        'https://graph.microsoft.com/OnlineMeetings.ReadWrite',
+        'https://graph.microsoft.com/OnlineMeetingTranscript.Read.All',
+        'https://graph.microsoft.com/PeopleSettings.ReadWrite.All',
+        'https://graph.microsoft.com/Place.Read.All',
+        'https://graph.microsoft.com/Policy.Read.All',
+        'https://graph.microsoft.com/RecordsManagement.ReadWrite.All',
+        'https://graph.microsoft.com/Reports.Read.All',
+        'https://graph.microsoft.com/RoleAssignmentSchedule.ReadWrite.Directory',
+        'https://graph.microsoft.com/RoleEligibilitySchedule.Read.Directory',
+        'https://graph.microsoft.com/SecurityEvents.Read.All',
+        'https://graph.microsoft.com/ServiceHealth.Read.All',
+        'https://graph.microsoft.com/ServiceMessage.Read.All',
+        'https://graph.microsoft.com/ServiceMessageViewpoint.Write',
+        'https://graph.microsoft.com/Sites.Read.All',
+        'https://graph.microsoft.com/Tasks.ReadWrite',
+        'https://graph.microsoft.com/Team.Create',
+        'https://graph.microsoft.com/TeamMember.ReadWrite.All',
+        'https://graph.microsoft.com/TeamsAppInstallation.ReadWriteForUser',
+        'https://graph.microsoft.com/TeamSettings.ReadWrite.All',
+        'https://graph.microsoft.com/TeamsTab.ReadWrite.All',
+        'https://graph.microsoft.com/User.Invite.All',
+        'https://manage.office.com/ActivityFeed.Read',
+        'https://manage.office.com/ServiceHealth.Read',
+        'https://analysis.windows.net/powerbi/api/Dataset.Read.All',
+        'https://api.powerapps.com//User',
+        'https://microsoft.sharepoint-df.com/AllSites.FullControl',
+        'https://microsoft.sharepoint-df.com/TermStore.ReadWrite.All',
+        'https://microsoft.sharepoint-df.com/User.ReadWrite.All'
+    ],
     applicationName: `CLI for Microsoft 365 v${app.packageJson().version}`,
     delimiter: 'm365\$',
-    cliEntraAppId: process.env.CLIMICROSOFT365_ENTRAAPPID || process.env.CLIMICROSOFT365_AADAPPID || cliEntraAppId,
-    tenant: process.env.CLIMICROSOFT365_TENANT || 'common',
-    configstoreName: 'cli-m365-config'
+    configstoreName: 'cli-m365-config',
+    minimalScopes: [
+        'https://graph.microsoft.com/User.Read'
+    ]
 };
 //# sourceMappingURL=config.js.map

package/dist/m365/base/SpoCommand.js

@@ -94,7 +94,7 @@ export default class SpoCommand extends Command {
         catch (error) {
             throw new CommandError(error);
         }
-        if (auth.connection.active && AuthType[auth.connection.authType] === AuthType[AuthType.Secret]) {
+        if (auth.connection.active && auth.connection.authType === AuthType.Secret) {
             throw new CommandError(`SharePoint does not support authentication using client ID and secret. Please use a different login type to use SharePoint commands.`);
         }
         await super.action(logger, args);

package/dist/m365/cli/commands/cli-consent.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 _CliConsentCommand_instances, _CliConsentCommand_initTelemetry, _CliConsentCommand_initOptions, _CliConsentCommand_initValidators;
-import config from '../../../config.js';
+import { cli } from '../../../cli/cli.js';
 import AnonymousCommand from '../../base/AnonymousCommand.js';
 import commands from '../commands.js';
 class CliConsentCommand extends AnonymousCommand {
@@ -30,7 +30,7 @@ class CliConsentCommand extends AnonymousCommand {
                 scope = 'https://api.yammer.com/user_impersonation';
                 break;
         }
-        await logger.log(`To consent permissions for executing ${args.options.service} commands, navigate in your web browser to https://login.microsoftonline.com/${config.tenant}/oauth2/v2.0/authorize?client_id=${config.cliEntraAppId}&response_type=code&scope=${encodeURIComponent(scope)}`);
+        await logger.log(`To consent permissions for executing ${args.options.service} commands, navigate in your web browser to https://login.microsoftonline.com/${cli.getTenant()}/oauth2/v2.0/authorize?client_id=${cli.getClientId()}&response_type=code&scope=${encodeURIComponent(scope)}`);
     }
     async action(logger, args) {
         await this.initAction(args, logger);

package/dist/m365/cli/commands/cli-doctor.js

@@ -1,5 +1,5 @@
 import os from 'os';
-import auth, { AuthType } from '../../../Auth.js';
+import auth from '../../../Auth.js';
 import { cli } from '../../../cli/cli.js';
 import Command from '../../../Command.js';
 import { app } from '../../../utils/app.js';
@@ -33,7 +33,7 @@ class CliDoctorCommand extends Command {
             nodeVersion: process.version,
             cliAadAppId: auth.connection.appId,
             cliAadAppTenant: validation.isValidGuid(auth.connection.tenant) ? 'single' : auth.connection.tenant,
-            authMode: AuthType[auth.connection.authType],
+            authMode: auth.connection.authType,
             cliEnvironment: process.env.CLIMICROSOFT365_ENV ? process.env.CLIMICROSOFT365_ENV : '',
             cliConfig: cli.getConfig().all,
             roles: roles,

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

@@ -1,5 +1,4 @@
 import { cli } from '../../../cli/cli.js';
-import config from '../../../config.js';
 import { settingsNames } from '../../../settingsNames.js';
 import { browserUtil } from '../../../utils/browserUtil.js';
 import AnonymousCommand from '../../base/AnonymousCommand.js';
@@ -12,9 +11,9 @@ class CliReconsentCommand extends AnonymousCommand {
         return 'Returns URL to open in the browser to re-consent CLI for Microsoft 365 Microsoft Entra permissions';
     }
     async commandAction(logger) {
-        const url = `https://login.microsoftonline.com/${config.tenant}/oauth2/authorize?client_id=${config.cliEntraAppId}&response_type=code&prompt=admin_consent`;
+        const url = `https://login.microsoftonline.com/${cli.getTenant()}/oauth2/authorize?client_id=${cli.getClientId()}&response_type=code&prompt=admin_consent`;
         if (cli.getSettingWithDefaultValue(settingsNames.autoOpenLinksInBrowser, false) === false) {
-            await logger.log(`To re-consent the PnP Microsoft 365 Management Shell Microsoft Entra application navigate in your web browser to ${url}`);
+            await logger.log(`To re-consent your Microsoft Entra application, navigate in your web browser to ${url}.`);
             return;
         }
         await logger.log(`Opening the following page in your browser: ${url}`);

package/dist/m365/cli/commands/config/config-set.js

@@ -4,8 +4,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _CliConfigSetCommand_instances, _a, _CliConfigSetCommand_initTelemetry, _CliConfigSetCommand_initOptions, _CliConfigSetCommand_initValidators;
+import { AuthType } from "../../../../Auth.js";
 import { cli } from "../../../../cli/cli.js";
 import { settingsNames } from "../../../../settingsNames.js";
+import { validation } from "../../../../utils/validation.js";
 import AnonymousCommand from "../../../base/AnonymousCommand.js";
 import commands from "../../commands.js";
 class CliConfigSetCommand extends AnonymousCommand {
@@ -82,15 +84,22 @@ _a = CliConfigSetCommand, _CliConfigSetCommand_instances = new WeakSet(), _CliCo
             cli.helpModes.indexOf(args.options.value) === -1) {
             return `${args.options.value} is not a valid value for the option ${args.options.key}. Allowed values: ${cli.helpModes.join(', ')}`;
         }
-        const allowedAuthTypes = ['certificate', 'deviceCode', 'password', 'identity', 'browser', 'secret'];
         if (args.options.key === settingsNames.authType &&
-            allowedAuthTypes.indexOf(args.options.value) === -1) {
-            return `${args.options.value} is not a valid value for the option ${args.options.key}. Allowed values: ${allowedAuthTypes.join(', ')}`;
+            !Object.values(AuthType).map(String).includes(args.options.value)) {
+            return `${args.options.value} is not a valid value for the option ${args.options.key}. Allowed values: ${Object.values(AuthType).join(', ')}`;
         }
         if (args.options.key === settingsNames.helpTarget &&
             !cli.helpTargets.includes(args.options.value)) {
             return `${args.options.value} is not a valid value for the option ${args.options.key}. Allowed values: ${cli.helpTargets.join(', ')}`;
         }
+        if (args.options.key === settingsNames.clientId &&
+            !validation.isValidGuid(args.options.value)) {
+            return `${args.options.value} is not a valid value for the option ${args.options.key}. The value has to be a valid GUID.`;
+        }
+        if (args.options.key === settingsNames.tenantId &&
+            !(args.options.value === 'common' || validation.isValidGuid(args.options.value))) {
+            return `${args.options.value} is not a valid value for the option ${args.options.key}. The value has to be a valid GUID or 'common'.`;
+        }
         return true;
     });
 };