merch-tracker-v2/merch-api
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MW fix from hardcode

Browse source
This commit is contained in:
nquidox 2026-03-20 14:53:01 +03:00
parent a66873d12d
commit 64a242cdea
3 changed files with 36 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pkg/router/handler.go
View file

@ -4,6 +4,7 @@ import (
"context"
"fmt"
"merch-api/internal/user"
"merch-api/pkg/authCheck"
"net"
"net/http"
@ -21,6 +22,8 @@ type Deps struct {
Prefix string
GinMode string
UserProvider user.Provider
AuthProvider authCheck.AuthChecker
ServiceId int32
}
type Router struct {
@ -54,7 +57,7 @@ func NewRouter(deps Deps) *Router {
engine.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
engine.Use(authMW(deps.UserProvider))
engine.Use(authMW(deps.UserProvider, deps.AuthProvider, deps.ServiceId))
return &Router{
srv: &http.Server{

14
pkg/router/middleware.go
View file

@ -4,16 +4,22 @@ import (
"github.com/gin-gonic/gin"
log "github.com/sirupsen/logrus"
"merch-api/internal/user"
"merch-api/pkg/authCheck"
"merch-api/pkg/responses"
"net/http"
)
func authMW(up user.Provider) gin.HandlerFunc {
func authMW(up user.Provider, auth authCheck.AuthChecker, serviceId int32) gin.HandlerFunc {
log.Debug("Auth Middleware enabled")
return func(c *gin.Context) {
//019caeab-aa81-7f09-a220-d7e675300638 //user_id 1
userUuid := "019cd29b-e35b-7eb2-85c6-111ca0d15bff" //TODO placeholder for dev purposes
log.Warnf("%v using placeholder uuid: %v", pkgLogHeader, userUuid)
cookie, err := c.Cookie("sessionToken")
if err != nil {
c.JSON(http.StatusUnauthorized, responses.Unauthorized{Error: err.Error()})
c.Abort()
return
}
userUuid, err := auth.VerifySession(c, cookie, serviceId)
userId, err := up.GetUserId(c, userUuid)
if err != nil {