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

chore(deps): remove dependencies from handler package

Browse Source
This commit is contained in:
Tim Wundenberg
2024-12-01 21:50:22 +01:00
parent 48ec7b64ac
commit 7c67720621
9 changed files with 326 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

215
service/auth.go
View File

@@ -3,18 +3,14 @@ package service
import (
"context"
"crypto/subtle"
"database/sql"
"errors"
"log/slog"
"net/http"
"net/mail"
"net/url"
"strings"
"time"
"me-fit/db"
"me-fit/template/auth"
tempMail "me-fit/template/mail"
mailTemplate "me-fit/template/mail"
"me-fit/types"
"me-fit/utils"
@@ -63,9 +59,12 @@ type AuthService interface {
SignIn(email string, password string) (*Session, error)
SignUp(email string, password string) (*User, error)
SendVerificationMail(userId uuid.UUID, email string)
VerifyUserEmail(token string) error
SignOut(sessionId string) error
DeleteAccount(user *User) error
ChangePassword(user *User, currPass, newPass string) error
ForgotPassword(email string) error
ForgotPasswordResponse(token string, newPass string) error
GetUserFromSessionId(sessionId string) (*User, error)
}
@@ -91,7 +90,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)
if err != nil {
if errors.Is(err, db.ErrUserNotFound) {
if errors.Is(err, db.ErrNotFound) {
return nil, ErrInvaidCredentials
} else {
return nil, types.ErrInternal
@@ -119,6 +118,7 @@ func (service AuthServiceImpl) createSession(userId uuid.UUID) (*db.Session, err
}
err = service.dbAuth.DeleteOldSessions(userId)
if err != nil {
return nil, types.ErrInternal
}
@@ -190,7 +190,7 @@ func (service AuthServiceImpl) SendVerificationMail(userId uuid.UUID, email stri
}
var w strings.Builder
err = tempMail.Register(service.serverSettings.BaseUrl, token).Render(context.Background(), &w)
err = mailTemplate.Register(service.serverSettings.BaseUrl, token).Render(context.Background(), &w)
if err != nil {
utils.LogError("Could not render welcome email", err)
return
@@ -199,6 +199,15 @@ 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 {
if token == "" {
return types.ErrInternal
}
return service.dbAuth.VerifyEmail(token)
}
func (service AuthServiceImpl) SignOut(sessionId string) error {
return service.dbAuth.DeleteSession(sessionId)
@@ -228,48 +237,6 @@ func (service AuthServiceImpl) GetUserFromSessionId(sessionId string) (*User, er
// TODO
func HandleSignUpVerifyResponsePage(db *sql.DB) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
token := r.URL.Query().Get("token")
if token == "" {
utils.DoRedirect(w, r, "/auth/verify")
return
}
result, err := db.Exec(`
UPDATE user
SET email_verified = true, email_verified_at = datetime()
WHERE user_uuid = (
SELECT user_uuid
FROM user_token
WHERE type = "email_verify"
AND token = ?
);
`, token)
if err != nil {
utils.LogError("Could not update user on verify response", err)
http.Error(w, "Internal Server Error", http.StatusInternalServerError)
return
}
i, err := result.RowsAffected()
if err != nil {
utils.LogError("Could not get rows affected on verify response", err)
http.Error(w, "Internal Server Error", http.StatusInternalServerError)
return
}
if i == 0 {
utils.DoRedirect(w, r, "/")
} else {
utils.DoRedirect(w, r, "/auth/signin")
}
}
}
func UserInfoComp(user *User) templ.Component {
if user != nil {
@@ -321,115 +288,59 @@ func (service AuthServiceImpl) ChangePassword(user *User, currPass, newPass stri
return nil
}
func HandleActualResetPasswordComp(db *sql.DB) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
func (service AuthServiceImpl) ForgotPassword(email string) error {
pageUrl, err := url.Parse(r.Header.Get("HX-Current-URL"))
if err != nil {
utils.LogError("Could not get current URL", err)
utils.TriggerToast(w, r, "error", "Internal Server Error")
return
}
token := pageUrl.Query().Get("token")
if token == "" {
utils.TriggerToast(w, r, "error", "No token")
return
}
newPass := r.FormValue("new-password")
if !isPasswordValid(newPass) {
utils.TriggerToast(w, r, "error", ErrInvalidPassword.Error())
return
}
var (
userId uuid.UUID
salt []byte
)
err = db.QueryRow(`
SELECT u.user_uuid, salt
FROM user_token t
INNER JOIN user u ON t.user_uuid = u.user_uuid
WHERE t.token = ?
AND t.type = 'password_reset'
AND t.expires_at > datetime()
`, token).Scan(&userId, &salt)
if err != nil {
slog.Warn("Could not get user from token: " + err.Error())
utils.TriggerToast(w, r, "error", "Invalid token")
return
}
_, err = db.Exec("DELETE FROM user_token WHERE token = ? AND type = 'password_reset'", token)
if err != nil {
utils.LogError("Could not delete token", err)
utils.TriggerToast(w, r, "error", "Internal Server Error")
return
}
passHash := GetHashPassword(newPass, salt)
_, err = db.Exec("UPDATE user SET password = ? WHERE user_uuid = ?", passHash, userId)
if err != nil {
utils.LogError("Could not update password", err)
utils.TriggerToast(w, r, "error", "Internal Server Error")
return
}
utils.TriggerToast(w, r, "success", "Password changed")
token, 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)
return types.ErrInternal
}
service.mailService.SendMail(email, "Reset Password", mail.String())
}
return nil
}
func HandleResetPasswordComp(db *sql.DB, serverSettings *types.ServerSettings) http.HandlerFunc {
mailService := NewMailServiceImpl(serverSettings)
return func(w http.ResponseWriter, r *http.Request) {
func (service AuthServiceImpl) ForgotPasswordResponse(tokenStr string, newPass string) error {
email := r.FormValue("email")
if email == "" {
utils.TriggerToast(w, r, "error", "Please enter an email")
return
}
token, err := NewRandomServiceImpl().String(32)
if err != nil {
return
}
res, err := db.Exec(`
INSERT INTO user_token (user_uuid, type, token, created_at, expires_at)
SELECT user_uuid, 'password_reset', ?, datetime(), datetime('now', '+15 minute')
FROM user
WHERE email = ?
`, token, email)
if err != nil {
utils.LogError("Could not insert token", err)
utils.TriggerToast(w, r, "error", "Internal Server Error")
return
}
i, err := res.RowsAffected()
if err != nil {
utils.LogError("Could not get rows affected", err)
utils.TriggerToast(w, r, "error", "Internal Server Error")
return
}
if i != 0 {
var mail strings.Builder
err = tempMail.ResetPassword(serverSettings.BaseUrl, token).Render(context.Background(), &mail)
if err != nil {
utils.LogError("Could not render reset password email", err)
utils.TriggerToast(w, r, "error", "Internal Server Error")
return
}
mailService.SendMail(email, "Reset Password", mail.String())
}
utils.TriggerToast(w, r, "info", "If the email exists, an email has been sent")
if !isPasswordValid(newPass) {
return ErrInvalidPassword
}
token, err := service.dbAuth.GetToken(tokenStr)
if err != nil {
return err
}
err = service.dbAuth.DeleteToken(tokenStr)
if err != nil {
return err
}
user, err := service.dbAuth.GetUserById(token.UserId)
if err != nil {
utils.LogError("Could not get user from token", err)
return types.ErrInternal
}
passHash := GetHashPassword(newPass, user.Salt)
user.Password = passHash
err = service.dbAuth.UpdateUser(user)
if err != nil {
return err
}
return nil
}
func GetHashPassword(password string, salt []byte) []byte {

2
service/auth_test.go
View File

@@ -86,7 +86,7 @@ func TestSignIn(t *testing.T) {
t.Parallel()
mockAuthDb := mocks.NewMockAuthDb(t)
mockAuthDb.EXPECT().GetUser("test").Return(nil, db.ErrUserNotFound)
mockAuthDb.EXPECT().GetUser("test").Return(nil, db.ErrNotFound)
mockRandom := mocks.NewMockRandomService(t)
mockClock := mocks.NewMockClockService(t)
mockMail := mocks.NewMockMailService(t)