generate uuid with err (#4)

turingvideo · Jul 13, 2020 · 38b96a8 · 38b96a8
1 parent 02ea9f7
commit 38b96a8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/auth_jwt.go b/auth_jwt.go
@@ -453,7 +453,13 @@ func (mw *GinJWTMiddleware) LoginHandler(c *gin.Context) {
 	claims["exp"] = expire.Unix()
 	claims["orig_iat"] = mw.TimeFunc().Unix()
 	// add uuid as a default claim
-	claims["uuid"] = uuid.NewV4()
+	uuid, err := uuid.NewV4()
+	if err != nil {
+		mw.unauthorized(c, http.StatusUnauthorized, mw.HTTPStatusMessageFunc(err, c))
+		return
+	}
+	claims["uuid"] = uuid
+
 	tokenString, err := mw.signedString(token)
 
 	if err != nil {
@@ -540,7 +546,12 @@ func (mw *GinJWTMiddleware) RefreshToken(c *gin.Context) (string, time.Time, err
 	newClaims["exp"] = expire.Unix()
 	newClaims["orig_iat"] = mw.TimeFunc().Unix()
 	// generate a new uuid for refreshed token
-	newClaims["uuid"] = uuid.NewV4()
+	uuid, err := uuid.NewV4()
+	if err != nil {
+		return "", time.Now(), err
+	}
+	newClaims["uuid"] = uuid
+
 	tokenString, err := mw.signedString(newToken)
 
 	if err != nil {
@@ -607,7 +618,12 @@ func (mw *GinJWTMiddleware) TokenGenerator(data interface{}) (string, time.Time,
 	claims["exp"] = expire.Unix()
 	claims["orig_iat"] = mw.TimeFunc().Unix()
 	// add uuid as a default claim
-	claims["uuid"] = uuid.NewV4()
+	uuid, err := uuid.NewV4()
+	if err != nil {
+		return "", time.Time{}, err
+	}
+	claims["uuid"] = uuid
+
 	tokenString, err := mw.signedString(token)
 	if err != nil {
 		return "", time.Time{}, err

diff --git a/go.mod b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/gin-gonic/gin v1.6.3
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.1 // indirect
-	github.com/satori/go.uuid v1.2.0
+	github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b
 	github.com/stretchr/testify v1.5.1
 	github.com/tidwall/gjson v1.6.0
 )
diff --git a/go.sum b/go.sum
@@ -34,8 +34,8 @@ github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
-github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
+github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b h1:gQZ0qzfKHQIybLANtM3mBXNUtOfsCFXeTsnBqCsx1KM=
+github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=