[FIX] Logging out from other clients (#23276)

app/2fa/server/functions/resetTOTP.ts

@@ -60,7 +60,7 @@ export async function resetTOTP(userId: string, notifyUser = false): Promise<boo
 	const result = await Users.resetTOTPById(userId);
 
 	if (result?.modifiedCount === 1) {
-		await Users.removeResumeService(userId);
+		await Users.unsetLoginTokens(userId);
 		return true;
 	}
 

app/api/server/v1/users.js

@@ -925,7 +925,7 @@ API.v1.addRoute('users.logout', { authRequired: true }, {
 		}
 
 		// this method logs the user out automatically, if successful returns 1, otherwise 0
-		if (!Users.removeResumeService(userId)) {
+		if (!Users.unsetLoginTokens(userId)) {
 			throw new Meteor.Error('error-invalid-user-id', 'Invalid user id');
 		}
 

app/models/server/models/Users.js

@@ -1461,16 +1461,6 @@ export class Users extends Base {
 		return this.update({ _id }, update);
 	}
 
-	removeResumeService(_id) {
-		const update = {
-			$unset: {
-				'services.resume': '',
-			},
-		};
-
-		return this.update({ _id }, update);
-	}
-
 	removeSamlServiceSession(_id) {
 		const update = {
 			$unset: {

app/models/server/raw/Users.js

@@ -674,12 +674,12 @@ export class UsersRaw extends BaseRaw {
 		});
 	}
 
-	removeResumeService(userId) {
+	unsetLoginTokens(userId) {
 		return this.col.updateOne({
 			_id: userId,
 		}, {
-			$unset: {
-				'services.resume': 1,
+			$set: {
+				'services.resume.loginTokens': [],
 			},
 		});
 	}

server/lib/resetUserE2EKey.ts

@@ -61,7 +61,7 @@ export function resetUserE2EEncriptionKey(uid: string, notifyUser: boolean): boo
 	Subscriptions.resetUserE2EKey(uid);
 
 	// Force the user to logout, so that the keys can be generated again
-	Users.removeResumeService(uid);
+	Users.unsetLoginTokens(uid);
 
 	return true;
 }