Fix Auth Headers (#1324)

Co-authored-by: Ben Toogood <ben@micro.mu>
This commit is contained in:
ben-toogood
2020-03-10 16:47:01 +00:00
committed by GitHub
parent ed83c27f0e
commit 48b2a5c37c
3 changed files with 11 additions and 7 deletions

View File

@@ -5,7 +5,6 @@ import (
"strings"
"github.com/micro/go-micro/v2/auth"
"github.com/micro/go-micro/v2/metadata"
)
// CombinedAuthHandler wraps a server and authenticates requests
@@ -42,15 +41,16 @@ func (h authHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
}
var token string
if header, ok := metadata.Get(req.Context(), "Authorization"); ok {
if header := req.Header.Get("Authorization"); len(header) > 0 {
// Extract the auth token from the request
if strings.HasPrefix(header, BearerScheme) {
token = header[len(BearerScheme):]
}
} else {
// Get the token out the cookies if not provided in headers
if c, err := req.Cookie(auth.CookieName); err != nil && c != nil {
token = c.Value
if c, err := req.Cookie("micro-token"); err == nil && c != nil {
token = strings.TrimPrefix(c.Value, auth.CookieName+"=")
req.Header.Set("Authorization", BearerScheme+token)
}
}