refactor: declaring controller methods externally because the big idiot swaggo does not want to work unless the comments are attached to a gin handler func;

fix: swagger docs work now;
chore: remove incomplete account and profile controllers;
fix: correct client info type in request middleware

backend/internal/controllers/account.go

@@ -1,34 +0,0 @@
-// Copyright (c) 2025 Nikolai Papin
-// 
-// This file is part of Easywish
-// 
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-// the GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-package controllers
-
-import (
-	"net/http"
-
-	"github.com/gin-gonic/gin"
-)
-
-//	@Summary	Change account password
-//	@Tags		Account
-//	@Accept		json
-//	@Produce	json
-//	@Security	JWT
-//	@Router		/account/changePassword [put]
-func ChangePassword(c *gin.Context) {
-	c.Status(http.StatusNotImplemented)
-}

backend/internal/controllers/auth.go

@@ -30,258 +30,270 @@ import (
 	"go.uber.org/zap"
 )
 
+type AuthController struct {
+	auth services.AuthService
+	log  *zap.Logger
+}
+
 func NewAuthController(log *zap.Logger, auth services.AuthService) Controller {
+	ctrl := &AuthController{auth: auth, log: log}
+	
 	return &controllerImpl{
 		Path: "/auth",
 		Middleware: []gin.HandlerFunc{},
 		Methods: []ControllerMethod{
-
-			//	@Summary	Register an account
-			//	@Tags		Auth
-			//	@Accept		json
-			//	@Produce	json
-			//	@Param		request	body	models.RegistrationBeginRequest	true	" "
-			//	@Success	200		"Account is created and awaiting verification"
-			//	@Failure	409		"Username or email is already taken"
-			//	@Failure	429		"Too many recent registration attempts for this email"
-			//	@Router		/auth/registrationBegin [post]
 			{
-				HttpMethod: POST,
-				Path: "/registrationBegin", 
+				HttpMethod:   POST,
+				Path:         "/registrationBegin",
 				Authorization: enums.GuestRole,
-				Middleware: []gin.HandlerFunc{},
-				Function: func(c *gin.Context) {
-
-					request, err := GetRequest[models.RegistrationBeginRequest](c); if err != nil {
-						return
-					}
-
-					_, err = auth.RegistrationBegin(request.Body); if err != nil {
-						if errors.Is(err, errs.ErrUsernameTaken) || errors.Is(err, errs.ErrEmailTaken) {
-							c.Status(http.StatusConflict)
-						} else {
-							c.Status(http.StatusInternalServerError)
-						}
-						return
-					}
-
-					c.Status(http.StatusOK)
-					return
-				},
+				Middleware:   []gin.HandlerFunc{},
+				Function:     ctrl.registrationBeginHandler,
 			},
-
-			//	@Summary	Confirm with code, finish creating the account
-			//	@Tags		Auth
-			//	@Accept		json
-			//	@Produce	json
-			//	@Param		request	body		models.RegistrationCompleteRequest	true	" "
-			//	@Success	200		{object}	models.RegistrationCompleteResponse	" "
-			//	@Failure	403		"Invalid email or verification code"
-			//	@Router		/auth/registrationComplete [post]
 			{
-				HttpMethod: POST,
-				Path: "/registrationComplete",
+				HttpMethod:   POST,
+				Path:         "/registrationComplete",
 				Authorization: enums.GuestRole,
-				Middleware: []gin.HandlerFunc{},
-				Function: func(c *gin.Context) {
-
-					request, err := GetRequest[models.RegistrationCompleteRequest](c); if err != nil {
-						return
-					}
-					
-					response, err := auth.RegistrationComplete(request.User, request.Body)
-					
-					if err != nil {
-						if errors.Is(err, errs.ErrForbidden) {
-							c.Status(http.StatusForbidden)
-						} else if errors.Is(err, errs.ErrUnauthorized) {
-							c.Status(http.StatusUnauthorized)
-						} else {
-							c.Status(http.StatusInternalServerError)
-						}
-						return
-					}
-					
-					c.JSON(http.StatusOK, response)
-				},
+				Middleware:   []gin.HandlerFunc{},
+				Function:     ctrl.registrationCompleteHandler,
 			},
-
-			//	@Summary	Acquire tokens via login credentials (and 2FA code if needed)
-			//	@Tags		Auth
-			//	@Accept		json
-			//	@Produce	json
-			//	@Param		request	body						models.LoginRequest		true	" "
-			//	@Success	200		{object}					models.LoginResponse	" "
-			//	@Failure	403		"Invalid login credentials"	
-			//	@Router		/auth/login [post]
 			{
-				HttpMethod: POST,
-				Path: "/login",
+				HttpMethod:   POST,
+				Path:         "/login",
 				Authorization: enums.GuestRole,
-				Middleware: []gin.HandlerFunc{},
-				Function: func(c *gin.Context) {
-					request, err := GetRequest[models.LoginRequest](c); if err != nil {
-						return
-					}
-					
-					response, err := auth.Login(request.User, request.Body)
-					
-					if err != nil {
-						if errors.Is(err, errs.ErrForbidden) {
-							c.Status(http.StatusForbidden)
-						} else {
-							c.Status(http.StatusInternalServerError)
-						}
-						return
-					}
-					
-					c.JSON(http.StatusOK, response)
-				},
+				Middleware:   []gin.HandlerFunc{},
+				Function:     ctrl.loginHandler,
 			},
-
-			//	@Summary	Receive new tokens via refresh token
-			//	@Tags		Auth
-			//	@Accept		json
-			//	@Produce	json
-			//	@Param		request	body	models.RefreshRequest	true	" "
-			//	@Router		/auth/refresh [post]
-			//	@Success	200	{object}	models.RefreshResponse	" "
-			//	@Failure	401	"Invalid refresh token"
 			{
-				HttpMethod: POST,
-				Path: "/refresh",
+				HttpMethod:   POST,
+				Path:         "/refresh",
 				Authorization: enums.GuestRole,
-				Middleware: []gin.HandlerFunc{},
-				Function: func(c *gin.Context) {
-
-					request, err := GetRequest[models.RefreshRequest](c); if err != nil {
-						return
-					}
-					
-					response, err := auth.Refresh(request.Body)
-					if err != nil {
-						if utils.ErrorIsOneOf(
-							err,
-							errs.ErrTokenExpired,
-							errs.ErrTokenInvalid,
-							errs.ErrInvalidToken,
-							errs.ErrWrongTokenType,
-							errs.ErrSessionNotFound,
-							errs.ErrSessionTerminated,
-						) {
-							c.JSON(http.StatusUnauthorized, gin.H{"error": "Invalid token"})
-						} else {
-							c.JSON(http.StatusInternalServerError, err.Error())
-						}
-						return
-					}
-					
-					c.JSON(http.StatusOK, response)
-				},
+				Middleware:   []gin.HandlerFunc{},
+				Function:     ctrl.refreshHandler,
 			},
-
-			//	@Summary	Request password reset email
-			//	@Tags		Auth
-			//	@Accept		json
-			//	@Produce	json
-			//	@Param		request	body	models.PasswordResetBeginRequest	true	" "
-			//	@Router		/auth/passwordResetBegin [post]
-			//	@Success	200	"Reset code sent to the email if it is attached to an account"
-			//	@Failure	429	"Too many recent requests for this email"
 			{
-				HttpMethod: POST,
-				Path: "/passwordResetBegin",
+				HttpMethod:   POST,
+				Path:         "/passwordResetBegin",
 				Authorization: enums.GuestRole,
-				Middleware: []gin.HandlerFunc{},
-				Function: func(c *gin.Context) {
-
-					request, err := GetRequest[models.PasswordResetBeginRequest](c); if err != nil {
-						return
-					}
-					
-					response, err := auth.PasswordResetBegin(request.Body)
-					if err != nil {
-						if errors.Is(err, errs.ErrTooManyRequests) {
-							c.Status(http.StatusTooManyRequests)
-						} else {
-							c.Status(http.StatusInternalServerError)
-						}
-						return
-					}
-					
-					c.JSON(http.StatusOK, response)
-				},
+				Middleware:   []gin.HandlerFunc{},
+				Function:     ctrl.passwordResetBeginHandler,
 			},
-
-
-			//	@Summary	Complete password reset via email code
-			//	@Tags		Auth
-			//	@Accept		json
-			//	@Produce	json
-			//	@Param		request	body	models.PasswordResetCompleteRequest	true	" "
-			//	@Router		/auth/passwordResetComplete [post]
-			//	@Success	200	{object}	models.PasswordResetCompleteResponse	" "
-			//	@Success	403	"Wrong verification code or username"
 			{
-				HttpMethod: POST,
-				Path: "/passwordResetComplete",
+				HttpMethod:   POST,
+				Path:         "/passwordResetComplete",
 				Authorization: enums.GuestRole,
-				Middleware: []gin.HandlerFunc{},
-				Function: func(c *gin.Context) {
-						
-					request, err := GetRequest[models.PasswordResetCompleteRequest](c); if err != nil {
-						return
-					}
-
-					response, err := auth.PasswordResetComplete(request.Body)
-					if err != nil {
-						if errors.Is(err, errs.ErrForbidden) {
-							c.Status(http.StatusForbidden)
-						} else {
-							c.Status(http.StatusInternalServerError)
-						}
-						return
-					}
-					
-					c.JSON(http.StatusOK, response)
-				},
+				Middleware:   []gin.HandlerFunc{},
+				Function:     ctrl.passwordResetCompleteHandler,
 			},
-
-			//	@Summary	Set new password using the old password
-			//	@Tags		Auth
-			//	@Accept		json
-			//	@Produce	json
-			//	@Security	JWT
-			//	@Param		request	body	models.ChangePasswordRequest	true	" "
-			//	@Success	200		"Password successfully changed"
-			//	@Failure	403		"Invalid old password"
-			//	@Router		/auth/changePassword [post]
 			{
-				HttpMethod: POST,
-				Path: "/changePassword",
+				HttpMethod:   POST,
+				Path:         "/changePassword",
 				Authorization: enums.UserRole,
-				Middleware: []gin.HandlerFunc{},
-				Function: func(c *gin.Context) {
-
-					request, err := GetRequest[models.ChangePasswordRequest](c); if err != nil {
-						return
-					}
-
-					response, err := auth.ChangePassword(request.Body, request.User)
-
-					if err != nil {
-						if errors.Is(err, errs.ErrForbidden) {
-							c.Status(http.StatusForbidden)
-						} else {
-							c.Status(http.StatusInternalServerError)
-						}
-						return
-					}
-
-					c.JSON(http.StatusOK, response)
-				},
+				Middleware:   []gin.HandlerFunc{},
+				Function:     ctrl.changePasswordHandler,
 			},
-
 		},
 	}
 }
+
+//	@Summary	Register an account
+//	@Tags		Auth
+//	@Accept		json
+//	@Produce	json
+//	@Param		request	body	models.RegistrationBeginRequest	true	" "
+//	@Success	200		"Account is created and awaiting verification"
+//	@Failure	409		"Username or email is already taken"
+//	@Failure	429		"Too many recent registration attempts for this email"
+//	@Router		/auth/registrationBegin [post]
+func (ctrl *AuthController) registrationBeginHandler(c *gin.Context) {
+	request, err := GetRequest[models.RegistrationBeginRequest](c)
+	if err != nil {
+		return
+	}
+
+	_, err = ctrl.auth.RegistrationBegin(request.Body)
+	if err != nil {
+		if errors.Is(err, errs.ErrUsernameTaken) || errors.Is(err, errs.ErrEmailTaken) {
+			c.Status(http.StatusConflict)
+		} else if errors.Is(err, errs.ErrTooManyRequests) {
+			c.Status(http.StatusTooManyRequests)
+		} else {
+			c.Status(http.StatusInternalServerError)
+		}
+		return
+	}
+
+	c.Status(http.StatusOK)
+}
+
+//	@Summary	Confirm with code, finish creating the account
+//	@Tags		Auth
+//	@Accept		json
+//	@Produce	json
+//	@Param		request	body		models.RegistrationCompleteRequest	true	" "
+//	@Success	200		{object}	models.RegistrationCompleteResponse	" "
+//	@Failure	403		"Invalid email or verification code"
+//	@Router		/auth/registrationComplete [post]
+func (ctrl *AuthController) registrationCompleteHandler(c *gin.Context) {
+	request, err := GetRequest[models.RegistrationCompleteRequest](c)
+	if err != nil {
+		return
+	}
+	
+	response, err := ctrl.auth.RegistrationComplete(request.User, request.Body)
+	if err != nil {
+		if errors.Is(err, errs.ErrForbidden) {
+			c.Status(http.StatusForbidden)
+		} else if errors.Is(err, errs.ErrUnauthorized) {
+			c.Status(http.StatusUnauthorized)
+		} else {
+			c.Status(http.StatusInternalServerError)
+		}
+		return
+	}
+	
+	c.JSON(http.StatusOK, response)
+}
+
+//	@Summary	Acquire tokens via login credentials (and 2FA code if needed)
+//	@Tags		Auth
+//	@Accept		json
+//	@Produce	json
+//	@Param		request	body						models.LoginRequest		true	" "
+//	@Success	200		{object}					models.LoginResponse	" "
+//	@Failure	403		"Invalid login credentials"	
+//	@Router		/auth/login [post]
+func (ctrl *AuthController) loginHandler(c *gin.Context) {
+	request, err := GetRequest[models.LoginRequest](c)
+	if err != nil {
+		return
+	}
+	
+	response, err := ctrl.auth.Login(request.User, request.Body)
+	if err != nil {
+		if errors.Is(err, errs.ErrForbidden) {
+			c.Status(http.StatusForbidden)
+		} else {
+			c.Status(http.StatusInternalServerError)
+		}
+		return
+	}
+	
+	c.JSON(http.StatusOK, response)
+}
+
+//	@Summary	Receive new tokens via refresh token
+//	@Tags		Auth
+//	@Accept		json
+//	@Produce	json
+//	@Param		request	body	models.RefreshRequest	true	" "
+//	@Router		/auth/refresh [post]
+//	@Success	200	{object}	models.RefreshResponse	" "
+//	@Failure	401	"Invalid refresh token"
+func (ctrl *AuthController) refreshHandler(c *gin.Context) {
+	request, err := GetRequest[models.RefreshRequest](c)
+	if err != nil {
+		return
+	}
+	
+	response, err := ctrl.auth.Refresh(request.Body)
+	if err != nil {
+		if utils.ErrorIsOneOf(
+			err,
+			errs.ErrTokenExpired,
+			errs.ErrTokenInvalid,
+			errs.ErrInvalidToken,
+			errs.ErrWrongTokenType,
+			errs.ErrSessionNotFound,
+			errs.ErrSessionTerminated,
+		) {
+			c.JSON(http.StatusUnauthorized, gin.H{"error": "Invalid token"})
+		} else {
+			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		}
+		return
+	}
+	
+	c.JSON(http.StatusOK, response)
+}
+
+//	@Summary	Request password reset email
+//	@Tags		Auth
+//	@Accept		json
+//	@Produce	json
+//	@Param		request	body	models.PasswordResetBeginRequest	true	" "
+//	@Router		/auth/passwordResetBegin [post]
+//	@Success	200	"Reset code sent to the email if it is attached to an account"
+//	@Failure	429	"Too many recent requests for this email"
+func (ctrl *AuthController) passwordResetBeginHandler(c *gin.Context) {
+	request, err := GetRequest[models.PasswordResetBeginRequest](c)
+	if err != nil {
+		return
+	}
+	
+	_, err = ctrl.auth.PasswordResetBegin(request.Body)
+	if err != nil {
+		if errors.Is(err, errs.ErrTooManyRequests) {
+			c.Status(http.StatusTooManyRequests)
+		} else {
+			c.Status(http.StatusInternalServerError)
+		}
+		return
+	}
+	
+	c.Status(http.StatusOK)
+}
+
+//	@Summary	Complete password reset via email code
+//	@Tags		Auth
+//	@Accept		json
+//	@Produce	json
+//	@Param		request	body	models.PasswordResetCompleteRequest	true	" "
+//	@Router		/auth/passwordResetComplete [post]
+//	@Success	200	{object}	models.PasswordResetCompleteResponse	" "
+//	@Success	403	"Wrong verification code or username"
+func (ctrl *AuthController) passwordResetCompleteHandler(c *gin.Context) {
+	request, err := GetRequest[models.PasswordResetCompleteRequest](c)
+	if err != nil {
+		return
+	}
+
+	response, err := ctrl.auth.PasswordResetComplete(request.Body)
+	if err != nil {
+		if errors.Is(err, errs.ErrForbidden) {
+			c.Status(http.StatusForbidden)
+		} else {
+			c.Status(http.StatusInternalServerError)
+		}
+		return
+	}
+	
+	c.JSON(http.StatusOK, response)
+}
+
+//	@Summary	Set new password using the old password
+//	@Tags		Auth
+//	@Accept		json
+//	@Produce	json
+//	@Security	JWT
+//	@Param		request	body	models.ChangePasswordRequest	true	" "
+//	@Success	200		"Password successfully changed"
+//	@Failure	403		"Invalid old password"
+//	@Router		/auth/changePassword [post]
+func (ctrl *AuthController) changePasswordHandler(c *gin.Context) {
+	request, err := GetRequest[models.ChangePasswordRequest](c)
+	if err != nil {
+		return
+	}
+
+	_, err = ctrl.auth.ChangePassword(request.Body, request.User)
+	if err != nil {
+		if errors.Is(err, errs.ErrForbidden) {
+			c.Status(http.StatusForbidden)
+		} else {
+			c.Status(http.StatusInternalServerError)
+		}
+		return
+	}
+
+	c.Status(http.StatusOK)
+}

backend/internal/controllers/controller.go

@@ -103,10 +103,10 @@ func GetRequest[ModelT any](c *gin.Context) (*dto.Request[ModelT], error) {
 			gin.H{"error": "Client info was not found"})
 		panic("No client_info found in gin context. Does the handler use AuthMiddleware?")
 	}
-	cinfo := cinfoFromCtx.(*dto.ClientInfo)
+	cinfo := cinfoFromCtx.(dto.ClientInfo)
 
 	return &dto.Request[ModelT]{
 		Body: body,
-		User: *cinfo,
+		User: cinfo,
 	}, nil
 }

backend/internal/controllers/profile.go

@@ -1,94 +0,0 @@
-// Copyright (c) 2025 Nikolai Papin
-// 
-// This file is part of Easywish
-// 
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-// the GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-package controllers
-
-import (
-	"net/http"
-
-	"github.com/gin-gonic/gin"
-)
-
-type ProfileController interface {
-	GetProfile(c *gin.Context)
-	GetOwnProfile(c *gin.Context)
-	UpdateProfile(c *gin.Context)
-	GetPrivacySettings(c *gin.Context)
-	UpdatePrivacySettings(c *gin.Context)
-	Router
-}
-
-type profileControllerImpl struct {
-}
-
-func NewProfileController() ProfileController {
-	return &profileControllerImpl{}
-}
-
-//	@Summary	Get someone's profile details
-//	@Tags		Profile
-//	@Accept		json
-//	@Produce	json
-//	@Param		username	path	string	true	"Username"
-//	@Security	JWT
-//	@Router		/profile/{username} [get]
-func (p *profileControllerImpl) GetProfile(c *gin.Context) {
-	c.Status(http.StatusNotImplemented)
-}
-
-//	@Summary	Get own profile when authorized
-//	@Tags		Profile
-//	@Accept		json
-//	@Produce	json
-//	@Security	JWT
-//	@Router		/profile/me [get]
-func (p *profileControllerImpl) GetOwnProfile(c *gin.Context) {
-	c.Status(http.StatusNotImplemented)
-}
-
-//	@Summary	Update profile
-//	@Tags		Profile
-//	@Accept		json
-//	@Produce	json
-//	@Security	JWT
-//	@Router		/profile [patch]
-func (p *profileControllerImpl) UpdateProfile(c *gin.Context) {
-	c.Status(http.StatusNotImplemented)
-}
-
-//	@Summary	Get profile privacy settings
-//	@Tags		Profile
-//	@Accept		json
-//	@Produce	json
-//	@Security	JWT
-//	@Router		/profile/privacy [get]
-func (p *profileControllerImpl) GetPrivacySettings(c *gin.Context) {
-	c.Status(http.StatusNotImplemented)
-}
-
-//	@Summary	Update profile privacy settings
-//	@Tags		Profile
-//	@Accept		json
-//	@Produce	json
-//	@Security	JWT
-//	@Router		/profile/privacy [patch]
-func (p *profileControllerImpl) UpdatePrivacySettings(c *gin.Context) {
-	c.Status(http.StatusNotImplemented)
-}
-
-func (p *profileControllerImpl) RegisterRoutes(group *gin.RouterGroup) {
-}

backend/internal/controllers/router.go

@@ -1,26 +0,0 @@
-// Copyright (c) 2025 Nikolai Papin
-// 
-// This file is part of Easywish
-// 
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
-// the GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-package controllers
-
-import (
-	"github.com/gin-gonic/gin"
-)
-
-type Router interface {
-    RegisterRoutes(group *gin.RouterGroup)
-}

backend/internal/controllers/service.go

@@ -25,32 +25,36 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
+type ServiceController struct {}
+
 func NewServiceController() Controller {
+
+	ctrl := &ServiceController{}
+
 	return &controllerImpl{
 		Path: "/service",
 		Middleware: []gin.HandlerFunc{},
 		Methods: []ControllerMethod{
 
-			// Health godoc
-			//	@Summary		Get health status
-			//	@Description	Used internally for checking service health
-			//	@Tags			Service
-			//	@Accept			json
-			//	@Produce		json
-			//	@Success		200	{object}	HealthStatus	"Says whether it's healthy or not"
-			//	@Router			/service/health [get]
 			{
 				HttpMethod: GET,
 				Path: "/health",
 				Authorization: enums.GuestRole,
 				Middleware: []gin.HandlerFunc{},
-				Function: func(c *gin.Context) {
-
-					c.JSON(http.StatusOK, models.HealthStatusResponse{Healthy: true,})
-
-				},
+				Function: ctrl.healthHandler,
 			},
 
 		},
 	}
 }
+
+//	@Summary		Get health status
+//	@Description	Used internally for checking service health
+//	@Tags			Service
+//	@Accept			json
+//	@Produce		json
+//	@Success		200	{object}	models.HealthStatusResponse	"Says whether it's healthy or not"
+//	@Router			/service/health [get]
+func (ctrl *ServiceController) healthHandler(c *gin.Context) {
+	c.JSON(http.StatusOK, models.HealthStatusResponse{Healthy: true,})
+}