chore(deps): remove dependencies from handler package

db/auth.go

@@ -13,9 +13,8 @@ import (
 )
 
 var (
-	ErrUserNotFound    = errors.New("User not found")
+	ErrNotFound   = errors.New("value not found")
-	ErrUserExists      = errors.New("User already exists")
+	ErrUserExists = errors.New("user already exists")
-	ErrSessionNotFound = errors.New("Session not found")
 )
 
 type User struct {
@@ -56,20 +55,44 @@ func NewSession(id string, userId uuid.UUID, createdAt time.Time) *Session {
 	}
 }
 
+type Token struct {
+	UserId    uuid.UUID
+	Token     string
+	Type      string
+	CreatedAt time.Time
+	ExpiresAt time.Time
+}
+
+func NewToken(userId uuid.UUID, token string, tokenType string, createdAt time.Time, expiresAt time.Time) *Token {
+	return &Token{
+		UserId:    userId,
+		Token:     token,
+		Type:      tokenType,
+		CreatedAt: createdAt,
+		ExpiresAt: expiresAt,
+	}
+}
+
 type AuthDb interface {
 	InsertUser(user *User) error
+	UpdateUser(user *User) error
 	GetUser(email string) (*User, error)
 	GetUserById(userId uuid.UUID) (*User, error)
 	DeleteUser(userId uuid.UUID) error
 	UpdateUserPassword(userId uuid.UUID, newHash []byte) error
 
 	InsertEmailVerificationToken(userId uuid.UUID, token string) error
+	InsertForgotPasswordToken(email string, token string) error
 	GetEmailVerificationToken(userId uuid.UUID) (string, error)
+	GetToken(token string) (*Token, error)
+	DeleteToken(token string) error
+
+	VerifyEmail(token string) error
 
 	InsertSession(session *Session) error
 	GetSession(sessionId string) (*Session, error)
-	DeleteOldSessions(userId uuid.UUID) error
 	DeleteSession(sessionId string) error
+	DeleteOldSessions(userId uuid.UUID) error
 }
 
 type AuthDbSqlite struct {
@@ -98,6 +121,21 @@ func (db AuthDbSqlite) InsertUser(user *User) error {
 	return nil
 }
 
+func (db AuthDbSqlite) UpdateUser(user *User) error {
+	_, err := db.db.Exec(`
+		UPDATE user 
+		SET email_verified = ?, email_verified_at = ?, password = ?
+		WHERE user_uuid = ?`,
+		user.EmailVerified, user.EmailVerifiedAt, user.Password, user.Id)
+
+	if err != nil {
+		utils.LogError("SQL error UpdateUser", err)
+		return types.ErrInternal
+	}
+
+	return nil
+}
+
 func (db AuthDbSqlite) GetUser(email string) (*User, error) {
 	var (
 		userId          uuid.UUID
@@ -115,7 +153,7 @@ func (db AuthDbSqlite) GetUser(email string) (*User, error) {
 		WHERE email = ?`, email).Scan(&userId, &emailVerified, &emailVerifiedAt, &password, &salt, &createdAt)
 	if err != nil {
 		if err == sql.ErrNoRows {
-			return nil, ErrUserNotFound
+			return nil, ErrNotFound
 		} else {
 			utils.LogError("SQL error GetUser", err)
 			return nil, types.ErrInternal
@@ -142,7 +180,7 @@ func (db AuthDbSqlite) GetUserById(userId uuid.UUID) (*User, error) {
 		WHERE user_uuid = ?`, userId).Scan(&email, &emailVerified, &emailVerifiedAt, &password, &salt, &createdAt)
 	if err != nil {
 		if err == sql.ErrNoRows {
-			return nil, ErrUserNotFound
+			return nil, ErrNotFound
 		} else {
 			utils.LogError("SQL error GetUser", err)
 			return nil, types.ErrInternal
@@ -236,6 +274,51 @@ func (db AuthDbSqlite) GetEmailVerificationToken(userId uuid.UUID) (string, erro
 	return token, nil
 }
 
+func (db AuthDbSqlite) GetToken(token string) (*Token, error) {
+	var (
+		userId       uuid.UUID
+		tokenType    string
+		createdAtStr string
+		expiresAtStr string
+		createdAt    time.Time
+		expiresAt    time.Time
+	)
+
+	err := db.db.QueryRow(`
+		SELECT user_uuid, type, created_at, expires_at 
+		FROM user_token 
+		WHERE token = ? 
+		AND type = 'email_verify'`, token).Scan(&userId, &tokenType, &createdAtStr, &expiresAtStr)
+
+	if err != nil && err != sql.ErrNoRows {
+		utils.LogError("Could not get token", err)
+		return nil, types.ErrInternal
+	}
+
+	createdAt, err = time.Parse(time.RFC3339, createdAtStr)
+	if err != nil {
+		utils.LogError("Could not parse token.created_at", err)
+		return nil, types.ErrInternal
+	}
+
+	expiresAt, err = time.Parse(time.RFC3339, expiresAtStr)
+	if err != nil {
+		utils.LogError("Could not parse token.expires_at", err)
+		return nil, types.ErrInternal
+	}
+
+	return NewToken(userId, token, tokenType, createdAt, expiresAt), nil
+}
+
+func (db AuthDbSqlite) DeleteToken(token string) error {
+	_, err := db.db.Exec("DELETE FROM user_token WHERE token = ?", token)
+	if err != nil {
+		utils.LogError("Could not delete token", err)
+		return types.ErrInternal
+	}
+	return nil
+}
+
 func (db AuthDbSqlite) InsertSession(session *Session) error {
 
 	_, err := db.db.Exec(`
@@ -264,7 +347,7 @@ func (db AuthDbSqlite) GetSession(sessionId string) (*Session, error) {
 			WHERE session_id = ?`, sessionId).Scan(&userId, &sessionCreatedAt)
 
 	if err != nil {
-		return nil, ErrSessionNotFound
+		return nil, ErrNotFound
 	}
 
 	return NewSession(sessionId, userId, sessionCreatedAt), nil
@@ -292,3 +375,61 @@ func (db AuthDbSqlite) DeleteSession(sessionId string) error {
 
 	return nil
 }
+
+func (db AuthDbSqlite) VerifyEmail(token string) error {
+
+	result, err := db.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)
+		return types.ErrInternal
+	}
+
+	i, err := result.RowsAffected()
+	if err != nil {
+		utils.LogError("Could not get rows affected on verify response", err)
+		return types.ErrInternal
+	}
+
+	if i == 0 {
+		return types.ErrInternal
+	}
+
+	return nil
+}
+
+func (db AuthDbSqlite) InsertForgotPasswordToken(email string, token string) error {
+
+	res, err := db.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)
+		return types.ErrInternal
+	}
+
+	i, err := res.RowsAffected()
+	if err != nil {
+		utils.LogError("Could not get rows affected", err)
+		return types.ErrInternal
+	}
+
+	if i == 0 {
+		return ErrNotFound
+	}
+
+	return nil
+}

db/auth_test.go

@@ -38,7 +38,7 @@ func TestUser(t *testing.T) {
 		underTest := AuthDbSqlite{db: db}
 
 		_, err := underTest.GetUser("someNonExistentEmail")
-		assert.Equal(t, ErrUserNotFound, err)
+		assert.Equal(t, ErrNotFound, err)
 	})
 
 	t.Run("should insert and get user", func(t *testing.T) {

handler/auth.go

@@ -7,9 +7,9 @@ import (
 	"me-fit/types"
 	"me-fit/utils"
 
-	"database/sql"
 	"errors"
 	"net/http"
+	"net/url"
 	"time"
 )
 
@@ -18,14 +18,12 @@ type HandlerAuth interface {
 }
 
 type HandlerAuthImpl struct {
-	db             *sql.DB
 	service        service.AuthService
 	serverSettings *types.ServerSettings
 }
 
-func NewHandlerAuth(db *sql.DB, service service.AuthService, serverSettings *types.ServerSettings) HandlerAuth {
+func NewHandlerAuth(service service.AuthService, serverSettings *types.ServerSettings) HandlerAuth {
 	return HandlerAuthImpl{
-		db:             db,
 		service:        service,
 		serverSettings: serverSettings,
 	}
@@ -37,7 +35,7 @@ func (handler HandlerAuthImpl) Handle(router *http.ServeMux) {
 	router.Handle("/auth/signup", handler.handleSignUpPage())
 	router.Handle("/auth/verify", handler.handleSignUpVerifyPage()) // Hint for the user to verify their email
 	router.Handle("/auth/delete-account", handler.handleDeleteAccountPage())
-	router.Handle("/auth/verify-email", service.HandleSignUpVerifyResponsePage(handler.db)) // The link contained in the email
+	router.Handle("/auth/verify-email", handler.HandleSignUpVerifyResponsePage()) // The link contained in the email
 	router.Handle("/auth/change-password", handler.handleChangePasswordPage())
 	router.Handle("/auth/reset-password", handler.handleResetPasswordPage())
 	router.Handle("/api/auth/signup", handler.handleSignUp())
@@ -46,8 +44,8 @@ func (handler HandlerAuthImpl) Handle(router *http.ServeMux) {
 	router.Handle("/api/auth/delete-account", handler.HandleDeleteAccountComp())
 	router.Handle("/api/auth/verify-resend", handler.HandleVerifyResendComp())
 	router.Handle("/api/auth/change-password", handler.HandleChangePasswordComp())
-	router.Handle("/api/auth/reset-password", service.HandleResetPasswordComp(handler.db, handler.serverSettings))
+	router.Handle("/api/auth/reset-password", handler.HandleForgotPasswordComp())
-	router.Handle("/api/auth/reset-password-actual", service.HandleActualResetPasswordComp(handler.db))
+	router.Handle("/api/auth/reset-password-actual", handler.HandleForgotPasswordResponseComp())
 }
 
 var (
@@ -356,3 +354,63 @@ func (handler HandlerAuthImpl) HandleChangePasswordComp() http.HandlerFunc {
 		utils.TriggerToast(w, r, "success", "Password changed")
 	}
 }
+
+func (handler HandlerAuthImpl) HandleSignUpVerifyResponsePage() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+
+		token := r.URL.Query().Get("token")
+
+		err := handler.service.VerifyUserEmail(token)
+
+		if err != nil {
+			utils.DoRedirect(w, r, "/auth/signin")
+		} else {
+			utils.DoRedirect(w, r, "/")
+		}
+	}
+}
+
+func (handler HandlerAuthImpl) HandleForgotPasswordComp() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+
+		email := r.FormValue("email")
+		if email == "" {
+			utils.TriggerToast(w, r, "error", "Please enter an email")
+			return
+		}
+
+		err := handler.service.ForgotPassword(email)
+		if err != nil {
+			utils.TriggerToast(w, r, "error", "Internal Server Error")
+		} else {
+			utils.TriggerToast(w, r, "info", "If the email exists, an email has been sent")
+		}
+	}
+}
+
+func (handler HandlerAuthImpl) HandleForgotPasswordResponseComp() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+
+		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")
+
+		err = handler.service.ForgotPasswordResponse(token, newPass)
+		if err != nil {
+			utils.TriggerToast(w, r, "error", err.Error())
+		} else {
+			utils.TriggerToast(w, r, "success", "Password changed")
+		}
+	}
+}

handler/index_and_404.go

@@ -6,7 +6,6 @@ import (
 	"me-fit/types"
 	"me-fit/utils"
 
-	"database/sql"
 	"net/http"
 
 	"github.com/a-h/templ"
@@ -17,14 +16,12 @@ type IndexHandler interface {
 }
 
 type IndexHandlerImpl struct {
-	db             *sql.DB
 	service        service.AuthService
 	serverSettings *types.ServerSettings
 }
 
-func NewIndexHandler(db *sql.DB, service service.AuthService, serverSettings *types.ServerSettings) IndexHandler {
+func NewIndexHandler(service service.AuthService, serverSettings *types.ServerSettings) IndexHandler {
 	return IndexHandlerImpl{
-		db:             db,
 		service:        service,
 		serverSettings: serverSettings,
 	}

handler/workout.go

@@ -7,7 +7,6 @@ import (
 	"me-fit/types"
 	"me-fit/utils"
 
-	"database/sql"
 	"log/slog"
 	"net/http"
 	"strconv"
@@ -19,15 +18,13 @@ type WorkoutHandler interface {
 }
 
 type WorkoutHandlerImpl struct {
-	db             *sql.DB
 	service        service.WorkoutService
 	auth           service.AuthService
 	serverSettings *types.ServerSettings
 }
 
-func NewWorkoutHandler(db *sql.DB, service service.WorkoutService, auth service.AuthService, serverSettings *types.ServerSettings) WorkoutHandler {
+func NewWorkoutHandler(service service.WorkoutService, auth service.AuthService, serverSettings *types.ServerSettings) WorkoutHandler {
 	return WorkoutHandlerImpl{
-		db:             db,
 		service:        service,
 		auth:           auth,
 		serverSettings: serverSettings,

main.go

@@ -115,9 +115,9 @@ func createHandler(d *sql.DB, serverSettings *types.ServerSettings) http.Handler
 	authService := service.NewAuthServiceImpl(authDb, randomService, clockService, mailService, serverSettings)
 	workoutService := service.NewWorkoutServiceImpl(workoutDb, randomService, clockService, mailService, serverSettings)
 
-	indexHandler := handler.NewIndexHandler(d, authService, serverSettings)
+	indexHandler := handler.NewIndexHandler(authService, serverSettings)
-	authHandler := handler.NewHandlerAuth(d, authService, serverSettings)
+	authHandler := handler.NewHandlerAuth(authService, serverSettings)
-	workoutHandler := handler.NewWorkoutHandler(d, workoutService, authService, serverSettings)
+	workoutHandler := handler.NewWorkoutHandler(workoutService, authService, serverSettings)
 
 	indexHandler.Handle(router)
 

service/auth.go

@@ -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 {
+func (service AuthServiceImpl) ForgotPassword(email string) error {
-	return func(w http.ResponseWriter, r *http.Request) {
 
-		pageUrl, err := url.Parse(r.Header.Get("HX-Current-URL"))
+	token, err := service.randomGenerator.String(32)
 	if err != nil {
-			utils.LogError("Could not get current URL", err)
+		return err
-			utils.TriggerToast(w, r, "error", "Internal Server Error")
-			return
 	}
 
-		token := pageUrl.Query().Get("token")
+	err = service.dbAuth.InsertForgotPasswordToken(email, token)
-		if token == "" {
-			utils.TriggerToast(w, r, "error", "No token")
-			return
-		}
 
-		newPass := r.FormValue("new-password")
+	if err != db.ErrNotFound {
-
-		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")
-	}
-}
-
-func HandleResetPasswordComp(db *sql.DB, serverSettings *types.ServerSettings) http.HandlerFunc {
-	mailService := NewMailServiceImpl(serverSettings)
-	return func(w http.ResponseWriter, r *http.Request) {
-
-		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)
+		err = mailTemplate.ResetPassword(service.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 types.ErrInternal
-				return
 		}
-			mailService.SendMail(email, "Reset Password", mail.String())
+		service.mailService.SendMail(email, "Reset Password", mail.String())
 	}
 
-		utils.TriggerToast(w, r, "info", "If the email exists, an email has been sent")
+	return nil
+}
+
+func (service AuthServiceImpl) ForgotPasswordResponse(tokenStr string, newPass string) error {
+
+	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 {

service/auth_test.go

@@ -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)

template/layout.templ

@@ -1,32 +1,33 @@
 package template
 
 templ Layout(slot templ.Component, user templ.Component, environment string) {
-<!DOCTYPE html>
+	<!DOCTYPE html>
-<html lang="en">
+	<html lang="en">
-
+		<head>
-<head>
+			<meta charset="utf-8"/>
-	<meta charset="utf-8" />
 			<title>ME-FIT</title>
-	<link rel="icon" href="/static/favicon.svg" />
+			<link rel="icon" href="/static/favicon.svg"/>
-	<link rel="stylesheet" href="/static/css/tailwind.css" />
+			<link rel="stylesheet" href="/static/css/tailwind.css"/>
-	<meta name="viewport" content="width=device-width, initial-scale=1" />
+			<meta name="viewport" content="width=device-width, initial-scale=1"/>
 			if environment == "prod" {
 				<script defer src="https://umami.me-fit.eu/script.js" data-website-id="3c8efb09-44e4-4372-8a1e-c3bc675cd89a"></script>
 			}
-	<meta name="htmx-config" content='{
+			<meta
+				name="htmx-config"
+				content='{
 					"includeIndicatorStyles": false,
 					"selfRequestsOnly": true,
 					"allowScriptTags": false
-	}' />
+				}'
+			/>
 			<script src="/static/js/htmx.min.js"></script>
 			<script src="/static/js/toast.js"></script>
-</head>
+		</head>
-
+		<body>
-<body>
 			<div class="h-screen flex flex-col">
 				<div class="flex justify-end items-center gap-2 py-1 px-2 h-12 md:gap-10 md:px-10 md:py-2 shadow">
 					<a href="/" class="flex-1 flex gap-2">
-				<img src="/static/favicon.svg" alt="ME-FIT logo" />
+						<img src="/static/favicon.svg" alt="ME-FIT logo"/>
 						<span>ME-FIT</span>
 					</a>
 					@user
@@ -42,7 +43,6 @@ templ Layout(slot templ.Component, user templ.Component, environment string) {
 					New message arrived.
 				</div>
 			</div>
-</body>
+		</body>
-
+	</html>
-</html>
 }