From e6da13e657fc7e2df3307697dd6e53e568e361a5 Mon Sep 17 00:00:00 2001
From: nquidox <nquidox@gmail.com>
Date: Wed, 1 Apr 2026 17:48:12 +0300
Subject: [PATCH] service id usage refactor

---
 internal/app/handler.go  | 11 ++++++-----
 pkg/authCheck/handler.go |  7 ++++---
 pkg/router/handler.go    |  7 ++-----
 pkg/router/interfaces.go |  2 +-
 pkg/router/middleware.go | 13 ++++++-------
 5 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/internal/app/handler.go b/internal/app/handler.go
index cbcb879..b7e8649 100644
--- a/internal/app/handler.go
+++ b/internal/app/handler.go
@@ -56,14 +56,16 @@ func New(ctx context.Context, cfg config.Config) *App {
 	newApp.dbPool = dbPool
 
 	sessionCheckProvider := authCheck.New(authCheck.Deps{
-		Addr:    net.JoinHostPort(cfg.Auth.Host, cfg.Auth.Port),
-		Timeout: cfg.Auth.Timeout,
+		Addr:      net.JoinHostPort(cfg.Auth.Host, cfg.Auth.Port),
+		Timeout:   cfg.Auth.Timeout,
+		ServiceId: serviceId,
 	})
 
 	//providers with deps
 	userProv := user.New(user.Deps{
-		DB:    dbPool,
-		Utils: u,
+		DB:     dbPool,
+		Utils:  u,
+		AuthDP: sessionCheckProvider,
 	})
 	newApp.modules = append(newApp.modules, userProv)
 
@@ -74,7 +76,6 @@ func New(ctx context.Context, cfg config.Config) *App {
 		GinMode:      cfg.Http.GinMode,
 		UserProvider: userProv,
 		AuthProvider: sessionCheckProvider,
-		ServiceId:    serviceId,
 	})
 
 	m := merch.New(merch.Deps{
diff --git a/pkg/authCheck/handler.go b/pkg/authCheck/handler.go
index 12f9e83..7ca4b71 100644
--- a/pkg/authCheck/handler.go
+++ b/pkg/authCheck/handler.go
@@ -16,8 +16,9 @@ type Handler struct {
 }
 
 type Deps struct {
-	Addr    string
-	Timeout time.Duration
+	Addr      string
+	Timeout   time.Duration
+	ServiceId int32
 }
 
 func New(deps Deps) *Handler {
@@ -35,6 +36,6 @@ func New(deps Deps) *Handler {
 
 	return &Handler{
 		client:  client,
-		service: newService(client, deps.Timeout),
+		service: newService(client, deps.Timeout, deps.ServiceId),
 	}
 }
diff --git a/pkg/router/handler.go b/pkg/router/handler.go
index 56d7a48..d3f71a3 100644
--- a/pkg/router/handler.go
+++ b/pkg/router/handler.go
@@ -24,7 +24,6 @@ type Deps struct {
 	GinMode      string
 	UserProvider UserProvider
 	AuthProvider AuthChecker
-	ServiceId    int32
 }
 
 type Router struct {
@@ -37,7 +36,6 @@ type Router struct {
 type providers struct {
 	userProvider UserProvider
 	authChecker  AuthChecker
-	serviceId    int32
 }
 
 func NewRouter(deps Deps) *Router {
@@ -75,7 +73,6 @@ func NewRouter(deps Deps) *Router {
 		providers: providers{
 			userProvider: deps.UserProvider,
 			authChecker:  deps.AuthProvider,
-			serviceId:    deps.ServiceId,
 		},
 	}
 }
@@ -96,7 +93,7 @@ func (r *Router) BaseGroup() *gin.RouterGroup {
 
 func (r *Router) MWSet() *Middlewares {
 	return &Middlewares{
-		AuthMW: AuthMW(r.providers.userProvider, r.providers.authChecker, r.providers.serviceId),
-		RegMW:  RegisterMW(r.providers.authChecker, r.providers.serviceId),
+		AuthMW: AuthMW(r.providers.userProvider, r.providers.authChecker),
+		RegMW:  RegisterMW(r.providers.authChecker),
 	}
 }
diff --git a/pkg/router/interfaces.go b/pkg/router/interfaces.go
index 023f80c..ee3e821 100644
--- a/pkg/router/interfaces.go
+++ b/pkg/router/interfaces.go
@@ -7,5 +7,5 @@ type UserProvider interface {
 }
 
 type AuthChecker interface {
-	VerifySession(ctx context.Context, sessionUuid string, serviceId int32) (string, error)
+	VerifySession(ctx context.Context, sessionUuid string) (string, error)
 }
diff --git a/pkg/router/middleware.go b/pkg/router/middleware.go
index 9d0a9f1..7f501e6 100644
--- a/pkg/router/middleware.go
+++ b/pkg/router/middleware.go
@@ -8,9 +8,8 @@ import (
 )
 
 type DepsMW struct {
-	UserProv  UserProvider
-	AuthProv  AuthChecker
-	ServiceId int32
+	UserProv UserProvider
+	AuthProv AuthChecker
 }
 
 type Middlewares struct {
@@ -18,7 +17,7 @@ type Middlewares struct {
 	RegMW  gin.HandlerFunc
 }
 
-func AuthMW(up UserProvider, ap AuthChecker, sid int32) gin.HandlerFunc {
+func AuthMW(up UserProvider, ap AuthChecker) gin.HandlerFunc {
 	const funcHeader string = "Auth Middleware |"
 	log.Debugf("%v %v begin", pkgLogHeader, funcHeader)
 	return func(c *gin.Context) {
@@ -32,7 +31,7 @@ func AuthMW(up UserProvider, ap AuthChecker, sid int32) gin.HandlerFunc {
 			c.Abort()
 		}
 
-		userUuid, err := ap.VerifySession(c, cookie, sid)
+		userUuid, err := ap.VerifySession(c, cookie)
 		if err != nil {
 			c.JSON(http.StatusUnauthorized, responses.Unauthorized{Error: err.Error()})
 			c.Abort()
@@ -53,7 +52,7 @@ func AuthMW(up UserProvider, ap AuthChecker, sid int32) gin.HandlerFunc {
 	}
 }
 
-func RegisterMW(ap AuthChecker, sid int32) gin.HandlerFunc {
+func RegisterMW(ap AuthChecker) gin.HandlerFunc {
 	log.Debug("Auth Middlewares enabled")
 	return func(c *gin.Context) {
 		cookie, err := c.Cookie(tokenCookieName)
@@ -63,7 +62,7 @@ func RegisterMW(ap AuthChecker, sid int32) gin.HandlerFunc {
 			return
 		}
 
-		userUuid, err := ap.VerifySession(c, cookie, sid)
+		userUuid, err := ap.VerifySession(c, cookie)
 		if err != nil {
 			c.JSON(http.StatusUnauthorized, responses.Unauthorized{Error: err.Error()})
 			c.Abort()