PenaSide/heruvym
3
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Update service/service.go, middleware/http_middleware.go

Browse Source
This commit is contained in:
Mikhail 2023-03-21 19:00:02 +00:00
parent 90bee733e8
commit 583c80b799
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
middleware/http_middleware.go
View File

@ -94,19 +94,20 @@ func (mw *Middleware) MiddlewareJwt(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
var token, role string var token, role string
fmt.Println("HOOOOOST", r.Host)
switch r.Host { switch r.Host {
case "admin.pena.digital": case "admin.pena.digital":
role = "admin" role = "admin"
default: default:
role = "user" role = "user"
} }
ctx := context.WithValue(r.Context(), jwt_adapter.RoleKey, role)
tokenCookie, err := r.Cookie(jwt_adapter.DefaultHeaderKey) tokenCookie, err := r.Cookie(jwt_adapter.DefaultHeaderKey)
if err != nil { if err != nil {
// Escape GET requests // Escape GET requests
if r.Method == http.MethodGet { if r.Method == http.MethodGet {
next.ServeHTTP(w, r) next.ServeHTTP(w, r.WithContext(ctx))
return return
} }
if len(r.Header[jwt_adapter.DefaultHeaderKey]) <= 0 { if len(r.Header[jwt_adapter.DefaultHeaderKey]) <= 0 {
@ -135,7 +136,7 @@ func (mw *Middleware) MiddlewareJwt(next http.Handler) http.Handler {
return 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)) next.ServeHTTP(w, r.WithContext(ctx))
}) })
} }

1
service/service.go
View File

@ -439,7 +439,6 @@ func (h *Heruvym) Subscribe(ctx context.Context) chan interface{} {
ticket, err := h.dal.GetTicket4User(ctx, ticketID, sess.Id) ticket, err := h.dal.GetTicket4User(ctx, ticketID, sess.Id)
if err != nil || ticket == nil { if err != nil || ticket == nil {
output <- errors.New("no tickets 4 user") output <- errors.New("no tickets 4 user")
return
} }
if err := h.dal.YieldMessages(ctx, ticketID, func(message model.Message) error { if err := h.dal.YieldMessages(ctx, ticketID, func(message model.Message) error {