@pnp/cli-microsoft365 7.5.0-beta.d4d820f → 7.6.0-beta.682272b

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

@@ -15,8 +15,8 @@ class CliDoctorCommand extends Command {
     async commandAction(logger) {
         const roles = [];
         const scopes = new Map();
-        Object.keys(auth.service.accessTokens).forEach(resource => {
-            const accessToken = auth.service.accessTokens[resource].accessToken;
+        Object.keys(auth.connection.accessTokens).forEach(resource => {
+            const accessToken = auth.connection.accessTokens[resource].accessToken;
             this.getRolesFromAccessToken(accessToken).forEach(role => roles.push(role));
             const [res, scp] = this.getScopesFromAccessToken(accessToken);
             if (res !== "") {
@@ -31,9 +31,9 @@ class CliDoctorCommand extends Command {
             },
             cliVersion: app.packageJson().version,
             nodeVersion: process.version,
-            cliAadAppId: auth.service.appId,
-            cliAadAppTenant: validation.isValidGuid(auth.service.tenant) ? 'single' : auth.service.tenant,
-            authMode: AuthType[auth.service.authType],
+            cliAadAppId: auth.connection.appId,
+            cliAadAppTenant: validation.isValidGuid(auth.connection.tenant) ? 'single' : auth.connection.tenant,
+            authMode: AuthType[auth.connection.authType],
             cliEnvironment: process.env.CLIMICROSOFT365_ENV ? process.env.CLIMICROSOFT365_ENV : '',
             cliConfig: cli.getConfig().all,
             roles: roles,

package/dist/m365/commands/ConnectionDetails.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=ConnectionDetails.js.map

package/dist/m365/commands/login.js

@@ -8,7 +8,6 @@ import fs from 'fs';
 import auth, { AuthType, CloudType } from '../../Auth.js';
 import Command, { CommandError } from '../../Command.js';
 import config from '../../config.js';
-import { accessToken } from '../../utils/accessToken.js';
 import { misc } from '../../utils/misc.js';
 import commands from './commands.js';
 import { settingsNames } from '../../settingsNames.js';
@@ -32,47 +31,48 @@ class LoginCommand extends Command {
         if (this.debug) {
             await logger.logToStderr(`Logging out from Microsoft 365...`);
         }
-        const logout = () => auth.service.logout();
+        const deactivate = () => auth.connection.deactivate();
         const login = async () => {
             if (this.verbose) {
                 await logger.logToStderr(`Signing in to Microsoft 365...`);
             }
             const authType = args.options.authType || cli.getSettingWithDefaultValue(settingsNames.authType, 'deviceCode');
-            auth.service.appId = args.options.appId || config.cliAadAppId;
-            auth.service.tenant = args.options.tenant || config.tenant;
+            auth.connection.appId = args.options.appId || config.cliAadAppId;
+            auth.connection.tenant = args.options.tenant || config.tenant;
+            auth.connection.name = args.options.connectionName;
             switch (authType) {
                 case 'password':
-                    auth.service.authType = AuthType.Password;
-                    auth.service.userName = args.options.userName;
-                    auth.service.password = args.options.password;
+                    auth.connection.authType = AuthType.Password;
+                    auth.connection.userName = args.options.userName;
+                    auth.connection.password = args.options.password;
                     break;
                 case 'certificate':
-                    auth.service.authType = AuthType.Certificate;
-                    auth.service.certificate = args.options.certificateBase64Encoded ? args.options.certificateBase64Encoded : fs.readFileSync(args.options.certificateFile, 'base64');
-                    auth.service.thumbprint = args.options.thumbprint;
-                    auth.service.password = args.options.password;
+                    auth.connection.authType = AuthType.Certificate;
+                    auth.connection.certificate = args.options.certificateBase64Encoded ? args.options.certificateBase64Encoded : fs.readFileSync(args.options.certificateFile, 'base64');
+                    auth.connection.thumbprint = args.options.thumbprint;
+                    auth.connection.password = args.options.password;
                     break;
                 case 'identity':
-                    auth.service.authType = AuthType.Identity;
-                    auth.service.userName = args.options.userName;
+                    auth.connection.authType = AuthType.Identity;
+                    auth.connection.userName = args.options.userName;
                     break;
                 case 'browser':
-                    auth.service.authType = AuthType.Browser;
+                    auth.connection.authType = AuthType.Browser;
                     break;
                 case 'secret':
-                    auth.service.authType = AuthType.Secret;
-                    auth.service.secret = args.options.secret;
+                    auth.connection.authType = AuthType.Secret;
+                    auth.connection.secret = args.options.secret;
                     break;
             }
             if (args.options.cloud) {
-                auth.service.cloudType = CloudType[args.options.cloud];
+                auth.connection.cloudType = CloudType[args.options.cloud];
             }
             else {
-                auth.service.cloudType = CloudType.Public;
+                auth.connection.cloudType = CloudType.Public;
             }
             try {
                 await auth.ensureAccessToken(auth.defaultResource, logger, this.debug);
-                auth.service.connected = true;
+                auth.connection.active = true;
             }
             catch (error) {
                 if (this.debug) {
@@ -82,38 +82,14 @@ class LoginCommand extends Command {
                 }
                 throw new CommandError(error.message);
             }
+            const details = auth.getConnectionDetails(auth.connection);
             if (this.debug) {
-                await logger.log({
-                    connectedAs: accessToken.getUserNameFromAccessToken(auth.service.accessTokens[auth.defaultResource].accessToken),
-                    authType: AuthType[auth.service.authType],
-                    appId: auth.service.appId,
-                    appTenant: auth.service.tenant,
-                    accessToken: JSON.stringify(auth.service.accessTokens, null, 2),
-                    cloudType: CloudType[auth.service.cloudType]
-                });
-            }
-            else {
-                await logger.log({
-                    connectedAs: accessToken.getUserNameFromAccessToken(auth.service.accessTokens[auth.defaultResource].accessToken),
-                    authType: AuthType[auth.service.authType],
-                    appId: auth.service.appId,
-                    appTenant: auth.service.tenant,
-                    cloudType: CloudType[auth.service.cloudType]
-                });
+                details.accessToken = JSON.stringify(auth.connection.accessTokens, null, 2);
             }
+            await logger.log(details);
         };
-        try {
-            await auth.clearConnectionInfo();
-        }
-        catch (error) {
-            if (this.debug) {
-                await logger.logToStderr(new CommandError(error));
-            }
-        }
-        finally {
-            logout();
-            await login();
-        }
+        deactivate();
+        await login();
     }
     async action(logger, args) {
         try {
@@ -156,6 +132,8 @@ _a = LoginCommand, _LoginCommand_instances = new WeakSet(), _LoginCommand_initTe
     }, {
         option: '--cloud [cloud]',
         autocomplete: misc.getEnums(CloudType)
+    }, {
+        option: '--connectionName [connectionName]'
     });
 }, _LoginCommand_initValidators = function _LoginCommand_initValidators() {
     this.validators.push(async (args) => {

package/dist/m365/commands/logout.js

@@ -12,7 +12,7 @@ class LogoutCommand extends Command {
         if (this.verbose) {
             await logger.logToStderr('Logging out from Microsoft 365...');
         }
-        const logout = () => auth.service.logout();
+        const deactivate = () => auth.connection.deactivate();
         try {
             await auth.clearConnectionInfo();
         }
@@ -22,7 +22,7 @@ class LogoutCommand extends Command {
             }
         }
         finally {
-            logout();
+            deactivate();
         }
     }
     async action(logger, args) {

package/dist/m365/commands/request.js

@@ -95,8 +95,8 @@ class RequestCommand extends Command {
             return url.replace('@graph', 'https://graph.microsoft.com/v1.0');
         }
         if (url.startsWith('@spo')) {
-            if (auth.service.spoUrl) {
-                return url.replace('@spo', auth.service.spoUrl);
+            if (auth.connection.spoUrl) {
+                return url.replace('@spo', auth.connection.spoUrl);
             }
             throw `SharePoint root site URL is unknown. Please set your SharePoint URL using command 'spo set'.`;
         }

package/dist/m365/commands/status.js

@@ -1,6 +1,5 @@
-import auth, { AuthType, CloudType } from '../../Auth.js';
+import auth from '../../Auth.js';
 import Command, { CommandError } from '../../Command.js';
-import { accessToken } from '../../utils/accessToken.js';
 import commands from './commands.js';
 class StatusCommand extends Command {
     get name() {
@@ -10,7 +9,7 @@ class StatusCommand extends Command {
         return 'Shows Microsoft 365 login status';
     }
     async commandAction(logger) {
-        if (auth.service.connected) {
+        if (auth.connection.active) {
             try {
                 await auth.ensureAccessToken(auth.defaultResource, logger, this.debug);
             }
@@ -18,35 +17,28 @@ class StatusCommand extends Command {
                 if (this.debug) {
                     await logger.logToStderr(err);
                 }
-                auth.service.logout();
+                auth.connection.deactivate();
                 throw new CommandError(`Your login has expired. Sign in again to continue. ${err.message}`);
             }
+            const details = auth.getConnectionDetails(auth.connection);
             if (this.debug) {
-                await logger.logToStderr({
-                    connectedAs: accessToken.getUserNameFromAccessToken(auth.service.accessTokens[auth.defaultResource].accessToken),
-                    authType: AuthType[auth.service.authType],
-                    appId: auth.service.appId,
-                    appTenant: auth.service.tenant,
-                    accessTokens: JSON.stringify(auth.service.accessTokens, null, 2),
-                    cloudType: CloudType[auth.service.cloudType]
-                });
-            }
-            else {
-                await logger.log({
-                    connectedAs: accessToken.getUserNameFromAccessToken(auth.service.accessTokens[auth.defaultResource].accessToken),
-                    authType: AuthType[auth.service.authType],
-                    appId: auth.service.appId,
-                    appTenant: auth.service.tenant,
-                    cloudType: CloudType[auth.service.cloudType]
-                });
+                details.accessTokens = JSON.stringify(auth.connection.accessTokens, null, 2);
             }
+            await logger.log(details);
         }
         else {
+            const connections = await auth.getAllConnections();
             if (this.verbose) {
-                await logger.logToStderr('Logged out from Microsoft 365');
+                const message = connections.length > 0
+                    ? `Logged out from Microsoft 365, signed in connections available`
+                    : 'Logged out from Microsoft 365';
+                await logger.logToStderr(message);
             }
             else {
-                await logger.log('Logged out');
+                const message = connections.length > 0
+                    ? `Logged out, signed in connections available`
+                    : 'Logged out';
+                await logger.log(message);
             }
         }
     }

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

@@ -0,0 +1,47 @@
+import auth, { AuthType } from '../../../Auth.js';
+import commands from '../commands.js';
+import Command, { CommandError } from '../../../Command.js';
+import assert from 'assert';
+class ConnectionListCommand extends Command {
+    get name() {
+        return commands.LIST;
+    }
+    get description() {
+        return 'Show the list of available connections';
+    }
+    defaultProperties() {
+        return ['name', 'connectedAs', 'authType', 'active'];
+    }
+    async commandAction(logger) {
+        const availableConnections = await auth.getAllConnections();
+        const output = availableConnections.map(connection => {
+            const isCurrentConnection = connection.name === auth.connection?.name;
+            return {
+                name: connection.name,
+                connectedAs: connection.identityName,
+                authType: AuthType[connection.authType],
+                active: isCurrentConnection
+            };
+        }).sort((a, b) => {
+            // Asserting name because it is optional, but required at this point.
+            assert(a.name !== undefined);
+            assert(b.name !== undefined);
+            const aName = a.name;
+            const bName = b.name;
+            return aName.localeCompare(bName);
+        });
+        await logger.log(output);
+    }
+    async action(logger, args) {
+        try {
+            await auth.restoreAuth();
+        }
+        catch (error) {
+            throw new CommandError(error);
+        }
+        this.initAction(args, logger);
+        await this.commandAction(logger);
+    }
+}
+export default new ConnectionListCommand();
+//# sourceMappingURL=connection-list.js.map

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

@@ -0,0 +1,67 @@
+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 _ConnectionRemoveCommand_instances, _ConnectionRemoveCommand_initTelemetry, _ConnectionRemoveCommand_initOptions;
+import auth from '../../../Auth.js';
+import commands from '../commands.js';
+import Command, { CommandError } from '../../../Command.js';
+import { cli } from '../../../cli/cli.js';
+class ConnectionRemoveCommand extends Command {
+    get name() {
+        return commands.REMOVE;
+    }
+    get description() {
+        return 'Remove the specified connection';
+    }
+    constructor() {
+        super();
+        _ConnectionRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _ConnectionRemoveCommand_instances, "m", _ConnectionRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _ConnectionRemoveCommand_instances, "m", _ConnectionRemoveCommand_initOptions).call(this);
+    }
+    async commandAction(logger, args) {
+        const deleteConnection = async () => {
+            const connection = await auth.getConnection(args.options.name);
+            if (this.verbose) {
+                await logger.logToStderr(`Removing connection '${connection.identityName}', appId: ${connection.appId}, tenantId: ${connection.identityTenantId}...`);
+            }
+            await auth.removeConnectionInfo(connection, logger, this.debug);
+        };
+        if (args.options.force) {
+            await deleteConnection();
+        }
+        else {
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the connection?` });
+            if (result) {
+                await deleteConnection();
+            }
+        }
+    }
+    async action(logger, args) {
+        try {
+            await auth.restoreAuth();
+        }
+        catch (error) {
+            throw new CommandError(error);
+        }
+        this.initAction(args, logger);
+        await this.commandAction(logger, args);
+    }
+}
+_ConnectionRemoveCommand_instances = new WeakSet(), _ConnectionRemoveCommand_initTelemetry = function _ConnectionRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            force: (!(!args.options.force)).toString()
+        });
+    });
+}, _ConnectionRemoveCommand_initOptions = function _ConnectionRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --name <name>'
+    }, {
+        option: '-f, --force'
+    });
+};
+export default new ConnectionRemoveCommand();
+//# sourceMappingURL=connection-remove.js.map

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

@@ -0,0 +1,56 @@
+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 _ConnectionSetCommand_instances, _ConnectionSetCommand_initOptions, _ConnectionSetCommand_initValidators;
+import auth from '../../../Auth.js';
+import commands from '../commands.js';
+import Command, { CommandError } from '../../../Command.js';
+class ConnectionSetCommand extends Command {
+    get name() {
+        return commands.SET;
+    }
+    get description() {
+        return 'Rename the specified connection';
+    }
+    constructor() {
+        super();
+        _ConnectionSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _ConnectionSetCommand_instances, "m", _ConnectionSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _ConnectionSetCommand_instances, "m", _ConnectionSetCommand_initValidators).call(this);
+    }
+    async commandAction(logger, args) {
+        const connection = await auth.getConnection(args.options.name);
+        if (this.verbose) {
+            await logger.logToStderr(`Updating connection '${connection.identityName}', appId: ${connection.appId}, tenantId: ${connection.identityTenantId}...`);
+        }
+        await auth.updateConnection(connection, args.options.newName);
+    }
+    async action(logger, args) {
+        try {
+            await auth.restoreAuth();
+        }
+        catch (error) {
+            throw new CommandError(error);
+        }
+        this.initAction(args, logger);
+        await this.commandAction(logger, args);
+    }
+}
+_ConnectionSetCommand_instances = new WeakSet(), _ConnectionSetCommand_initOptions = function _ConnectionSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --name <name>'
+    }, {
+        option: '--newName <newName>'
+    });
+}, _ConnectionSetCommand_initValidators = function _ConnectionSetCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.name === args.options.newName) {
+            return `Choose a name different from the current one`;
+        }
+        return true;
+    });
+};
+export default new ConnectionSetCommand();
+//# sourceMappingURL=connection-set.js.map

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

@@ -0,0 +1,51 @@
+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 _ConnectionUseCommand_instances, _ConnectionUseCommand_initOptions;
+import auth from '../../../Auth.js';
+import commands from '../commands.js';
+import Command, { CommandError } from '../../../Command.js';
+class ConnectionUseCommand extends Command {
+    get name() {
+        return commands.USE;
+    }
+    get description() {
+        return 'Activate the specified Microsoft 365 tenant connection';
+    }
+    constructor() {
+        super();
+        _ConnectionUseCommand_instances.add(this);
+        __classPrivateFieldGet(this, _ConnectionUseCommand_instances, "m", _ConnectionUseCommand_initOptions).call(this);
+    }
+    async commandAction(logger, args) {
+        const connection = await auth.getConnection(args.options.name);
+        if (this.verbose) {
+            await logger.logToStderr(`Switching to connection '${connection.identityName}', appId: ${connection.appId}, tenantId: ${connection.identityTenantId}...`);
+        }
+        await auth.switchToConnection(connection);
+        const details = auth.getConnectionDetails(auth.connection);
+        if (this.debug) {
+            details.accessTokens = JSON.stringify(auth.connection.accessTokens, null, 2);
+        }
+        await logger.log(details);
+    }
+    async action(logger, args) {
+        try {
+            await auth.restoreAuth();
+        }
+        catch (error) {
+            throw new CommandError(error);
+        }
+        this.initAction(args, logger);
+        await this.commandAction(logger, args);
+    }
+}
+_ConnectionUseCommand_instances = new WeakSet(), _ConnectionUseCommand_initOptions = function _ConnectionUseCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --name <name>'
+    });
+};
+export default new ConnectionUseCommand();
+//# sourceMappingURL=connection-use.js.map

package/dist/m365/connection/commands.js

@@ -0,0 +1,8 @@
+const prefix = 'connection';
+export default {
+    LIST: `${prefix} list`,
+    REMOVE: `${prefix} remove`,
+    SET: `${prefix} set`,
+    USE: `${prefix} use`
+};
+//# sourceMappingURL=commands.js.map

package/dist/m365/entra/aadCommands.js

@@ -7,6 +7,7 @@ export default {
     ADMINISTRATIVEUNIT_MEMBER_ADD: `${prefix} administrativeunit member add`,
     ADMINISTRATIVEUNIT_MEMBER_GET: `${prefix} administrativeunit member get`,
     ADMINISTRATIVEUNIT_MEMBER_LIST: `${prefix} administrativeunit member list`,
+    ADMINISTRATIVEUNIT_MEMBER_REMOVE: `${prefix} administrativeunit member remove`,
     ADMINISTRATIVEUNIT_ROLEASSIGNMENT_ADD: `${prefix} administrativeunit roleassignment add`,
     APP_ADD: `${prefix} app add`,
     APP_GET: `${prefix} app get`,
@@ -20,6 +21,7 @@ export default {
     APPROLEASSIGNMENT_ADD: `${prefix} approleassignment add`,
     APPROLEASSIGNMENT_LIST: `${prefix} approleassignment list`,
     APPROLEASSIGNMENT_REMOVE: `${prefix} approleassignment remove`,
+    GROUP_ADD: `${prefix} group add`,
     GROUP_GET: `${prefix} group get`,
     GROUP_LIST: `${prefix} group list`,
     GROUP_REMOVE: `${prefix} group remove`,
@@ -78,6 +80,7 @@ export default {
     USER_RECYCLEBINITEM_CLEAR: `${prefix} user recyclebinitem clear`,
     USER_RECYCLEBINITEM_LIST: `${prefix} user recyclebinitem list`,
     USER_RECYCLEBINITEM_REMOVE: `${prefix} user recyclebinitem remove`,
+    USER_REGISTRATIONDETAILS_LIST: `${prefix} user registrationdetails list`,
     USER_REMOVE: `${prefix} user remove`,
     USER_RECYCLEBINITEM_RESTORE: `${prefix} user recyclebinitem restore`,
     USER_SET: `${prefix} user set`,