@pnp/cli-microsoft365 8.0.0-beta.e6f9331 → 8.1.0-beta.309a9b8

package/dist/m365/commands/login.js

@@ -1,17 +1,30 @@
-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 _LoginCommand_instances, _a, _LoginCommand_initTelemetry, _LoginCommand_initOptions, _LoginCommand_initValidators;
 import fs from 'fs';
+import { z } from 'zod';
 import auth, { AuthType, CloudType } from '../../Auth.js';
-import Command, { CommandError } from '../../Command.js';
+import Command, { CommandError, globalOptionsZod } from '../../Command.js';
+import { cli } from '../../cli/cli.js';
 import config from '../../config.js';
-import { misc } from '../../utils/misc.js';
-import commands from './commands.js';
 import { settingsNames } from '../../settingsNames.js';
-import { cli } from '../../cli/cli.js';
+import { zod } from '../../utils/zod.js';
+import commands from './commands.js';
+const options = globalOptionsZod
+    .extend({
+    authType: zod.alias('t', z.enum(['certificate', 'deviceCode', 'password', 'identity', 'browser', 'secret']).optional()),
+    cloud: z.nativeEnum(CloudType).optional().default(CloudType.Public),
+    userName: zod.alias('u', z.string().optional()),
+    password: zod.alias('p', z.string().optional()),
+    certificateFile: zod.alias('c', z.string().optional()
+        .refine(filePath => !filePath || fs.existsSync(filePath), filePath => ({
+        message: `Certificate file ${filePath} does not exist`
+    }))),
+    certificateBase64Encoded: z.string().optional(),
+    thumbprint: z.string().optional(),
+    appId: z.string().optional(),
+    tenant: z.string().optional(),
+    secret: zod.alias('s', z.string().optional()),
+    connectionName: z.string().optional()
+})
+    .strict();
 class LoginCommand extends Command {
     get name() {
         return commands.LOGIN;
@@ -19,12 +32,31 @@ class LoginCommand extends Command {
     get description() {
         return 'Log in to Microsoft 365';
     }
-    constructor() {
-        super();
-        _LoginCommand_instances.add(this);
-        __classPrivateFieldGet(this, _LoginCommand_instances, "m", _LoginCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _LoginCommand_instances, "m", _LoginCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _LoginCommand_instances, "m", _LoginCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => options.authType !== 'password' || options.userName, {
+            message: 'Username is required when using password authentication',
+            path: ['userName']
+        })
+            .refine(options => options.authType !== 'password' || options.password, {
+            message: 'Password is required when using password authentication',
+            path: ['password']
+        })
+            .refine(options => options.authType !== 'certificate' || !(options.certificateFile && options.certificateBase64Encoded), {
+            message: 'Specify either certificateFile or certificateBase64Encoded, but not both.',
+            path: ['certificateBase64Encoded']
+        })
+            .refine(options => options.authType !== 'certificate' || options.certificateFile || options.certificateBase64Encoded, {
+            message: 'Specify either certificateFile or certificateBase64Encoded',
+            path: ['certificateFile']
+        })
+            .refine(options => options.authType !== 'secret' || options.secret, {
+            message: 'Secret is required when using secret authentication',
+            path: ['secret']
+        });
     }
     async commandAction(logger, args) {
         // disconnect before re-connecting
@@ -64,12 +96,7 @@ class LoginCommand extends Command {
                     auth.connection.secret = args.options.secret;
                     break;
             }
-            if (args.options.cloud) {
-                auth.connection.cloudType = CloudType[args.options.cloud];
-            }
-            else {
-                auth.connection.cloudType = CloudType.Public;
-            }
+            auth.connection.cloudType = args.options.cloud;
             try {
                 await auth.ensureAccessToken(auth.defaultResource, logger, this.debug);
                 auth.connection.active = true;
@@ -102,79 +129,5 @@ class LoginCommand extends Command {
         await this.commandAction(logger, args);
     }
 }
-_a = LoginCommand, _LoginCommand_instances = new WeakSet(), _LoginCommand_initTelemetry = function _LoginCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            authType: args.options.authType || cli.getSettingWithDefaultValue(settingsNames.authType, 'deviceCode'),
-            cloud: args.options.cloud ?? CloudType.Public
-        });
-    });
-}, _LoginCommand_initOptions = function _LoginCommand_initOptions() {
-    this.options.unshift({
-        option: '-t, --authType [authType]',
-        autocomplete: _a.allowedAuthTypes
-    }, {
-        option: '-u, --userName [userName]'
-    }, {
-        option: '-p, --password [password]'
-    }, {
-        option: '-c, --certificateFile [certificateFile]'
-    }, {
-        option: '--certificateBase64Encoded [certificateBase64Encoded]'
-    }, {
-        option: '--thumbprint [thumbprint]'
-    }, {
-        option: '--appId [appId]'
-    }, {
-        option: '--tenant [tenant]'
-    }, {
-        option: '-s, --secret [secret]'
-    }, {
-        option: '--cloud [cloud]',
-        autocomplete: misc.getEnums(CloudType)
-    }, {
-        option: '--connectionName [connectionName]'
-    });
-}, _LoginCommand_initValidators = function _LoginCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const authType = args.options.authType || cli.getSettingWithDefaultValue(settingsNames.authType, 'deviceCode');
-        if (authType === 'password') {
-            if (!args.options.userName) {
-                return 'Required option userName missing';
-            }
-            if (!args.options.password) {
-                return 'Required option password missing';
-            }
-        }
-        if (authType === 'certificate') {
-            if (args.options.certificateFile && args.options.certificateBase64Encoded) {
-                return 'Specify either certificateFile or certificateBase64Encoded, but not both.';
-            }
-            if (!args.options.certificateFile && !args.options.certificateBase64Encoded) {
-                return 'Specify either certificateFile or certificateBase64Encoded';
-            }
-            if (args.options.certificateFile) {
-                if (!fs.existsSync(args.options.certificateFile)) {
-                    return `File '${args.options.certificateFile}' does not exist`;
-                }
-            }
-        }
-        if (authType &&
-            _a.allowedAuthTypes.indexOf(authType) < 0) {
-            return `'${authType}' is not a valid authentication type. Allowed authentication types are ${_a.allowedAuthTypes.join(', ')}`;
-        }
-        if (authType === 'secret') {
-            if (!args.options.secret) {
-                return 'Required option secret missing';
-            }
-        }
-        if (args.options.cloud &&
-            typeof CloudType[args.options.cloud] === 'undefined') {
-            return `${args.options.cloud} is not a valid value for cloud. Valid options are ${misc.getEnums(CloudType).join(', ')}`;
-        }
-        return true;
-    });
-};
-LoginCommand.allowedAuthTypes = ['certificate', 'deviceCode', 'password', 'identity', 'browser', 'secret'];
 export default new LoginCommand();
 //# sourceMappingURL=login.js.map

package/dist/m365/commands/setup.js

@@ -42,8 +42,6 @@ class SetupCommand extends AnonymousCommand {
             await this.configureSettings(settings, true, logger);
             return;
         }
-        // stop the spinner. Fixes #5598
-        cli.spinner.stop();
         await logger.logToStderr(`Welcome to the CLI for Microsoft 365 setup!`);
         await logger.logToStderr(`This command will guide you through the process of configuring the CLI for your needs.`);
         await logger.logToStderr(`Please, answer the following questions and we'll define a set of settings to best match how you intend to use the CLI.`);
@@ -85,8 +83,6 @@ class SetupCommand extends AnonymousCommand {
             await logger.logToStderr('');
             await logger.logToStderr('Configuring settings...');
             await logger.logToStderr('');
-            // start the spinner. Fixes #5598
-            cli.spinner.start();
             await this.configureSettings(settings, false, logger);
             if (!this.verbose) {
                 await logger.logToStderr('');

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

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _ConnectionRemoveCommand_instances, _ConnectionRemoveCommand_initTelemetry, _ConnectionRemoveCommand_initOptions;
+var _ConnectionRemoveCommand_instances, _ConnectionRemoveCommand_initTelemetry, _ConnectionRemoveCommand_initOptions, _ConnectionRemoveCommand_initTypes;
 import auth from '../../../Auth.js';
 import commands from '../commands.js';
 import Command, { CommandError } from '../../../Command.js';
@@ -20,6 +20,7 @@ class ConnectionRemoveCommand extends Command {
         _ConnectionRemoveCommand_instances.add(this);
         __classPrivateFieldGet(this, _ConnectionRemoveCommand_instances, "m", _ConnectionRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _ConnectionRemoveCommand_instances, "m", _ConnectionRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _ConnectionRemoveCommand_instances, "m", _ConnectionRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         const deleteConnection = async () => {
@@ -53,7 +54,7 @@ class ConnectionRemoveCommand extends Command {
 _ConnectionRemoveCommand_instances = new WeakSet(), _ConnectionRemoveCommand_initTelemetry = function _ConnectionRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            force: (!(!args.options.force)).toString()
+            force: !!args.options.force
         });
     });
 }, _ConnectionRemoveCommand_initOptions = function _ConnectionRemoveCommand_initOptions() {
@@ -62,6 +63,9 @@ _ConnectionRemoveCommand_instances = new WeakSet(), _ConnectionRemoveCommand_ini
     }, {
         option: '-f, --force'
     });
+}, _ConnectionRemoveCommand_initTypes = function _ConnectionRemoveCommand_initTypes() {
+    this.types.string.push('name');
+    this.types.boolean.push('force');
 };
 export default new ConnectionRemoveCommand();
 //# sourceMappingURL=connection-remove.js.map

package/dist/m365/connection/commands/connection-set.js

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _ConnectionSetCommand_instances, _ConnectionSetCommand_initOptions, _ConnectionSetCommand_initValidators;
+var _ConnectionSetCommand_instances, _ConnectionSetCommand_initOptions, _ConnectionSetCommand_initValidators, _ConnectionSetCommand_initTypes;
 import auth from '../../../Auth.js';
 import commands from '../commands.js';
 import Command, { CommandError } from '../../../Command.js';
@@ -19,6 +19,7 @@ class ConnectionSetCommand extends Command {
         _ConnectionSetCommand_instances.add(this);
         __classPrivateFieldGet(this, _ConnectionSetCommand_instances, "m", _ConnectionSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _ConnectionSetCommand_instances, "m", _ConnectionSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _ConnectionSetCommand_instances, "m", _ConnectionSetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         const connection = await auth.getConnection(args.options.name);
@@ -51,6 +52,8 @@ _ConnectionSetCommand_instances = new WeakSet(), _ConnectionSetCommand_initOptio
         }
         return true;
     });
+}, _ConnectionSetCommand_initTypes = function _ConnectionSetCommand_initTypes() {
+    this.types.string.push('name', 'newName');
 };
 export default new ConnectionSetCommand();
 //# sourceMappingURL=connection-set.js.map

package/dist/m365/connection/commands/connection-use.js

@@ -3,10 +3,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _ConnectionUseCommand_instances, _ConnectionUseCommand_initOptions;
+var _ConnectionUseCommand_instances, _ConnectionUseCommand_initTelemetry, _ConnectionUseCommand_initOptions, _ConnectionUseCommand_initTypes;
 import auth from '../../../Auth.js';
 import commands from '../commands.js';
 import Command, { CommandError } from '../../../Command.js';
+import { formatting } from '../../../utils/formatting.js';
+import { cli } from '../../../cli/cli.js';
 class ConnectionUseCommand extends Command {
     get name() {
         return commands.USE;
@@ -18,9 +20,20 @@ class ConnectionUseCommand extends Command {
         super();
         _ConnectionUseCommand_instances.add(this);
         __classPrivateFieldGet(this, _ConnectionUseCommand_instances, "m", _ConnectionUseCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _ConnectionUseCommand_instances, "m", _ConnectionUseCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _ConnectionUseCommand_instances, "m", _ConnectionUseCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        const connection = await auth.getConnection(args.options.name);
+        let connection;
+        if (args.options.name) {
+            connection = await auth.getConnection(args.options.name);
+        }
+        else {
+            const connections = await auth.getAllConnections();
+            connections.sort((a, b) => a.name.localeCompare(b.name));
+            const keyValuePair = formatting.convertArrayToHashTable('name', connections);
+            connection = await cli.handleMultipleResultsFound('Please select the connection you want to activate.', keyValuePair);
+        }
         if (this.verbose) {
             await logger.logToStderr(`Switching to connection '${connection.identityName}', appId: ${connection.appId}, tenantId: ${connection.identityTenantId}...`);
         }
@@ -42,10 +55,18 @@ class ConnectionUseCommand extends Command {
         await this.commandAction(logger, args);
     }
 }
-_ConnectionUseCommand_instances = new WeakSet(), _ConnectionUseCommand_initOptions = function _ConnectionUseCommand_initOptions() {
+_ConnectionUseCommand_instances = new WeakSet(), _ConnectionUseCommand_initTelemetry = function _ConnectionUseCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            name: typeof args.options.name !== 'undefined'
+        });
+    });
+}, _ConnectionUseCommand_initOptions = function _ConnectionUseCommand_initOptions() {
     this.options.unshift({
-        option: '-n, --name <name>'
+        option: '-n, --name [name]'
     });
+}, _ConnectionUseCommand_initTypes = function _ConnectionUseCommand_initTypes() {
+    this.types.string.push('name');
 };
 export default new ConnectionUseCommand();
 //# sourceMappingURL=connection-use.js.map

package/dist/m365/entra/commands/enterpriseapp/enterpriseapp-remove.js

@@ -0,0 +1,123 @@
+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 _EntraEnterpriseAppRemoveCommand_instances, _EntraEnterpriseAppRemoveCommand_initTelemetry, _EntraEnterpriseAppRemoveCommand_initOptions, _EntraEnterpriseAppRemoveCommand_initValidators, _EntraEnterpriseAppRemoveCommand_initOptionSets, _EntraEnterpriseAppRemoveCommand_initTypes;
+import { cli } from '../../../../cli/cli.js';
+import request from '../../../../request.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';
+class EntraEnterpriseAppRemoveCommand extends GraphCommand {
+    get name() {
+        return commands.ENTERPRISEAPP_REMOVE;
+    }
+    get description() {
+        return 'Deletes an enterprise application (or service principal)';
+    }
+    alias() {
+        return [commands.SP_REMOVE];
+    }
+    constructor() {
+        super();
+        _EntraEnterpriseAppRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraEnterpriseAppRemoveCommand_instances, "m", _EntraEnterpriseAppRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraEnterpriseAppRemoveCommand_instances, "m", _EntraEnterpriseAppRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraEnterpriseAppRemoveCommand_instances, "m", _EntraEnterpriseAppRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraEnterpriseAppRemoveCommand_instances, "m", _EntraEnterpriseAppRemoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraEnterpriseAppRemoveCommand_instances, "m", _EntraEnterpriseAppRemoveCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        const removeEnterpriseApplication = async () => {
+            if (this.verbose) {
+                await logger.logToStderr(`Removing enterprise application ${args.options.id || args.options.displayName || args.options.objectId}...`);
+            }
+            try {
+                let url = `${this.resource}/v1.0`;
+                if (args.options.id) {
+                    url += `/servicePrincipals(appId='${args.options.id}')`;
+                }
+                else {
+                    const id = await this.getSpId(args.options);
+                    url += `/servicePrincipals/${id}`;
+                }
+                const requestOptions = {
+                    url: url,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                await request.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        };
+        if (args.options.force) {
+            await removeEnterpriseApplication();
+        }
+        else {
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove enterprise application '${args.options.id || args.options.displayName || args.options.objectId}'?` });
+            if (result) {
+                await removeEnterpriseApplication();
+            }
+        }
+    }
+    async getSpId(options) {
+        if (options.objectId) {
+            return options.objectId;
+        }
+        const spItemsResponse = await odata.getAllItems(`${this.resource}/v1.0/servicePrincipals?$filter=displayName eq '${formatting.encodeQueryParameter(options.displayName)}'&$select=id`);
+        if (spItemsResponse.length === 0) {
+            throw `The specified enterprise application does not exist.`;
+        }
+        if (spItemsResponse.length > 1) {
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', spItemsResponse);
+            const result = await cli.handleMultipleResultsFound(`Multiple enterprise applications with name '${options.displayName}' found.`, resultAsKeyValuePair);
+            return result.id;
+        }
+        const spItem = spItemsResponse[0];
+        return spItem.id;
+    }
+}
+_EntraEnterpriseAppRemoveCommand_instances = new WeakSet(), _EntraEnterpriseAppRemoveCommand_initTelemetry = function _EntraEnterpriseAppRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            displayName: typeof args.options.displayName !== 'undefined',
+            objectId: typeof args.options.objectId !== 'undefined',
+            force: !!args.options.force
+        });
+    });
+}, _EntraEnterpriseAppRemoveCommand_initOptions = function _EntraEnterpriseAppRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --displayName [displayName]'
+    }, {
+        option: '--objectId [objectId]'
+    }, {
+        option: '-f, --force'
+    });
+}, _EntraEnterpriseAppRemoveCommand_initValidators = function _EntraEnterpriseAppRemoveCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
+            return `The option 'id' with value '${args.options.id}' is not a valid GUID.`;
+        }
+        if (args.options.objectId && !validation.isValidGuid(args.options.objectId)) {
+            return `The option 'objectId' with value '${args.options.objectId}' is not a valid GUID.`;
+        }
+        return true;
+    });
+}, _EntraEnterpriseAppRemoveCommand_initOptionSets = function _EntraEnterpriseAppRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'displayName', 'objectId'] });
+}, _EntraEnterpriseAppRemoveCommand_initTypes = function _EntraEnterpriseAppRemoveCommand_initTypes() {
+    this.types.string.push('id', 'displayName', 'objectId');
+    this.types.boolean.push('force');
+};
+export default new EntraEnterpriseAppRemoveCommand();
+//# sourceMappingURL=enterpriseapp-remove.js.map