x/web-app-template
Archived
Template
2
0
Fork 0
Code Issues 13 Pull Requests 4 Actions Packages Activity

fix(quality): extract logic from database layer
All checks were successful
Build Docker Image / Build-Docker-Image (push) Successful in 42s
Details
Build and Push Docker Image / Build-And-Push-Docker-Image (push) Successful in 47s
Details

Browse Source
This commit was merged in pull request #288.
This commit is contained in:
Tim Wundenberg
2024-12-03 22:28:46 +01:00
parent 0accb49871
commit 1f8c4a39b4
4 changed files with 165 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
service/auth.go
View File

@@ -88,7 +88,7 @@ func NewAuthServiceImpl(dbAuth db.AuthDb, randomGenerator RandomService, clock C
}
func (service AuthServiceImpl) SignIn(email string, password string) (*Session, error) {
user, err := service.dbAuth.GetUser(email)
user, err := service.dbAuth.GetUserByEmail(email)
if err != nil {
if errors.Is(err, db.ErrNotFound) {
return nil, ErrInvaidCredentials
@@ -170,27 +170,34 @@ func (service AuthServiceImpl) SignUp(email string, password string) (*User, err
}
func (service AuthServiceImpl) SendVerificationMail(userId uuid.UUID, email string) {
var token string
token, err := service.dbAuth.GetEmailVerificationToken(userId)
tokens, err := service.dbAuth.GetTokensByUserIdAndType(userId, db.TokenTypeEmailVerify)
if err != nil {
return
}
if token == "" {
token, err := service.randomGenerator.String(32)
var token *db.Token
if len(tokens) > 0 {
token = tokens[0]
}
if token == nil {
newTokenStr, err := service.randomGenerator.String(32)
if err != nil {
return
}
err = service.dbAuth.InsertEmailVerificationToken(userId, token)
token = db.NewToken(userId, newTokenStr, db.TokenTypeEmailVerify, service.clock.Now(), service.clock.Now().Add(24*time.Hour))
err = service.dbAuth.InsertToken(token)
if err != nil {
return
}
}
var w strings.Builder
err = mailTemplate.Register(service.serverSettings.BaseUrl, token).Render(context.Background(), &w)
err = mailTemplate.Register(service.serverSettings.BaseUrl, token.Token).Render(context.Background(), &w)
if err != nil {
utils.LogError("Could not render welcome email", err)
return
@@ -199,13 +206,42 @@ func (service AuthServiceImpl) SendVerificationMail(userId uuid.UUID, email stri
service.mailService.SendMail(email, "Welcome to ME-FIT", w.String())
}
func (service AuthServiceImpl) VerifyUserEmail(token string) error {
func (service AuthServiceImpl) VerifyUserEmail(tokenStr string) error {
if token == "" {
if tokenStr == "" {
return types.ErrInternal
}
return service.dbAuth.VerifyEmail(token)
token, err := service.dbAuth.GetToken(tokenStr)
if err != nil {
return types.ErrInternal
}
user, err := service.dbAuth.GetUser(token.UserId)
if err != nil {
return types.ErrInternal
}
if token.Type != db.TokenTypeEmailVerify {
return types.ErrInternal
}
now := service.clock.Now()
if token.ExpiresAt.Before(now) {
return types.ErrInternal
}
user.EmailVerified = true
user.EmailVerifiedAt = &now
err = service.dbAuth.UpdateUser(user)
if err != nil {
return types.ErrInternal
}
_ = service.dbAuth.DeleteToken(token.Token)
return nil
}
func (service AuthServiceImpl) SignOut(sessionId string) error {
@@ -223,7 +259,7 @@ func (service AuthServiceImpl) GetUserFromSessionId(sessionId string) (*User, er
return nil, types.ErrInternal
}
user, err := service.dbAuth.GetUserById(session.UserId)
user, err := service.dbAuth.GetUser(session.UserId)
if err != nil {
return nil, types.ErrInternal
}
@@ -273,7 +309,7 @@ func (service AuthServiceImpl) ChangePassword(user *User, currPass, newPass stri
return err
}
userDb, err := service.dbAuth.GetUserById(user.Id)
userDb, err := service.dbAuth.GetUser(user.Id)
if err != nil {
return err
}
@@ -292,23 +328,35 @@ func (service AuthServiceImpl) ChangePassword(user *User, currPass, newPass stri
func (service AuthServiceImpl) ForgotPassword(email string) error {
token, err := service.randomGenerator.String(32)
tokenStr, err := service.randomGenerator.String(32)
if err != nil {
return err
}
err = service.dbAuth.InsertForgotPasswordToken(email, token)
if err != db.ErrNotFound {
var mail strings.Builder
err = mailTemplate.ResetPassword(service.serverSettings.BaseUrl, token).Render(context.Background(), &mail)
if err != nil {
utils.LogError("Could not render reset password email", err)
user, err := service.dbAuth.GetUserByEmail(email)
if err != nil {
if err == db.ErrNotFound {
return nil
} else {
return types.ErrInternal
}
go service.mailService.SendMail(email, "Reset Password", mail.String())
}
token := db.NewToken(user.Id, tokenStr, db.TokenTypePasswordReset, service.clock.Now(), service.clock.Now().Add(15*time.Minute))
err = service.dbAuth.InsertToken(token)
if err != nil {
return types.ErrInternal
}
var mail strings.Builder
err = mailTemplate.ResetPassword(service.serverSettings.BaseUrl, token.Token).Render(context.Background(), &mail)
if err != nil {
utils.LogError("Could not render reset password email", err)
return types.ErrInternal
}
go service.mailService.SendMail(email, "Reset Password", mail.String())
return nil
}
@@ -328,7 +376,7 @@ func (service AuthServiceImpl) ForgotPasswordResponse(tokenStr string, newPass s
return err
}
user, err := service.dbAuth.GetUserById(token.UserId)
user, err := service.dbAuth.GetUser(token.UserId)
if err != nil {
utils.LogError("Could not get user from token", err)
return types.ErrInternal

18
service/auth_test.go
View File

@@ -36,7 +36,7 @@ func TestSignIn(t *testing.T) {
dbSession := db.NewSession("sessionId", user.Id, time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC))
mockAuthDb := mocks.NewMockAuthDb(t)
mockAuthDb.EXPECT().GetUser("test@test.de").Return(user, nil)
mockAuthDb.EXPECT().GetUserByEmail("test@test.de").Return(user, nil)
mockAuthDb.EXPECT().DeleteOldSessions(user.Id).Return(nil)
mockAuthDb.EXPECT().InsertSession(dbSession).Return(nil)
mockRandom := mocks.NewMockRandomService(t)
@@ -71,7 +71,7 @@ func TestSignIn(t *testing.T) {
)
mockAuthDb := mocks.NewMockAuthDb(t)
mockAuthDb.EXPECT().GetUser(user.Email).Return(user, nil)
mockAuthDb.EXPECT().GetUserByEmail(user.Email).Return(user, nil)
mockRandom := mocks.NewMockRandomService(t)
mockClock := mocks.NewMockClockService(t)
mockMail := mocks.NewMockMailService(t)
@@ -86,7 +86,7 @@ func TestSignIn(t *testing.T) {
t.Parallel()
mockAuthDb := mocks.NewMockAuthDb(t)
mockAuthDb.EXPECT().GetUser("test").Return(nil, db.ErrNotFound)
mockAuthDb.EXPECT().GetUserByEmail("test").Return(nil, db.ErrNotFound)
mockRandom := mocks.NewMockRandomService(t)
mockClock := mocks.NewMockClockService(t)
mockMail := mocks.NewMockMailService(t)
@@ -100,7 +100,7 @@ func TestSignIn(t *testing.T) {
t.Parallel()
mockAuthDb := mocks.NewMockAuthDb(t)
mockAuthDb.EXPECT().GetUser("test").Return(nil, errors.New("Some undefined error"))
mockAuthDb.EXPECT().GetUserByEmail("test").Return(nil, errors.New("Some undefined error"))
mockRandom := mocks.NewMockRandomService(t)
mockClock := mocks.NewMockClockService(t)
mockMail := mocks.NewMockMailService(t)
@@ -227,7 +227,9 @@ func TestSendVerificationMail(t *testing.T) {
t.Run("should use stored token and send mail", func(t *testing.T) {
t.Parallel()
token := "someRandomTokenToUse"
token := db.NewToken(uuid.New(), "someRandomTokenToUse", db.TokenTypeEmailVerify, time.Date(2020, 1, 1, 0, 0, 0, 0, time.UTC), time.Date(2020, 1, 2, 0, 0, 0, 0, time.UTC))
tokens := []*db.Token{token}
email := "some@email.de"
userId := uuid.New()
@@ -236,9 +238,11 @@ func TestSendVerificationMail(t *testing.T) {
mockClock := mocks.NewMockClockService(t)
mockMail := mocks.NewMockMailService(t)
mockAuthDb.EXPECT().GetEmailVerificationToken(userId).Return(token, nil)
mockAuthDb.EXPECT().GetTokensByUserIdAndType(userId, db.TokenTypeEmailVerify).Return(tokens, nil)
mockMail.EXPECT().SendMail(email, "Welcome to ME-FIT", mock.MatchedBy(func(message string) bool { return strings.Contains(message, token) })).Return()
mockMail.EXPECT().SendMail(email, "Welcome to ME-FIT", mock.MatchedBy(func(message string) bool {
return strings.Contains(message, token.Token)
})).Return()
underTest := NewAuthServiceImpl(mockAuthDb, mockRandom, mockClock, mockMail, &types.ServerSettings{})