willdot.net
forked from
hailey.at/cocoon
An atproto PDS written in Go
another merge conflict
Signed-off-by: Will Andrews <did:plc:dadhhalkfcq3gucaq25hjqon>
+2
-2
+2
-2
server/handle_server_create_session.go
+2
-2
server/handle_server_create_session.go
···
98
98
if repo.TwoFactorType != models.TwoFactorTypeNone && (req.AuthFactorToken == nil || *req.AuthFactorToken == "") {
99
99
err = s.createAndSendTwoFactorCode(ctx, repo)
100
100
if err != nil {
101
-
s.logger.Error("sending 2FA code", "error", err)
101
+
logger.Error("sending 2FA code", "error", err)
102
102
return helpers.ServerError(e, nil)
103
103
}
104
104
···
110
110
if repo.TwoFactorCode == nil || repo.TwoFactorCodeExpiresAt == nil {
111
111
err = s.createAndSendTwoFactorCode(ctx, repo)
112
112
if err != nil {
113
-
s.logger.Error("sending 2FA code", "error", err)
113
+
logger.Error("sending 2FA code", "error", err)
114
114
return helpers.ServerError(e, nil)
115
115
}
116
116