REFACTOR: CHANGED NAME OF JWTUTILS

Author: Alex-GF

pom.xml

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

src/main/java/io/github/isagroup/PricingContext.java

@@ -78,14 +78,6 @@ public Boolean userAffectedByPricing(){
      */
     public abstract String getUserPlan();
 
-    /**
-     * This method should return the object used inside the application to determine
-     * the authority of the user inside the JWT.
-     * 
-     * @return Current user's authorities object
-     */
-    public abstract Object getUserAuthorities();
-
     /**
      * This method returns the plan context of the current user, represented by a
      * {@link Map}. It's used to evaluate the pricing plan.

src/main/java/io/github/isagroup/PricingEvaluatorUtil.java

@@ -15,7 +15,7 @@
 import io.github.isagroup.models.FeatureStatus;
 import io.github.isagroup.models.PlanContextManager;
 import io.github.isagroup.models.PricingManager;
-import io.github.isagroup.services.jwt.JwtUtils;
+import io.github.isagroup.services.jwt.PricingJwtUtils;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
 
@@ -27,14 +27,14 @@
 public class PricingEvaluatorUtil {
 
     @Autowired
-    private JwtUtils jwtUtils;
+    private PricingJwtUtils jwtUtils;
 
     @Autowired
     private PricingContext pricingContext;
 
     public PricingEvaluatorUtil(PricingContext pricingContext) {
         this.pricingContext = pricingContext;
-        this.jwtUtils = new JwtUtils(pricingContext);
+        this.jwtUtils = new PricingJwtUtils(pricingContext);
     }
 
     Logger logger = Logger.getLogger(PricingEvaluatorUtil.class.getName());
@@ -50,8 +50,6 @@ public PricingEvaluatorUtil(PricingContext pricingContext) {
     public String generateUserToken() {
 
         Map<String, Object> claims = new HashMap<>();
-        
-        claims.put("authorities", pricingContext.getUserAuthorities());
 
         String subject = "Default";
 
@@ -176,7 +174,6 @@ private String buildJwtToken(Map<String, Map<String, Object>> features, String s
 
         Map<String, Object> claims = new HashMap<>();
 
-        claims.put("authorities", pricingContext.getUserAuthorities());
         claims.put("features", features);
         claims.put("userContext", pricingContext.getUserContext());
         claims.put("planContext", pricingContext.getPlanContext());

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

@@ -14,14 +14,14 @@
 
 import io.github.isagroup.PricingContext;
 import io.github.isagroup.PricingEvaluatorUtil;
-import io.github.isagroup.services.jwt.JwtUtils;
+import io.github.isagroup.services.jwt.PricingJwtUtils;
 
 import java.util.Map;
 
 public class RenewTokenFilter extends OncePerRequestFilter {
 
 	@Autowired
-	private JwtUtils jwtUtils;
+	private PricingJwtUtils jwtUtils;
 
 	@Value("${petclinic.app.jwtSecret}")
 	private String jwtSecret;

…thub/isagroup/services/jwt/JwtUtils.java …agroup/services/jwt/PricingJwtUtils.javasrc/main/java/io/github/isagroup/services/jwt/JwtUtils.java renamed to src/main/java/io/github/isagroup/services/jwt/PricingJwtUtils.java src/main/java/io/github/isagroup/services/jwt/JwtUtils.java renamed to src/main/java/io/github/isagroup/services/jwt/PricingJwtUtils.java

@@ -22,16 +22,16 @@
  * Utility class that provides methods to generate and manage JWT.
  */
 @Component
-public class JwtUtils {
+public class PricingJwtUtils {
 
 	@Autowired
 	private PricingContext pricingContext;
 
-	public JwtUtils(PricingContext pricingContext) {
+	public PricingJwtUtils(PricingContext pricingContext) {
 		this.pricingContext = pricingContext;
 	}
 
-	private static final Logger logger = LoggerFactory.getLogger(JwtUtils.class);
+	private static final Logger logger = LoggerFactory.getLogger(PricingJwtUtils.class);
 
 	/**
 	 * Extracts the subject from the given JWT.

src/test/java/io/github/isagroup/PricingContextTestImpl.java

@@ -61,12 +61,6 @@ public void setUserPlan(String userPlan) {
         this.userPlan = userPlan;
     }
 
-    @Override
-    public Object getUserAuthorities() {
-
-        return this.userAuthorities;
-    }
-
     public void setUserAuthorities(Map<String, Object> userAuthorities) {
         this.userAuthorities = userAuthorities;
     }

src/test/java/io/github/isagroup/PricingEvaluatorUtilTests.java

@@ -10,7 +10,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import io.github.isagroup.services.jwt.JwtUtils;
+import io.github.isagroup.services.jwt.PricingJwtUtils;
 
 public class PricingEvaluatorUtilTests {
 
@@ -26,7 +26,7 @@ public class PricingEvaluatorUtilTests {
 
         private PricingEvaluatorUtil pricingEvaluatorUtil;
 
-        private JwtUtils jwtUtils;
+        private PricingJwtUtils jwtUtils;
 
         @BeforeEach
         public void setUp() {
@@ -51,7 +51,7 @@ public void setUp() {
 
                 this.pricingContext = pricingContext;
                 this.pricingEvaluatorUtil = new PricingEvaluatorUtil(pricingContext);
-                this.jwtUtils = new JwtUtils(pricingContext);
+                this.jwtUtils = new PricingJwtUtils(pricingContext);
         }
 
         @Test

src/test/java/io/github/isagroup/PricingPlanAwareTests.java

@@ -24,12 +24,12 @@
 import io.github.isagroup.annotations.PricingPlanAwareAspect;
 import io.github.isagroup.exceptions.FilepathException;
 import io.github.isagroup.exceptions.PricingPlanEvaluationException;
-import io.github.isagroup.services.jwt.JwtUtils;
+import io.github.isagroup.services.jwt.PricingJwtUtils;
 
 @ExtendWith(SpringExtension.class)
 @SpringBootTest
 @Import({ io.github.isagroup.annotations.PricingPlanAwareAspect.class, io.github.isagroup.PricingEvaluatorUtil.class,
-        io.github.isagroup.services.jwt.JwtUtils.class })
+        io.github.isagroup.services.jwt.PricingJwtUtils.class })
 public class PricingPlanAwareTests {
 
     private static final String JWT_SECRET_TEST = "secret";
@@ -98,16 +98,6 @@ public String getUserPlan() {
                 return "BASIC";
             }
 
-            @Override
-            public Object getUserAuthorities() {
-                Map<String, String> userAuthorities = new HashMap<>();
-                userAuthorities.put("role", "admin");
-                userAuthorities.put("username", "admin1");
-                userAuthorities.put("password", "4dm1n");
-
-                return userAuthorities;
-            }
-
         }
 
     }
@@ -122,7 +112,7 @@ public Object getUserAuthorities() {
     private PricingEvaluatorUtil pricingEvaluatorUtil;
 
     @Autowired
-    private JwtUtils jwtUtils;
+    private PricingJwtUtils jwtUtils;
 
     @Mock
     private ProceedingJoinPoint joinPoint;