feat: #337 unify types for auth module

handler/auth.go

@@ -77,11 +77,11 @@ func (handler AuthImpl) handleSignInPage() http.HandlerFunc {
 
 func (handler AuthImpl) handleSignIn() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		user, err := utils.WaitMinimumTime(securityWaitDuration, func() (*service.User, error) {
+		user, err := utils.WaitMinimumTime(securityWaitDuration, func() (*types.User, error) {
 			var email = r.FormValue("email")
 			var password = r.FormValue("password")
 
-			session, err := handler.service.SignIn(email, password)
+			session, user, err := handler.service.SignIn(email, password)
 			if err != nil {
 				return nil, err
 			}
@@ -89,7 +89,7 @@ func (handler AuthImpl) handleSignIn() http.HandlerFunc {
 			cookie := middleware.CreateSessionCookie(session.Id)
 			http.SetCookie(w, &cookie)
 
-			return session.User, nil
+			return user, nil
 		})
 
 		if err != nil {
@@ -294,7 +294,8 @@ func (handler AuthImpl) handleChangePasswordComp() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 
 		session := middleware.GetSession(r)
-		if session == nil || session.User == nil {
+		user := middleware.GetUser(r)
+		if session == nil || user == nil {
 			utils.DoRedirect(w, r, "/auth/signin")
 			return
 		}
@@ -302,7 +303,7 @@ func (handler AuthImpl) handleChangePasswordComp() http.HandlerFunc {
 		currPass := r.FormValue("current-password")
 		newPass := r.FormValue("new-password")
 
-		err := handler.service.ChangePassword(session, currPass, newPass)
+		err := handler.service.ChangePassword(user, session.Id, currPass, newPass)
 		if err != nil {
 			utils.TriggerToast(w, r, "error", "Password not correct", http.StatusUnauthorized)
 			return

handler/index_and_404.go

@@ -32,11 +32,7 @@ func (handler IndexImpl) Handle(router *http.ServeMux) {
 
 func (handler IndexImpl) handleIndexAnd404() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session := middleware.GetSession(r)
-		var user *service.User
-		if session != nil {
-			user = session.User
-		}
+		user := middleware.GetUser(r)
 
 		var comp templ.Component
 

handler/middleware/authenticate.go

@@ -2,24 +2,29 @@ package middleware
 
 import (
 	"context"
+	"net/http"
 
 	"me-fit/service"
-
-	"net/http"
+	"me-fit/types"
 )
 
 type ContextKey string
 
 var SessionKey ContextKey = "session"
+var UserKey ContextKey = "user"
 
 func Authenticate(service service.Auth) func(http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			ctx := r.Context()
+
 			sessionId := getSessionID(r)
-			session, _ := service.SignInSession(sessionId)
+			session, user, _ := service.SignInSession(sessionId)
 
 			if session != nil {
-				ctx := context.WithValue(r.Context(), SessionKey, session)
+
+				ctx = context.WithValue(ctx, UserKey, user)
+				ctx = context.WithValue(ctx, SessionKey, session)
 
 				next.ServeHTTP(w, r.WithContext(ctx))
 			} else {
@@ -29,23 +34,22 @@ func Authenticate(service service.Auth) func(http.Handler) http.Handler {
 	}
 }
 
-func GetUser(r *http.Request) *service.User {
-
-	session := GetSession(r)
-	if session == nil {
+func GetUser(r *http.Request) *types.User {
+	obj := r.Context().Value(UserKey)
+	if obj == nil {
 		return nil
 	}
 
-	return session.User
+	return obj.(*types.User)
 }
 
-func GetSession(r *http.Request) *service.Session {
+func GetSession(r *http.Request) *types.Session {
 	obj := r.Context().Value(SessionKey)
 	if obj == nil {
 		return nil
 	}
 
-	return obj.(*service.Session)
+	return obj.(*types.Session)
 }
 
 func getSessionID(r *http.Request) string {

handler/middleware/cross_site_request_forgery.go

@@ -6,15 +6,16 @@ import (
 	"strings"
 
 	"me-fit/service"
+	"me-fit/types"
 )
 
 type csrfResponseWriter struct {
 	http.ResponseWriter
 	auth    service.Auth
-	session *service.Session
+	session *types.Session
 }
 
-func newCsrfResponseWriter(w http.ResponseWriter, auth service.Auth, session *service.Session) *csrfResponseWriter {
+func newCsrfResponseWriter(w http.ResponseWriter, auth service.Auth, session *types.Session) *csrfResponseWriter {
 	return &csrfResponseWriter{
 		ResponseWriter: w,
 		auth:           auth,

handler/render.go

@@ -2,7 +2,6 @@ package handler
 
 import (
 	"me-fit/log"
-	"me-fit/service"
 	"me-fit/template"
 	"me-fit/template/auth"
 	"me-fit/types"
@@ -31,14 +30,14 @@ func (render *Render) Render(r *http.Request, w http.ResponseWriter, comp templ.
 	}
 }
 
-func (render *Render) RenderLayout(r *http.Request, w http.ResponseWriter, slot templ.Component, user *service.User) {
+func (render *Render) RenderLayout(r *http.Request, w http.ResponseWriter, slot templ.Component, user *types.User) {
 	userComp := render.getUserComp(user)
 	layout := template.Layout(slot, userComp, render.settings.Environment)
 
 	render.Render(r, w, layout)
 }
 
-func (render *Render) getUserComp(user *service.User) templ.Component {
+func (render *Render) getUserComp(user *types.User) templ.Component {
 
 	if user != nil {
 		return auth.UserComp(user.Email)

handler/workout.go

@@ -38,22 +38,22 @@ func (handler WorkoutImpl) Handle(router *http.ServeMux) {
 
 func (handler WorkoutImpl) handleWorkoutPage() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session := middleware.GetSession(r)
-		if session == nil {
+		user := middleware.GetUser(r)
+		if user == nil {
 			utils.DoRedirect(w, r, "/auth/signin")
 			return
 		}
 
 		currentDate := time.Now().Format("2006-01-02")
 		comp := workout.WorkoutComp(currentDate)
-		handler.render.RenderLayout(r, w, comp, session.User)
+		handler.render.RenderLayout(r, w, comp, user)
 	}
 }
 
 func (handler WorkoutImpl) handleAddWorkout() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session := middleware.GetSession(r)
-		if session == nil {
+		user := middleware.GetUser(r)
+		if user == nil {
 			utils.DoRedirect(w, r, "/auth/signin")
 			return
 		}
@@ -64,7 +64,7 @@ func (handler WorkoutImpl) handleAddWorkout() http.HandlerFunc {
 		var repsStr = r.FormValue("reps")
 
 		wo := service.NewWorkoutDto("", dateStr, typeStr, setsStr, repsStr)
-		wo, err := handler.service.AddWorkout(session.User, wo)
+		wo, err := handler.service.AddWorkout(user, wo)
 		if err != nil {
 			utils.TriggerToast(w, r, "error", "Invalid input values", http.StatusBadRequest)
 			http.Error(w, "Invalid input values", http.StatusBadRequest)
@@ -79,13 +79,13 @@ func (handler WorkoutImpl) handleAddWorkout() http.HandlerFunc {
 
 func (handler WorkoutImpl) handleGetWorkout() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session := middleware.GetSession(r)
-		if session == nil {
+		user := middleware.GetUser(r)
+		if user == nil {
 			utils.DoRedirect(w, r, "/auth/signin")
 			return
 		}
 
-		workouts, err := handler.service.GetWorkouts(session.User)
+		workouts, err := handler.service.GetWorkouts(user)
 		if err != nil {
 			return
 		}
@@ -102,8 +102,8 @@ func (handler WorkoutImpl) handleGetWorkout() http.HandlerFunc {
 
 func (handler WorkoutImpl) handleDeleteWorkout() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		session := middleware.GetSession(r)
-		if session == nil {
+		user := middleware.GetUser(r)
+		if user == nil {
 			utils.DoRedirect(w, r, "/auth/signin")
 			return
 		}
@@ -120,7 +120,7 @@ func (handler WorkoutImpl) handleDeleteWorkout() http.HandlerFunc {
 			return
 		}
 
-		err = handler.service.DeleteWorkout(session.User, rowIdInt)
+		err = handler.service.DeleteWorkout(user, rowIdInt)
 		if err != nil {
 			utils.TriggerToast(w, r, "error", "Internal Server Error", http.StatusInternalServerError)
 			return