@rivascva/dt-idl 1.1.108 → 1.1.110

package/go/auth/jwt.go

@@ -10,7 +10,7 @@ import (
 
 // ValidateToken validates the given JWT token using the provided secret.
 // It includes a check for the token expiration time.
-func ValidateToken(token string, secret string) (*jwt.Token, error) {
+func ValidateToken(token string, secret string) (*jwt.Token, ValidationError) {
 	// create a parser with the HS256 signing method
 	parser := jwt.NewParser(jwt.WithValidMethods([]string{jwt.SigningMethodHS256.Alg()}))
 
@@ -26,7 +26,7 @@ func ValidateToken(token string, secret string) (*jwt.Token, error) {
 		return nil, fmt.Errorf("failed to get the expiration time from the token: %w", err)
 	}
 	if expirationTime.Before(time.Now()) {
-		return nil, fmt.Errorf("the token has expired")
+		return nil, ErrorExpiredToken
 	}
 
 	return parsedToken, nil

package/go/auth/models.go

@@ -1,6 +1,9 @@
 package auth
 
-import "time"
+import (
+	"errors"
+	"time"
+)
 
 // DefaultServiceAccessTokenDuration is the default duration for service access tokens.
 const DefaultServiceAccessTokenDuration = 60 * time.Minute
@@ -16,3 +19,11 @@ const DefaultUserRefreshTokenDuration = 30 * 24 * time.Hour
 
 // approvedServices is a list of services that are allowed to access sensitive data.
 var approvedServices = []string{"dt-trade-service", "dt-portfolio-service", "dt-asset-service", "dt-user-service"}
+
+// ValidationError represents an error from validating a token.
+type ValidationError = error
+
+var (
+	// ErrorExpiredToken is returned when a token is expired.
+	ErrorExpiredToken ValidationError = errors.New("expired token")
+)

package/go/middlewares/middlewares.go

@@ -2,6 +2,7 @@ package middlewares
 
 import (
 	"context"
+	"errors"
 	"net/http"
 	"slices"
 	"strings"
@@ -37,6 +38,10 @@ func GetAuthMiddleware(accessTokenSecret string) func(http.Handler) http.Handler
 
 			// validate the access token
 			accessToken, err := auth.ValidateToken(arr[1], accessTokenSecret)
+			if errors.Is(err, auth.ErrorExpiredToken) {
+				write.ResponseWithError(r.Context(), w, http.StatusUnauthorized, "expired access token")
+				return
+			}
 			if err != nil {
 				write.ResponseWithError(r.Context(), w, http.StatusUnauthorized, "invalid access token")
 				return

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rivascva/dt-idl",
-  "version": "1.1.108",
+  "version": "1.1.110",
   "description": "Dream Trade - Interface Definition Language",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",