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

service id usage refactor

Browse source
This commit is contained in:
nquidox 2026-04-01 17:48:12 +03:00
parent 7cef9cbe8d
commit e6da13e657
5 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

11
internal/app/handler.go
View file

@ -56,14 +56,16 @@ func New(ctx context.Context, cfg config.Config) *App {
newApp.dbPool = dbPool newApp.dbPool = dbPool
sessionCheckProvider := authCheck.New(authCheck.Deps{ sessionCheckProvider := authCheck.New(authCheck.Deps{
Addr: net.JoinHostPort(cfg.Auth.Host, cfg.Auth.Port), Addr: net.JoinHostPort(cfg.Auth.Host, cfg.Auth.Port),
Timeout: cfg.Auth.Timeout, Timeout: cfg.Auth.Timeout,
ServiceId: serviceId,
}) })
//providers with deps //providers with deps
userProv := user.New(user.Deps{ userProv := user.New(user.Deps{
DB: dbPool, DB: dbPool,
Utils: u, Utils: u,
AuthDP: sessionCheckProvider,
}) })
newApp.modules = append(newApp.modules, userProv) newApp.modules = append(newApp.modules, userProv)
@ -74,7 +76,6 @@ func New(ctx context.Context, cfg config.Config) *App {
GinMode: cfg.Http.GinMode, GinMode: cfg.Http.GinMode,
UserProvider: userProv, UserProvider: userProv,
AuthProvider: sessionCheckProvider, AuthProvider: sessionCheckProvider,
ServiceId: serviceId,
}) })
m := merch.New(merch.Deps{ m := merch.New(merch.Deps{

7
pkg/authCheck/handler.go
View file

@ -16,8 +16,9 @@ type Handler struct {
} }
type Deps struct { type Deps struct {
Addr string Addr string
Timeout time.Duration Timeout time.Duration
ServiceId int32
} }
func New(deps Deps) *Handler { func New(deps Deps) *Handler {
@ -35,6 +36,6 @@ func New(deps Deps) *Handler {
return &Handler{ return &Handler{
client: client, client: client,
service: newService(client, deps.Timeout), service: newService(client, deps.Timeout, deps.ServiceId),
} }
} }

7
pkg/router/handler.go
View file

@ -24,7 +24,6 @@ type Deps struct {
GinMode string GinMode string
UserProvider UserProvider UserProvider UserProvider
AuthProvider AuthChecker AuthProvider AuthChecker
ServiceId int32
} }
type Router struct { type Router struct {
@ -37,7 +36,6 @@ type Router struct {
type providers struct { type providers struct {
userProvider UserProvider userProvider UserProvider
authChecker AuthChecker authChecker AuthChecker
serviceId int32
} }
func NewRouter(deps Deps) *Router { func NewRouter(deps Deps) *Router {
@ -75,7 +73,6 @@ func NewRouter(deps Deps) *Router {
providers: providers{ providers: providers{
userProvider: deps.UserProvider, userProvider: deps.UserProvider,
authChecker: deps.AuthProvider, authChecker: deps.AuthProvider,
serviceId: deps.ServiceId,
}, },
} }
} }
@ -96,7 +93,7 @@ func (r *Router) BaseGroup() *gin.RouterGroup {
func (r *Router) MWSet() *Middlewares { func (r *Router) MWSet() *Middlewares {
return &Middlewares{ return &Middlewares{
AuthMW: AuthMW(r.providers.userProvider, r.providers.authChecker, r.providers.serviceId), AuthMW: AuthMW(r.providers.userProvider, r.providers.authChecker),
RegMW: RegisterMW(r.providers.authChecker, r.providers.serviceId), RegMW: RegisterMW(r.providers.authChecker),
} }
} }

2
pkg/router/interfaces.go
View file

@ -7,5 +7,5 @@ type UserProvider interface {
} }
type AuthChecker interface { type AuthChecker interface {
VerifySession(ctx context.Context, sessionUuid string, serviceId int32) (string, error) VerifySession(ctx context.Context, sessionUuid string) (string, error)
} }

13
pkg/router/middleware.go
View file

@ -8,9 +8,8 @@ import (
) )
type DepsMW struct { type DepsMW struct {
UserProv UserProvider UserProv UserProvider
AuthProv AuthChecker AuthProv AuthChecker
ServiceId int32
} }
type Middlewares struct { type Middlewares struct {
@ -18,7 +17,7 @@ type Middlewares struct {
RegMW gin.HandlerFunc 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 |" const funcHeader string = "Auth Middleware |"
log.Debugf("%v %v begin", pkgLogHeader, funcHeader) log.Debugf("%v %v begin", pkgLogHeader, funcHeader)
return func(c *gin.Context) { return func(c *gin.Context) {
@ -32,7 +31,7 @@ func AuthMW(up UserProvider, ap AuthChecker, sid int32) gin.HandlerFunc {
c.Abort() c.Abort()
} }
userUuid, err := ap.VerifySession(c, cookie, sid) userUuid, err := ap.VerifySession(c, cookie)
if err != nil { if err != nil {
c.JSON(http.StatusUnauthorized, responses.Unauthorized{Error: err.Error()}) c.JSON(http.StatusUnauthorized, responses.Unauthorized{Error: err.Error()})
c.Abort() 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") log.Debug("Auth Middlewares enabled")
return func(c *gin.Context) { return func(c *gin.Context) {
cookie, err := c.Cookie(tokenCookieName) cookie, err := c.Cookie(tokenCookieName)
@ -63,7 +62,7 @@ func RegisterMW(ap AuthChecker, sid int32) gin.HandlerFunc {
return return
} }
userUuid, err := ap.VerifySession(c, cookie, sid) userUuid, err := ap.VerifySession(c, cookie)
if err != nil { if err != nil {
c.JSON(http.StatusUnauthorized, responses.Unauthorized{Error: err.Error()}) c.JSON(http.StatusUnauthorized, responses.Unauthorized{Error: err.Error()})
c.Abort() c.Abort()