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

fix: remove redundante names
All checks were successful
Build Docker Image / Build-Docker-Image (push) Successful in 44s
Details
Build and Push Docker Image / Build-And-Push-Docker-Image (push) Successful in 49s
Details

Browse Source
This commit was merged in pull request #299.
This commit is contained in:
Tim Wundenberg
2024-12-04 23:22:25 +01:00
parent 2d5f42bb28
commit 5ef59df2d0
16 changed files with 228 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
service/auth.go
View File

@@ -53,7 +53,7 @@ func NewSession(session *db.Session, user *User) *Session {
}
}
type AuthService interface {
type Auth interface {
SignUp(email string, password string) (*User, error)
SendVerificationMail(userId uuid.UUID, email string)
VerifyUserEmail(token string) error
@@ -71,26 +71,26 @@ type AuthService interface {
GetUserFromSessionId(sessionId string) (*User, error)
}
type AuthServiceImpl struct {
dbAuth db.AuthDb
randomGenerator RandomService
clock ClockService
mailService MailService
serverSettings *types.ServerSettings
type AuthImpl struct {
db db.Auth
random Random
clock Clock
mail Mail
serverSettings *types.Settings
}
func NewAuthServiceImpl(dbAuth db.AuthDb, randomGenerator RandomService, clock ClockService, mailService MailService, serverSettings *types.ServerSettings) *AuthServiceImpl {
return &AuthServiceImpl{
dbAuth: dbAuth,
randomGenerator: randomGenerator,
clock: clock,
mailService: mailService,
serverSettings: serverSettings,
func NewAuthImpl(db db.Auth, random Random, clock Clock, mail Mail, serverSettings *types.Settings) *AuthImpl {
return &AuthImpl{
db: db,
random: random,
clock: clock,
mail: mail,
serverSettings: serverSettings,
}
}
func (service AuthServiceImpl) SignIn(email string, password string) (*Session, error) {
user, err := service.dbAuth.GetUserByEmail(email)
func (service AuthImpl) SignIn(email string, password string) (*Session, error) {
user, err := service.db.GetUserByEmail(email)
if err != nil {
if errors.Is(err, db.ErrNotFound) {
return nil, ErrInvaidCredentials
@@ -113,13 +113,13 @@ func (service AuthServiceImpl) SignIn(email string, password string) (*Session,
return NewSession(session, NewUser(user)), nil
}
func (service AuthServiceImpl) createSession(userId uuid.UUID) (*db.Session, error) {
sessionId, err := service.randomGenerator.String(32)
func (service AuthImpl) createSession(userId uuid.UUID) (*db.Session, error) {
sessionId, err := service.random.String(32)
if err != nil {
return nil, types.ErrInternal
}
err = service.dbAuth.DeleteOldSessions(userId)
err = service.db.DeleteOldSessions(userId)
if err != nil {
return nil, types.ErrInternal
@@ -127,7 +127,7 @@ func (service AuthServiceImpl) createSession(userId uuid.UUID) (*db.Session, err
session := db.NewSession(sessionId, userId, service.clock.Now())
err = service.dbAuth.InsertSession(session)
err = service.db.InsertSession(session)
if err != nil {
return nil, types.ErrInternal
}
@@ -135,7 +135,7 @@ func (service AuthServiceImpl) createSession(userId uuid.UUID) (*db.Session, err
return session, nil
}
func (service AuthServiceImpl) SignUp(email string, password string) (*User, error) {
func (service AuthImpl) SignUp(email string, password string) (*User, error) {
_, err := mail.ParseAddress(email)
if err != nil {
return nil, ErrInvalidEmail
@@ -145,12 +145,12 @@ func (service AuthServiceImpl) SignUp(email string, password string) (*User, err
return nil, ErrInvalidPassword
}
userId, err := service.randomGenerator.UUID()
userId, err := service.random.UUID()
if err != nil {
return nil, types.ErrInternal
}
salt, err := service.randomGenerator.Bytes(16)
salt, err := service.random.Bytes(16)
if err != nil {
return nil, types.ErrInternal
}
@@ -159,7 +159,7 @@ func (service AuthServiceImpl) SignUp(email string, password string) (*User, err
dbUser := db.NewUser(userId, email, false, nil, false, hash, salt, service.clock.Now())
err = service.dbAuth.InsertUser(dbUser)
err = service.db.InsertUser(dbUser)
if err != nil {
if err == db.ErrUserExists {
return nil, ErrAccountExists
@@ -171,9 +171,9 @@ func (service AuthServiceImpl) SignUp(email string, password string) (*User, err
return NewUser(dbUser), nil
}
func (service AuthServiceImpl) SendVerificationMail(userId uuid.UUID, email string) {
func (service AuthImpl) SendVerificationMail(userId uuid.UUID, email string) {
tokens, err := service.dbAuth.GetTokensByUserIdAndType(userId, db.TokenTypeEmailVerify)
tokens, err := service.db.GetTokensByUserIdAndType(userId, db.TokenTypeEmailVerify)
if err != nil {
return
}
@@ -185,14 +185,14 @@ func (service AuthServiceImpl) SendVerificationMail(userId uuid.UUID, email stri
}
if token == nil {
newTokenStr, err := service.randomGenerator.String(32)
newTokenStr, err := service.random.String(32)
if err != nil {
return
}
token = db.NewToken(userId, newTokenStr, db.TokenTypeEmailVerify, service.clock.Now(), service.clock.Now().Add(24*time.Hour))
err = service.dbAuth.InsertToken(token)
err = service.db.InsertToken(token)
if err != nil {
return
}
@@ -205,21 +205,21 @@ func (service AuthServiceImpl) SendVerificationMail(userId uuid.UUID, email stri
return
}
service.mailService.SendMail(email, "Welcome to ME-FIT", w.String())
service.mail.SendMail(email, "Welcome to ME-FIT", w.String())
}
func (service AuthServiceImpl) VerifyUserEmail(tokenStr string) error {
func (service AuthImpl) VerifyUserEmail(tokenStr string) error {
if tokenStr == "" {
return types.ErrInternal
}
token, err := service.dbAuth.GetToken(tokenStr)
token, err := service.db.GetToken(tokenStr)
if err != nil {
return types.ErrInternal
}
user, err := service.dbAuth.GetUser(token.UserId)
user, err := service.db.GetUser(token.UserId)
if err != nil {
return types.ErrInternal
}
@@ -237,31 +237,31 @@ func (service AuthServiceImpl) VerifyUserEmail(tokenStr string) error {
user.EmailVerified = true
user.EmailVerifiedAt = &now
err = service.dbAuth.UpdateUser(user)
err = service.db.UpdateUser(user)
if err != nil {
return types.ErrInternal
}
_ = service.dbAuth.DeleteToken(token.Token)
_ = service.db.DeleteToken(token.Token)
return nil
}
func (service AuthServiceImpl) SignOut(sessionId string) error {
func (service AuthImpl) SignOut(sessionId string) error {
return service.dbAuth.DeleteSession(sessionId)
return service.db.DeleteSession(sessionId)
}
func (service AuthServiceImpl) GetUserFromSessionId(sessionId string) (*User, error) {
func (service AuthImpl) GetUserFromSessionId(sessionId string) (*User, error) {
if sessionId == "" {
return nil, ErrSessionIdInvalid
}
session, err := service.dbAuth.GetSession(sessionId)
session, err := service.db.GetSession(sessionId)
if err != nil {
return nil, types.ErrInternal
}
user, err := service.dbAuth.GetUser(session.UserId)
user, err := service.db.GetUser(session.UserId)
if err != nil {
return nil, types.ErrInternal
}
@@ -273,19 +273,19 @@ func (service AuthServiceImpl) GetUserFromSessionId(sessionId string) (*User, er
}
}
func (service AuthServiceImpl) DeleteAccount(user *User) error {
func (service AuthImpl) DeleteAccount(user *User) error {
err := service.dbAuth.DeleteUser(user.Id)
err := service.db.DeleteUser(user.Id)
if err != nil {
return err
}
go service.mailService.SendMail(user.Email, "Account deleted", "Your account has been deleted")
go service.mail.SendMail(user.Email, "Account deleted", "Your account has been deleted")
return nil
}
func (service AuthServiceImpl) ChangePassword(user *User, currPass, newPass string) error {
func (service AuthImpl) ChangePassword(user *User, currPass, newPass string) error {
if !isPasswordValid(newPass) {
return ErrInvalidPassword
@@ -300,7 +300,7 @@ func (service AuthServiceImpl) ChangePassword(user *User, currPass, newPass stri
return err
}
userDb, err := service.dbAuth.GetUser(user.Id)
userDb, err := service.db.GetUser(user.Id)
if err != nil {
return err
}
@@ -309,7 +309,7 @@ func (service AuthServiceImpl) ChangePassword(user *User, currPass, newPass stri
userDb.Password = newHash
err = service.dbAuth.UpdateUser(userDb)
err = service.db.UpdateUser(userDb)
if err != nil {
return err
}
@@ -317,14 +317,14 @@ func (service AuthServiceImpl) ChangePassword(user *User, currPass, newPass stri
return nil
}
func (service AuthServiceImpl) SendForgotPasswordMail(email string) error {
func (service AuthImpl) SendForgotPasswordMail(email string) error {
tokenStr, err := service.randomGenerator.String(32)
tokenStr, err := service.random.String(32)
if err != nil {
return err
}
user, err := service.dbAuth.GetUserByEmail(email)
user, err := service.db.GetUserByEmail(email)
if err != nil {
if err == db.ErrNotFound {
return nil
@@ -335,7 +335,7 @@ func (service AuthServiceImpl) SendForgotPasswordMail(email string) error {
token := db.NewToken(user.Id, tokenStr, db.TokenTypePasswordReset, service.clock.Now(), service.clock.Now().Add(15*time.Minute))
err = service.dbAuth.InsertToken(token)
err = service.db.InsertToken(token)
if err != nil {
return types.ErrInternal
}
@@ -346,28 +346,28 @@ func (service AuthServiceImpl) SendForgotPasswordMail(email string) error {
log.Error("Could not render reset password email: %v", err)
return types.ErrInternal
}
go service.mailService.SendMail(email, "Reset Password", mail.String())
go service.mail.SendMail(email, "Reset Password", mail.String())
return nil
}
func (service AuthServiceImpl) ForgotPassword(tokenStr string, newPass string) error {
func (service AuthImpl) ForgotPassword(tokenStr string, newPass string) error {
if !isPasswordValid(newPass) {
return ErrInvalidPassword
}
token, err := service.dbAuth.GetToken(tokenStr)
token, err := service.db.GetToken(tokenStr)
if err != nil {
return err
}
err = service.dbAuth.DeleteToken(tokenStr)
err = service.db.DeleteToken(tokenStr)
if err != nil {
return err
}
user, err := service.dbAuth.GetUser(token.UserId)
user, err := service.db.GetUser(token.UserId)
if err != nil {
log.Error("Could not get user from token: %v", err)
return types.ErrInternal
@@ -376,7 +376,7 @@ func (service AuthServiceImpl) ForgotPassword(tokenStr string, newPass string) e
passHash := GetHashPassword(newPass, user.Salt)
user.Password = passHash
err = service.dbAuth.UpdateUser(user)
err = service.db.UpdateUser(user)
if err != nil {
return err
}