added HandlerFunc to process handlerfunctions (in addition to Handler…

… which only accepter a handler)

jwt/auth.go

@@ -266,6 +266,14 @@ func (a *Auth) Handler(h http.Handler) http.Handler {
 	})
 }
 
+// HandlerFunc works identically to Handler, but takes a HandlerFunc instead of a Handler.
+func (a *Auth) HandlerFunc(fn http.HandlerFunc) http.Handler {
+	if fn == nil {
+		return a.Handler(nil)
+	}
+	return a.Handler(fn)
+}
+
 // HandlerFuncWithNext is a special implementation for Negroni, but could be used elsewhere.
 func (a *Auth) HandlerFuncWithNext(w http.ResponseWriter, r *http.Request, next http.HandlerFunc) {
 	jwtErr := a.Process(w, r)
@@ -295,14 +303,12 @@ func (a *Auth) Process(w http.ResponseWriter, r *http.Request) *jwtError {
 
 	// grab the credentials from the request
 	var c credentials
-	err := a.buildCredentialsFromRequest(r, &c)
-	if err != nil {
+	if err := a.buildCredentialsFromRequest(r, &c); err != nil {
 		return newJwtError(err, 500)
 	}
 
 	// check the credential's validity; updating expiry's if necessary and/or allowed
-	err = c.validateAndUpdateCredentials()
-	if err != nil {
+	if err := c.validateAndUpdateCredentials(); err != nil {
 		return newJwtError(err, 500)
 	}
 
@@ -311,8 +317,7 @@ func (a *Auth) Process(w http.ResponseWriter, r *http.Request) *jwtError {
 	// if we've made it this far, everything is valid!
 	// And tokens have been refreshed if need-be
 	if !a.options.VerifyOnlyServer {
-		err = a.setCredentialsOnResponseWriter(w, &c)
-		if err != nil {
+		if err := a.setCredentialsOnResponseWriter(w, &c); err != nil {
 			return newJwtError(err, 500)
 		}
 	}

jwt/auth_unit_test.go

@@ -457,3 +457,26 @@ func TestGrabTokenClaims(t *testing.T) {
 		t.Errorf("Claims do not match expectations; Expected: bar; Received: %s", myNewClaims.CustomClaims["foo"].(string))
 	}
 }
+
+var myHandlerFunc = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	w.Write([]byte("In Handler Func"))
+})
+
+func TestHandlerFunc(t *testing.T) {
+	var a Auth
+	handler := a.HandlerFunc(myHandlerFunc)
+
+	req, err := http.NewRequest("OPTIONS", "/test", nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	rr := httptest.NewRecorder()
+
+	handler.ServeHTTP(rr, req)
+
+	body := rr.Body.String()
+	if body != "In Handler Func" {
+		t.Errorf("expected: In Handler Func; received: %s", body)
+	}
+}