Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-15 22:56:48 +00:00
Code Issues Actions Packages Projects Releases Wiki 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

4
internal/bridge/user.go
View File

@ -187,7 +187,7 @@ func (bridge *Bridge) LoginFull(
return "", fmt.Errorf("failed to begin login process: %w", err)
}
if auth.TwoFA.Enabled == proton.TOTPEnabled {
if auth.TwoFA.Enabled&proton.HasTOTP != 0 {
logrus.WithField("userID", auth.UserID).Info("Requesting TOTP")
totp, err := getTOTP()
@ -446,9 +446,9 @@ func (bridge *Bridge) addUserWithVault(
ctx,
vault,
client,
bridge.reporter,
apiUser,
bridge.crashHandler,
bridge.reporter,
bridge.vault.SyncWorkers(),
bridge.vault.GetShowAllMail(),
)