yesBad/proton-bridge
1
0
Fork 0
Code Actions Activity

Merge branch 'release/perth_narrows' into devel

Browse Source
This commit is contained in:
Jakub
2022-12-07 09:26:59 +01:00
parent 4003e0a2ab f070314524
commit 6c30a04ac0
29 changed files with 533 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/frontend/cli/accounts.go
View File

@ -149,7 +149,7 @@ func (f *frontendCLI) loginAccount(c *ishell.Context) { //nolint:funlen
return
}
if auth.TwoFA.Enabled == proton.TOTPEnabled {
if auth.TwoFA.Enabled&proton.HasTOTP != 0 {
code := f.readStringInAttempts("Two factor code", c.ReadLine, isNotEmpty)
if code == "" {
f.printAndLogError("Cannot login: need two factor code")

2
internal/frontend/grpc/service_methods.go
View File

@ -428,7 +428,7 @@ func (s *Service) Login(ctx context.Context, login *LoginRequest) (*emptypb.Empt
s.auth = auth
switch {
case auth.TwoFA.Enabled == proton.TOTPEnabled:
case auth.TwoFA.Enabled&proton.HasTOTP != 0:
_ = s.SendEvent(NewLoginTfaRequestedEvent(login.Username))
case auth.PasswordMode == proton.TwoPasswordMode: