legacyprovision: don't delete user logins on logout

mautrix · Sep 16, 2024 · daef6e6 · daef6e6
1 parent f5440b0
commit daef6e6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/cmd/mautrix-meta/legacyprovision.go b/cmd/mautrix-meta/legacyprovision.go
@@ -95,7 +95,8 @@ func legacyProvLogout(w http.ResponseWriter, r *http.Request) {
 	user := m.Matrix.Provisioning.GetUser(r)
 	logins := user.GetUserLogins()
 	for _, login := range logins {
-		login.Logout(r.Context())
+		// Intentionally don't delete the user login, only disconnect the client
+		login.Client.(*connector.MetaClient).LogoutRemote(r.Context())
 	}
 	jsonResponse(w, http.StatusOK, Response{
 		Success: true,

diff --git a/pkg/connector/client.go b/pkg/connector/client.go
@@ -357,6 +357,7 @@ func (m *MetaClient) LogoutRemote(ctx context.Context) {
 		}
 	}
 	m.resetWADevice()
+	m.LoginMeta.Cookies = nil
 }
 
 func (m *MetaClient) canReconnect() bool {
-Original file line number
+Diff line change
@@ Expand Up / @@ -357,6 +357,7 @@ func (m *MetaClient) LogoutRemote(ctx context.Context) { @@
     		}
     	}
     	m.resetWADevice()
+    	m.LoginMeta.Cookies = nil
     }
     func (m *MetaClient) canReconnect() bool {
@@ Expand Down @@