From 39e151eb723ebcacfb6b8663c58415b5b7039daf Mon Sep 17 00:00:00 2001
From: zensh <admin@zensh.com>
Date: Wed, 22 Feb 2017 22:59:13 +0800
Subject: [PATCH] improve gear.Any interface

---
 .travis.yml  |  2 +-
 auth.go      | 37 ++++++++++++++++++++-----------------
 auth_test.go |  2 +-
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9984a6c..88aa841 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 sudo: false
 language: go
 go:
-  - 1.7
+  - 1.8
 before_install:
   - go get -t -v ./...
   - go get github.com/modocache/gover
diff --git a/auth.go b/auth.go
index 2d6548e..538e4a3 100644
--- a/auth.go
+++ b/auth.go
@@ -26,16 +26,16 @@ type TokenExtractor func(ctx *gear.Context) (token string)
 // Auth is helper type. It combine JWT and Crypto object, and some useful mothod for JWT.
 // You can use it as a gear middleware.
 type Auth struct {
-	c *crypto.Crypto
-	j *jwt.JWT
-	e TokenExtractor
+	c  *crypto.Crypto
+	j  *jwt.JWT
+	ex TokenExtractor
 }
 
 // New returns a Auth instance.
 func New(keys ...interface{}) *Auth {
 	a := new(Auth)
 	a.SetJWT(jwt.New(keys...))
-	a.e = func(ctx *gear.Context) (token string) {
+	a.ex = func(ctx *gear.Context) (token string) {
 		if val := ctx.Get("Authorization"); strings.HasPrefix(val, "Bearer ") {
 			token = val[7:]
 		} else {
@@ -67,8 +67,8 @@ func (a *Auth) SetJWT(j *jwt.JWT) {
 }
 
 // SetTokenParser set a custom tokenExtractor to auth. Default to:
-func (a *Auth) SetTokenParser(e TokenExtractor) {
-	a.e = e
+func (a *Auth) SetTokenParser(ex TokenExtractor) {
+	a.ex = ex
 }
 
 // New implements gear.Any interface, then we can use it with ctx.Any:
@@ -81,11 +81,19 @@ func (a *Auth) SetTokenParser(e TokenExtractor) {
 //
 // that is auth.FromCtx doing for us.
 //
-func (a *Auth) New(ctx *gear.Context) (interface{}, error) {
-	if token := a.e(ctx); token != "" {
-		return a.j.Verify(token)
+func (a *Auth) New(ctx *gear.Context) (val interface{}, err error) {
+	if token := a.ex(ctx); token != "" {
+		val, err = a.j.Verify(token)
 	}
-	return nil, &gear.Error{Code: 401, Msg: "No token found"}
+	if val == nil {
+		// create a empty jwt.Claims
+		val = josejwt.Claims{}
+		if err == nil {
+			err = &gear.Error{Code: 401, Msg: "no token found"}
+		}
+	}
+	ctx.SetAny(a, val)
+	return
 }
 
 // FromCtx will parse and validate token from the ctx, and return it as jwt.Claims.
@@ -95,13 +103,8 @@ func (a *Auth) New(ctx *gear.Context) (interface{}, error) {
 //  fmt.Println(claims, err)
 //
 func (a *Auth) FromCtx(ctx *gear.Context) (josejwt.Claims, error) {
-	any, err := ctx.Any(a)
-	if err == nil {
-		return any.(josejwt.Claims), nil
-	}
-	claims := josejwt.Claims{}
-	ctx.SetAny(a, claims)
-	return claims, err
+	val, err := ctx.Any(a)
+	return val.(josejwt.Claims), err
 }
 
 // Serve implements gear.Handler interface. We can use it as middleware.
diff --git a/auth_test.go b/auth_test.go
index 9370700..8b77e7c 100644
--- a/auth_test.go
+++ b/auth_test.go
@@ -36,7 +36,7 @@ func TestGearAuth(t *testing.T) {
 		assert.Nil(err)
 		assert.Equal(401, res.StatusCode)
 		body, _ := res.Text()
-		assert.Equal("No token found", body)
+		assert.Equal("no token found", body)
 
 		a1 := New([]byte("wrong key"))
 		claims := jwt.Claims{}