feat: bump jwt to v5, use inbuilt Validater

adhocore · Apr 13, 2024 · 38c0889 · 38c0889
1 parent f127ee7
commit 38c0889
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/go.mod b/go.mod
@@ -2,4 +2,4 @@ module github.com/adhocore/goic
 
 go 1.18
 
-require github.com/golang-jwt/jwt/v4 v4.1.0
+require github.com/golang-jwt/jwt/v5 v5.2.1
diff --git a/go.sum b/go.sum
@@ -1,2 +1,2 @@
-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-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
+github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
diff --git a/goic.go b/goic.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/golang-jwt/jwt/v4"
+	"github.com/golang-jwt/jwt/v5"
 )
 
 var (

diff --git a/user.go b/user.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"strings"
 
-	"github.com/golang-jwt/jwt/v4"
+	"github.com/golang-jwt/jwt/v5"
 )
 
 // User represents user from well known user info endpoint
@@ -68,8 +68,8 @@ func (tok *Token) VerifyClaims(nonce, aud string) (err error) {
 		return ErrTokenNonce
 	}
 
-	if _, ok = claims["aud"]; ok && !claims.VerifyAudience(aud, true) {
-		return ErrTokenAud
+	if err = jwt.NewValidator().Validate(claims); err != nil {
+		return err
 	}
 
 	tok.Claims = claims // attach only if valid
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ module github.com/adhocore/goic

		go 1.18

		require github.com/golang-jwt/jwt/v4 v4.1.0
		require github.com/golang-jwt/jwt/v5 v5.2.1
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ import ( @@
     	"strings"
     	"sync"
-    	"github.com/golang-jwt/jwt/v4"
+    	"github.com/golang-jwt/jwt/v5"
     )
     var (
@@ Expand Down @@