From 6c30ccfb144299db01e1f8380c6f937c6abd6508 Mon Sep 17 00:00:00 2001
From: Yang Luo <hsluoyz@qq.com>
Date: Sun, 10 Oct 2021 11:51:19 +0800
Subject: [PATCH] Update github.com/golang-jwt/jwt to v4.

---
 go.mod              |  2 +-
 go.sum              |  4 ++--
 object/token_jwt.go | 18 +++++++++---------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/go.mod b/go.mod
index 212db65a..c25cc906 100644
--- a/go.mod
+++ b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df
 	github.com/go-ldap/ldap/v3 v3.3.0
 	github.com/go-sql-driver/mysql v1.5.0
-	github.com/golang-jwt/jwt v3.2.2+incompatible
+	github.com/golang-jwt/jwt/v4 v4.1.0
 	github.com/google/uuid v1.2.0
 	github.com/jinzhu/configor v1.2.1 // indirect
 	github.com/mileusna/crontab v1.0.1
diff --git a/go.sum b/go.sum
index 0e1e9d13..e50b50ba 100644
--- a/go.sum
+++ b/go.sum
@@ -127,8 +127,8 @@ github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LB
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A=
-github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
-github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
+github.com/golang-jwt/jwt/v4 v4.1.0 h1:XUgk2Ex5veyVFVeLm0xhusUTQybEbexJXrvPNOKkSY0=
+github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
diff --git a/object/token_jwt.go b/object/token_jwt.go
index 0be97c8a..2bf7d5cb 100644
--- a/object/token_jwt.go
+++ b/object/token_jwt.go
@@ -17,14 +17,14 @@ package object
 import (
 	"time"
 
-	"github.com/golang-jwt/jwt"
+	"github.com/golang-jwt/jwt/v4"
 )
 
 var jwtSecret = []byte("CasdoorSecret")
 
 type Claims struct {
 	User
-	jwt.StandardClaims
+	jwt.RegisteredClaims
 }
 
 func generateJwtToken(application *Application, user *User) (string, error) {
@@ -35,14 +35,14 @@ func generateJwtToken(application *Application, user *User) (string, error) {
 
 	claims := Claims{
 		User: *user,
-		StandardClaims: jwt.StandardClaims{
-			Audience:  application.ClientId,
-			ExpiresAt: expireTime.Unix(),
-			Id:        "",
-			IssuedAt:  nowTime.Unix(),
-			Issuer:    "casdoor",
-			NotBefore: nowTime.Unix(),
+		RegisteredClaims: jwt.RegisteredClaims{
+			Issuer:    "Casdoor",
 			Subject:   user.Id,
+			Audience:  []string{application.ClientId},
+			ExpiresAt: jwt.NewNumericDate(expireTime),
+			NotBefore: jwt.NewNumericDate(nowTime),
+			IssuedAt:  jwt.NewNumericDate(nowTime),
+			ID:        "",
 		},
 	}