From 7d8e71c9ea680067d1295a0ad39f708c6485eef0 Mon Sep 17 00:00:00 2001 From: Jakub Date: Mon, 20 Mar 2023 17:02:37 +0100 Subject: [PATCH] fix(GODT-2505): show notification only for cases when user needs to do actions. --- internal/bridge/user_events.go | 8 ++++---- internal/frontend/cli/frontend.go | 8 -------- internal/frontend/grpc/service.go | 5 ++++- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/internal/bridge/user_events.go b/internal/bridge/user_events.go index 5873de8c..d5a310df 100644 --- a/internal/bridge/user_events.go +++ b/internal/bridge/user_events.go @@ -71,7 +71,7 @@ func (bridge *Bridge) handleUserEvent(ctx context.Context, user *user.User, even } func (bridge *Bridge) handleUserAddressCreated(ctx context.Context, user *user.User, event events.UserAddressCreated) error { - if user.GetAddressMode() != vault.SplitMode { + if user.GetAddressMode() == vault.CombinedMode { return nil } @@ -92,7 +92,7 @@ func (bridge *Bridge) handleUserAddressCreated(ctx context.Context, user *user.U } func (bridge *Bridge) handleUserAddressEnabled(ctx context.Context, user *user.User, event events.UserAddressEnabled) error { - if user.GetAddressMode() != vault.SplitMode { + if user.GetAddressMode() == vault.CombinedMode { return nil } @@ -109,7 +109,7 @@ func (bridge *Bridge) handleUserAddressEnabled(ctx context.Context, user *user.U } func (bridge *Bridge) handleUserAddressDisabled(ctx context.Context, user *user.User, event events.UserAddressDisabled) error { - if user.GetAddressMode() != vault.SplitMode { + if user.GetAddressMode() == vault.CombinedMode { return nil } @@ -130,7 +130,7 @@ func (bridge *Bridge) handleUserAddressDisabled(ctx context.Context, user *user. } func (bridge *Bridge) handleUserAddressDeleted(ctx context.Context, user *user.User, event events.UserAddressDeleted) error { - if user.GetAddressMode() != vault.SplitMode { + if user.GetAddressMode() == vault.CombinedMode { return nil } diff --git a/internal/frontend/cli/frontend.go b/internal/frontend/cli/frontend.go index b753c337..d71f053a 100644 --- a/internal/frontend/cli/frontend.go +++ b/internal/frontend/cli/frontend.go @@ -352,14 +352,6 @@ func (f *frontendCLI) watchEvents(eventCh <-chan events.Event) { // nolint:gocyc f.Printf("An address for %s was enabled. You may need to reconfigure your email client.\n", user.Username) - case events.UserAddressUpdated: - user, err := f.bridge.GetUserInfo(event.UserID) - if err != nil { - return - } - - f.Printf("Address changed for %s. You may need to reconfigure your email client.\n", user.Username) - case events.UserAddressDisabled: user, err := f.bridge.GetUserInfo(event.UserID) if err != nil { diff --git a/internal/frontend/grpc/service.go b/internal/frontend/grpc/service.go index d2747769..e22d66ad 100644 --- a/internal/frontend/grpc/service.go +++ b/internal/frontend/grpc/service.go @@ -288,9 +288,12 @@ func (s *Service) watchEvents() { case events.UserAddressCreated: _ = s.SendEvent(NewMailAddressChangeEvent(event.Email)) - case events.UserAddressUpdated: + case events.UserAddressEnabled: _ = s.SendEvent(NewMailAddressChangeEvent(event.Email)) + case events.UserAddressDisabled: + _ = s.SendEvent(NewMailAddressChangeLogoutEvent(event.Email)) + case events.UserAddressDeleted: _ = s.SendEvent(NewMailAddressChangeLogoutEvent(event.Email))