Add TokenFromRequest helper function

jwtauth.go

@@ -241,6 +241,23 @@ func SetExpiryIn(claims map[string]interface{}, tm time.Duration) {
 	claims["exp"] = ExpireIn(tm)
 }
 
+var tokenRetreivers = []func(r *http.Request) string{
+	TokenFromHeader,
+	TokenFromQuery,
+}
+
+// TokenFromRequest tries to retreive the token string from all supported methods:
+// TokenFromHeader and TokenFromQuery in same order
+func TokenFromRequest(r *http.Request) string {
+	for i := range tokenRetreivers {
+		if token := tokenRetreivers[i](r); token != "" {
+			return token
+		}
+	}
+
+	return ""
+}
+
 // TokenFromCookie tries to retreive the token string from a cookie named
 // "jwt".
 func TokenFromCookie(r *http.Request) string {

jwtauth_test.go

@@ -10,6 +10,7 @@ import (
 	"log"
 	"net/http"
 	"net/http/httptest"
+	"net/url"
 	"reflect"
 	"testing"
 	"time"
@@ -231,6 +232,46 @@ func TestMore(t *testing.T) {
 	}
 }
 
+func TestTokenFromRequest(t *testing.T) {
+	tests := []struct {
+		desc  string
+		r     *http.Request
+		token string
+	}{
+		{
+			desc: "request does not have any token",
+			r:    &http.Request{URL: &url.URL{}},
+		},
+		{
+			desc: "request has token in header",
+			r: &http.Request{
+				Header: http.Header{
+					"Authorization": []string{"Bearer testtoken"},
+				},
+				URL: &url.URL{},
+			},
+			token: "testtoken",
+		},
+		{
+			desc: "request has token in query",
+			r: &http.Request{
+				URL: &url.URL{
+					RawQuery: "jwt=testtoken",
+				},
+			},
+			token: "testtoken",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Logf("running case: %q", tt.desc)
+		token := jwtauth.TokenFromRequest(tt.r)
+		if tt.token != token {
+			t.Fatalf("expected token: %q, got: %q", tt.token, token)
+		}
+	}
+}
+
 //
 // Test helper functions
 //