Refactor: TWT decode

authmdl/jwtmdl/jwtmdl_fasthttp.go

@@ -47,31 +47,33 @@ func DecodeTokenWithJWTKey(req *fasthttp.Request, jwtKey string) (jwt.MapClaims,
 
 // DecodeToken decode token
 func DecodeToken(req *fasthttp.Request) (jwt.MapClaims, error) {
-	tokenFromRequest := string(req.Header.Peek("Authorization"))
-	tokenArray := strings.Split(tokenFromRequest, "Bearer")
-	if len(tokenArray) <= 1 {
-		return nil, errormdl.Wrap("Provided JWT token is nil or invalid ")
-	}
-	tokenFromRequest = strings.Trim(tokenArray[1], " ")
-	// get data i.e.Claims from token
-	token, err := jwt.Parse(tokenFromRequest, func(token *jwt.Token) (interface{}, error) {
-		// Don't forget to validate the alg is what you expect:
-		_, ok := token.Method.(*jwt.SigningMethodHMAC)
-		if !ok {
-			return nil, fmt.Errorf("Unexpected signing method: %v", token.Header["alg"])
-		}
-		return []byte(GlobalJWTKey), nil
-	})
+	// tokenFromRequest := string(req.Header.Peek("Authorization"))
+	// tokenArray := strings.Split(tokenFromRequest, "Bearer")
+	// if len(tokenArray) <= 1 {
+	// 	return nil, errormdl.Wrap("Provided JWT token is nil or invalid ")
+	// }
+	// tokenFromRequest = strings.Trim(tokenArray[1], " ")
+	// // get data i.e.Claims from token
+	// token, err := jwt.Parse(tokenFromRequest, func(token *jwt.Token) (interface{}, error) {
+	// 	// Don't forget to validate the alg is what you expect:
+	// 	_, ok := token.Method.(*jwt.SigningMethodHMAC)
+	// 	if !ok {
+	// 		return nil, fmt.Errorf("Unexpected signing method: %v", token.Header["alg"])
+	// 	}
+	// 	return []byte(GlobalJWTKey), nil
+	// })
 
-	if err != nil {
-		loggermdl.LogError("Error while parsing JWT Token: ", err)
-		return nil, err
-	}
+	// if err != nil {
+	// 	loggermdl.LogError("Error while parsing JWT Token: ", err)
+	// 	return nil, err
+	// }
 
-	claims, ok := token.Claims.(jwt.MapClaims)
-	if !errormdl.CheckBool1(ok) {
-		loggermdl.LogError("Error while parsing claims to MapClaims")
-		return nil, errormdl.Wrap("Error while getting claims")
-	}
-	return claims, nil
+	// claims, ok := token.Claims.(jwt.MapClaims)
+	// if !errormdl.CheckBool1(ok) {
+	// 	loggermdl.LogError("Error while parsing claims to MapClaims")
+	// 	return nil, errormdl.Wrap("Error while getting claims")
+	// }
+	// return claims, nil
+
+	return DecodeTokenWithJWTKey(req, GlobalJWTKey)
 }

authmdl/jwtmdl/jwtmdl_http.go

@@ -34,18 +34,20 @@ func DecodeTokenWithJWTKey(req *http.Request, jwtKey string) (jwt.MapClaims, err
 
 // DecodeToken decode token
 func DecodeToken(req *http.Request) (jwt.MapClaims, error) {
-	token, err := request.ParseFromRequest(req, request.OAuth2Extractor, func(token *jwt.Token) (interface{}, error) {
-		b := ([]byte(GlobalJWTKey))
-		return b, nil
-	})
-	if errormdl.CheckErr(err) != nil {
-		loggermdl.LogError("Error while parsing JWT Token: ", errormdl.CheckErr(err))
-		return nil, errormdl.CheckErr(err)
-	}
-	claims, ok := token.Claims.(jwt.MapClaims)
-	if !errormdl.CheckBool1(ok) {
-		loggermdl.LogError("Error while parsing claims to MapClaims")
-		return nil, errormdl.Wrap("Error while getting claims")
-	}
-	return claims, nil
+	// token, err := request.ParseFromRequest(req, request.OAuth2Extractor, func(token *jwt.Token) (interface{}, error) {
+	// 	b := ([]byte(GlobalJWTKey))
+	// 	return b, nil
+	// })
+	// if errormdl.CheckErr(err) != nil {
+	// 	loggermdl.LogError("Error while parsing JWT Token: ", errormdl.CheckErr(err))
+	// 	return nil, errormdl.CheckErr(err)
+	// }
+	// claims, ok := token.Claims.(jwt.MapClaims)
+	// if !errormdl.CheckBool1(ok) {
+	// 	loggermdl.LogError("Error while parsing claims to MapClaims")
+	// 	return nil, errormdl.Wrap("Error while getting claims")
+	// }
+	// return claims, nil
+
+	return DecodeTokenWithJWTKey(req, GlobalJWTKey)
 }