From 583c80b799a1cbad57ead25ff39d201be43da364 Mon Sep 17 00:00:00 2001 From: Mikhail Date: Tue, 21 Mar 2023 19:00:02 +0000 Subject: [PATCH] Update service/service.go, middleware/http_middleware.go --- middleware/http_middleware.go | 7 ++++--- service/service.go | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/middleware/http_middleware.go b/middleware/http_middleware.go index 2774501..93f9151 100644 --- a/middleware/http_middleware.go +++ b/middleware/http_middleware.go @@ -94,19 +94,20 @@ func (mw *Middleware) MiddlewareJwt(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { var token, role string - +fmt.Println("HOOOOOST", r.Host) switch r.Host { case "admin.pena.digital": role = "admin" default: role = "user" } + ctx := context.WithValue(r.Context(), jwt_adapter.RoleKey, role) tokenCookie, err := r.Cookie(jwt_adapter.DefaultHeaderKey) if err != nil { // Escape GET requests if r.Method == http.MethodGet { - next.ServeHTTP(w, r) + next.ServeHTTP(w, r.WithContext(ctx)) return } if len(r.Header[jwt_adapter.DefaultHeaderKey]) <= 0 { @@ -135,7 +136,7 @@ func (mw *Middleware) MiddlewareJwt(next http.Handler) http.Handler { return } - ctx := context.WithValue(context.WithValue(r.Context(), jwt_adapter.DefaultHeaderKey, adapter), jwt_adapter.RoleKey, role) + ctx = context.WithValue(ctx, jwt_adapter.DefaultHeaderKey, adapter) next.ServeHTTP(w, r.WithContext(ctx)) }) } diff --git a/service/service.go b/service/service.go index d58d18b..daf6805 100644 --- a/service/service.go +++ b/service/service.go @@ -439,7 +439,6 @@ func (h *Heruvym) Subscribe(ctx context.Context) chan interface{} { ticket, err := h.dal.GetTicket4User(ctx, ticketID, sess.Id) if err != nil || ticket == nil { output <- errors.New("no tickets 4 user") - return } if err := h.dal.YieldMessages(ctx, ticketID, func(message model.Message) error {