yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

GODT-2021: Remove gluon data when deleting user

Browse Source
This commit is contained in:
James Houlahan
2022-11-09 15:48:12 +01:00
parent 8b0024d53e
commit 04f2dd1a0b
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/bridge/settings.go
View File

@ -284,7 +284,7 @@ func (bridge *Bridge) FactoryReset(ctx context.Context) {
// Delete all the users. // Delete all the users.
safe.Lock(func() { safe.Lock(func() {
for _, user := range bridge.users { for _, user := range bridge.users {
bridge.logoutUser(ctx, user, true) bridge.logoutUser(ctx, user, true, true)
} }
for _, user := range bridge.vault.GetUserIDs() { for _, user := range bridge.vault.GetUserIDs() {

8
internal/bridge/user.go
View File

@ -207,7 +207,7 @@ func (bridge *Bridge) LogoutUser(ctx context.Context, userID string) error {
defer delete(bridge.users, user.ID()) defer delete(bridge.users, user.ID())
bridge.logoutUser(ctx, user, true) bridge.logoutUser(ctx, user, true, false)
bridge.publish(events.UserLoggedOut{ bridge.publish(events.UserLoggedOut{
UserID: userID, UserID: userID,
@ -228,7 +228,7 @@ func (bridge *Bridge) DeleteUser(ctx context.Context, userID string) error {
if user, ok := bridge.users[userID]; ok { if user, ok := bridge.users[userID]; ok {
defer delete(bridge.users, user.ID()) defer delete(bridge.users, user.ID())
bridge.logoutUser(ctx, user, true) bridge.logoutUser(ctx, user, true, true)
} }
if err := bridge.vault.DeleteUser(userID); err != nil { if err := bridge.vault.DeleteUser(userID); err != nil {
@ -502,8 +502,8 @@ func (bridge *Bridge) newVaultUser(
} }
// logout logs out the given user, optionally logging them out from the API too. // logout logs out the given user, optionally logging them out from the API too.
func (bridge *Bridge) logoutUser(ctx context.Context, user *user.User, withAPI bool) { func (bridge *Bridge) logoutUser(ctx context.Context, user *user.User, withAPI, withData bool) {
if err := bridge.removeIMAPUser(ctx, user, false); err != nil { if err := bridge.removeIMAPUser(ctx, user, withData); err != nil {
logrus.WithError(err).Error("Failed to remove IMAP user") logrus.WithError(err).Error("Failed to remove IMAP user")
} }

3
internal/bridge/user_events.go
View File

@ -47,8 +47,7 @@ func (bridge *Bridge) handleUserEvent(ctx context.Context, user *user.User, even
case events.UserDeauth: case events.UserDeauth:
safe.Lock(func() { safe.Lock(func() {
defer delete(bridge.users, user.ID()) defer delete(bridge.users, user.ID())
bridge.logoutUser(ctx, user, false, false)
bridge.logoutUser(ctx, user, false)
}, bridge.usersLock) }, bridge.usersLock)
} }