FEAT: ISOLATED PRICING TOKEN FROM AUTH CONFIGURATION

Author: Alex-GF

pom.xml

@@ -7,7 +7,7 @@
 
 	<groupId>io.github.isa-group</groupId>
 	<artifactId>Pricing4Java</artifactId>
-	<version>3.1.0</version>
+	<version>3.3.0</version>
 
 	<name>${project.groupId}:${project.artifactId}</name>
 	<description>A pricing driven feature toggling library for java</description>

src/main/java/io/github/isagroup/filters/RenewTokenFilter.java

@@ -16,6 +16,8 @@
 import io.github.isagroup.PricingEvaluatorUtil;
 import io.github.isagroup.services.jwt.JwtUtils;
 
+import java.util.Map;
+
 public class RenewTokenFilter extends OncePerRequestFilter {
 
 	@Autowired
@@ -35,17 +37,25 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 			throws ServletException, IOException {
 
 		try {
-			String jwt = parseJwt(request);
+			String pricingJwt = parsePricingJwt(request);
+			String authJwt = parseAuthJwt(request);
 
-			if (jwt != null && jwtUtils.validateJwtToken(jwt) && pricingContext.userAffectedByPricing()) {
+			if (authJwt != null && jwtUtils.validateJwtToken(authJwt) && pricingContext.userAffectedByPricing()) {
 
 				String newToken = pricingEvaluatorUtil.generateUserToken();
 
-				String newTokenFeatures = jwtUtils.getFeaturesFromJwtToken(newToken).toString();
-				String jwtFeatures = jwtUtils.getFeaturesFromJwtToken(jwt).toString();
+				Map<String, Map<String, Object>> newTokenFeatures = jwtUtils.getFeaturesFromJwtToken(newToken);
+				Map<String, Map<String, Object>> jwtFeatures = jwtUtils.getFeaturesFromJwtToken(pricingJwt);
+
+				String newTokenFeaturesString = "";
+				String jwtFeaturesString = "";
 
-				if (!newTokenFeatures.equals(jwtFeatures)) {
-					response.addHeader("New-Token", newToken);
+				if (newTokenFeatures != null) newTokenFeaturesString = newTokenFeatures.toString();
+				
+				if (jwtFeatures != null) jwtFeaturesString = jwtFeatures.toString();
+				
+				if (!newTokenFeaturesString.equals(jwtFeaturesString)) {
+					response.addHeader("Pricing-Token", newToken);
 				}
 			}
 		} catch (Exception e) {
@@ -56,7 +66,17 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 		filterChain.doFilter(request, response);
 	}
 
-	private String parseJwt(HttpServletRequest request) {
+	private String parsePricingJwt(HttpServletRequest request) {
+		String headerPricing = request.getHeader("Pricing-Token");
+
+		if (StringUtils.hasText(headerPricing)) {
+			return headerPricing;
+		}
+
+		return null;
+	}
+
+	private String parseAuthJwt(HttpServletRequest request) {
 		String headerAuth = request.getHeader("Authorization");
 
 		if (StringUtils.hasText(headerAuth) && headerAuth.startsWith("Bearer ")) {