update to Middleware

Author: zhaopengme

auth_jwt.go

@@ -1,16 +1,15 @@
 package jwt
 
 import (
-    "crypto/rsa"
-    "errors"
-    "github.com/gogf/gf/g"
-    "github.com/gogf/gf/g/net/ghttp"
-    "io/ioutil"
-    "net/http"
-    "strings"
-    "time"
-
+	"crypto/rsa"
+	"errors"
 	"github.com/dgrijalva/jwt-go"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+	"io/ioutil"
+	"net/http"
+	"strings"
+	"time"
 )
 
 // MapClaims type that uses the map[string]interface{} for JSON decoding
@@ -392,7 +391,7 @@ func (mw *GfJWTMiddleware) GetClaimsFromJWT(r *ghttp.Request) (MapClaims, error)
 	}
 
 	if mw.SendAuthorization {
-		token := r.GetParam("JWT_TOKEN").String()
+		token := r.GetString("JWT_TOKEN")
 		if len(token) > 0 {
 			r.Header.Set("Authorization", mw.TokenHeadName+" "+token)
 		}
@@ -444,8 +443,8 @@ func (mw *GfJWTMiddleware) LoginHandler(r *ghttp.Request) {
 
 	// set cookie
 	if mw.SendCookie {
-		maxage := int(expire.Unix() - time.Now().Unix())
-		r.Cookie.SetCookie(mw.CookieName, tokenString, mw.CookieDomain, "/", maxage)
+		maxage := int64(expire.Unix() - time.Now().Unix())
+		r.Cookie.SetCookie(mw.CookieName, tokenString, mw.CookieDomain, "/", time.Duration(maxage)*time.Millisecond)
 	}
 
 	mw.LoginResponse(r, http.StatusOK, tokenString, expire)
@@ -501,8 +500,8 @@ func (mw *GfJWTMiddleware) RefreshToken(r *ghttp.Request) (string, time.Time, er
 
 	// set cookie
 	if mw.SendCookie {
-		maxage := int(expire.Unix() - time.Now().Unix())
-		r.Cookie.SetCookie(mw.CookieName, tokenString, mw.CookieDomain, "/", maxage)
+		maxage := int64(expire.Unix() - time.Now().Unix())
+		r.Cookie.SetCookie(mw.CookieName, tokenString, mw.CookieDomain, "/", time.Duration(maxage)*time.Millisecond)
 	}
 
 	return tokenString, expire, nil
@@ -656,13 +655,13 @@ func (mw *GfJWTMiddleware) unauthorized(r *ghttp.Request, code int, message stri
 
 // ExtractClaims help to extract the JWT claims
 func ExtractClaims(r *ghttp.Request) MapClaims {
-	claims := r.GetParam("JWT_PAYLOAD").Val()
+	claims := r.GetParam("JWT_PAYLOAD")
 	return claims.(MapClaims)
 }
 
 // GetToken help to get the JWT token string
 func GetToken(r *ghttp.Request) string {
-	token := r.GetParam("JWT_TOKEN").String()
+	token := r.GetString("JWT_TOKEN")
 	if len(token) == 0 {
 		return ""
 	}

example/auth/auth.go

@@ -1,11 +1,11 @@
 package auth
 
 import (
-	"github.com/gogf/gf-jwt"
-	"github.com/gogf/gf/g"
-	"github.com/gogf/gf/g/net/ghttp"
-	"github.com/gogf/gf/g/os/glog"
-	"github.com/gogf/gf/g/util/gvalid"
+	jwt "github.com/gogf/gf-jwt"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+	"github.com/gogf/gf/os/glog"
+	"github.com/gogf/gf/util/gvalid"
 	"net/http"
 	"time"
 )

example/server/server.go

@@ -2,8 +2,9 @@ package main
 
 import (
 	"github.com/gogf/gf-jwt/example/auth"
-	"github.com/gogf/gf/g"
-	"github.com/gogf/gf/g/net/ghttp"
+	"github.com/gogf/gf/frame/g"
+	"github.com/gogf/gf/net/ghttp"
+	"time"
 )
 
 // hello should be authenticated to view.
@@ -17,21 +18,25 @@ func works(r *ghttp.Request) {
 }
 
 // authHook is the HOOK function implements JWT logistics.
-func authHook(r *ghttp.Request) {
-	r.Response.CORSDefault()
+func MiddlewareAuth(r *ghttp.Request) {
 	auth.GfJWTMiddleware.MiddlewareFunc()(r)
+	r.Middleware.Next()
+}
+
+func MiddlewareCORS(r *ghttp.Request) {
+	r.Response.CORSDefault()
+	r.Middleware.Next()
 }
 
 func main() {
+	println(time.Now().Unix())
 	s := g.Server()
-	s.Group().Bind("/", []ghttp.GroupItem{
-		{"ALL",  "/",             works},
-		{"POST", "/login",        auth.GfJWTMiddleware.LoginHandler},
-	})
-	s.Group("/user").Bind("/user", []ghttp.GroupItem{
-		{"ALL", "*",              authHook, ghttp.HOOK_BEFORE_SERVE},
-		{"GET", "/refresh_token", auth.GfJWTMiddleware.RefreshHandler},
-		{"GET", "/hello",         hello},
+	s.BindHandler("/", works)
+	s.BindHandler("POST:/login", auth.GfJWTMiddleware.LoginHandler)
+	s.Group("/user", func(g *ghttp.RouterGroup) {
+		g.Middleware(MiddlewareCORS, MiddlewareAuth)
+		g.ALL("/refresh_token", auth.GfJWTMiddleware.RefreshHandler)
+		g.ALL("/hello", hello)
 	})
 	s.SetPort(8000)
 	s.Run()

go.mod

@@ -2,5 +2,7 @@ module github.com/gogf/gf-jwt
 
 require (
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
-	github.com/gogf/gf v1.6.2
+	github.com/gogf/gf v1.9.7
 )
+
+go 1.13