login: fix bugs in refactor

This commit is contained in:
Tulir Asokan
2024-08-22 18:01:44 +03:00
parent b25c09fc53
commit eec5cbe447
4 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -11,7 +11,7 @@ require (
go.uber.org/zap v1.27.0
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa
golang.org/x/net v0.28.0
maunium.net/go/mautrix v0.20.1-0.20240821194048-675d176b4662
maunium.net/go/mautrix v0.20.1-0.20240822145834-afc796861a44
)
require (
+2 -2
View File
@@ -114,8 +114,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
maunium.net/go/mauflag v1.0.0 h1:YiaRc0tEI3toYtJMRIfjP+jklH45uDHtT80nUamyD4M=
maunium.net/go/mauflag v1.0.0/go.mod h1:nLivPOpTpHnpzEh8jEdSL9UqO9+/KBJFmNRlwKfkPeA=
maunium.net/go/mautrix v0.20.1-0.20240821194048-675d176b4662 h1:f7iw18KChWZtHA6dKJcm4uv3yjxzej4ToDuK8JwS4j0=
maunium.net/go/mautrix v0.20.1-0.20240821194048-675d176b4662/go.mod h1:NhWZ4jpQ2CW+t6TmGrnydAIL0htdoXmGiNTdHb2PzL4=
maunium.net/go/mautrix v0.20.1-0.20240822145834-afc796861a44 h1:H30QeUbffMfLyNNDbkp1lm1TKfS6lf+JjnnJdSGSHt8=
maunium.net/go/mautrix v0.20.1-0.20240822145834-afc796861a44/go.mod h1:NhWZ4jpQ2CW+t6TmGrnydAIL0htdoXmGiNTdHb2PzL4=
nhooyr.io/websocket v1.8.11 h1:f/qXNc2/3DpoSZkHt1DQu6rj4zGC8JmkkLkWss0MgN0=
nhooyr.io/websocket v1.8.11/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c=
rsc.io/qr v0.2.0 h1:6vBLea5/NRMVTz8V66gipeLycZMl/+UlFmk8DvqQ6WY=
+1 -1
View File
@@ -136,7 +136,7 @@ type UserLoginMetadata struct {
func (s *UserLoginSession) Load(_ context.Context) (*session.Data, error) {
if len(s.AuthKey) != 256 {
return nil, nil
return nil, session.ErrNotFound
}
keyID := crypto.Key(s.AuthKey).ID()
return &session.Data{
+1 -1
View File
@@ -183,7 +183,7 @@ func (p *PhoneLogin) handleAuthSuccess(ctx context.Context, authorization *tg.Au
userLoginID := ids.MakeUserLoginID(authorization.User.GetID())
ul, err := p.user.NewLogin(ctx, &database.UserLogin{
ID: userLoginID,
Metadata: UserLoginMetadata{
Metadata: &UserLoginMetadata{
Phone: p.phone,
Session: p.authData,
},