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

fix(GODT-2505): show notification only for cases when user needs to do actions.

Browse Source
This commit is contained in:
Jakub
2023-03-20 17:02:37 +01:00
parent 8b80938e49
commit 7d8e71c9ea
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/bridge/user_events.go
View File

@ -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 { 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 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 { 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 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 { 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 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 { 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 return nil
} }

8
internal/frontend/cli/frontend.go
View File

@ -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) 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: case events.UserAddressDisabled:
user, err := f.bridge.GetUserInfo(event.UserID) user, err := f.bridge.GetUserInfo(event.UserID)
if err != nil { if err != nil {

5
internal/frontend/grpc/service.go
View File

@ -288,9 +288,12 @@ func (s *Service) watchEvents() {
case events.UserAddressCreated: case events.UserAddressCreated:
_ = s.SendEvent(NewMailAddressChangeEvent(event.Email)) _ = s.SendEvent(NewMailAddressChangeEvent(event.Email))
case events.UserAddressUpdated: case events.UserAddressEnabled:
_ = s.SendEvent(NewMailAddressChangeEvent(event.Email)) _ = s.SendEvent(NewMailAddressChangeEvent(event.Email))
case events.UserAddressDisabled:
_ = s.SendEvent(NewMailAddressChangeLogoutEvent(event.Email))
case events.UserAddressDeleted: case events.UserAddressDeleted:
_ = s.SendEvent(NewMailAddressChangeLogoutEvent(event.Email)) _ = s.SendEvent(NewMailAddressChangeLogoutEvent(event.Email))