Fix JWTManager access in getUserAvatarHandler
This commit is contained in:
@@ -260,7 +260,7 @@ func NewRouter(cfg *config.Config, db *database.DB, jwtManager *jwt.Manager, aut
|
|||||||
uploadUserAvatarHandler(w, req, db, auditLogger, cfg)
|
uploadUserAvatarHandler(w, req, db, auditLogger, cfg)
|
||||||
})
|
})
|
||||||
r.Get("/user/avatar", func(w http.ResponseWriter, req *http.Request) {
|
r.Get("/user/avatar", func(w http.ResponseWriter, req *http.Request) {
|
||||||
getUserAvatarHandler(w, req, db, cfg)
|
getUserAvatarHandler(w, req, db, jwtManager, cfg)
|
||||||
})
|
})
|
||||||
r.Options("/user/avatar", func(w http.ResponseWriter, req *http.Request) {
|
r.Options("/user/avatar", func(w http.ResponseWriter, req *http.Request) {
|
||||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||||
@@ -4080,14 +4080,14 @@ func uploadUserAvatarHandler(w http.ResponseWriter, r *http.Request, db *databas
|
|||||||
}
|
}
|
||||||
|
|
||||||
// getUserAvatarHandler serves the user's avatar image
|
// getUserAvatarHandler serves the user's avatar image
|
||||||
func getUserAvatarHandler(w http.ResponseWriter, r *http.Request, db *database.DB, cfg *config.Config) {
|
func getUserAvatarHandler(w http.ResponseWriter, r *http.Request, db *database.DB, jwtManager *jwt.Manager, cfg *config.Config) {
|
||||||
tokenString := r.URL.Query().Get("token")
|
tokenString := r.URL.Query().Get("token")
|
||||||
if tokenString == "" {
|
if tokenString == "" {
|
||||||
errors.WriteError(w, errors.CodeUnauthenticated, "Unauthorized", http.StatusUnauthorized)
|
errors.WriteError(w, errors.CodeUnauthenticated, "Unauthorized", http.StatusUnauthorized)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
claims, err := cfg.JWTManager.ValidateToken(tokenString)
|
claims, err := jwtManager.ValidateToken(tokenString)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
errors.WriteError(w, errors.CodeUnauthenticated, "Unauthorized", http.StatusUnauthorized)
|
errors.WriteError(w, errors.CodeUnauthenticated, "Unauthorized", http.StatusUnauthorized)
|
||||||
return
|
return
|
||||||
|
|||||||
Reference in New Issue
Block a user