Merge pull request #34 from wwan13/feature/refactor

Feature/refactor

Author: wwan13

build.gradle

@@ -20,9 +20,6 @@ dependencies {
     // spring
     implementation 'org.springframework.boot:spring-boot-starter'
 
-    // spring validation
-    implementation 'org.springframework.boot:spring-boot-starter-validation'
-
     // web
     implementation 'org.springframework.boot:spring-boot-starter-web'
 

src/main/java/io/wwan13/wintersecurity/config/JwtProviderConfigurer.java

@@ -18,9 +18,7 @@
 
 import io.wwan13.wintersecurity.jwt.support.JwtPropertiesRegistry;
 
-import javax.validation.constraints.NotNull;
-
 public interface JwtProviderConfigurer extends SecretKeyConfigurer {
 
-    void configureJwt(@NotNull JwtPropertiesRegistry registry);
+    void configureJwt(JwtPropertiesRegistry registry);
 }

src/main/java/io/wwan13/wintersecurity/config/SecretKeyConfigurer.java

@@ -18,9 +18,7 @@
 
 import io.wwan13.wintersecurity.secretkey.support.SecretKeyRegistry;
 
-import javax.validation.constraints.NotNull;
-
 public interface SecretKeyConfigurer {
 
-    void configureSecretKey(@NotNull SecretKeyRegistry registry);
+    void configureSecretKey(SecretKeyRegistry registry);
 }

src/main/java/io/wwan13/wintersecurity/config/SecureRequestConfigurer.java

@@ -19,12 +19,10 @@
 import io.wwan13.wintersecurity.auth.authpattern.support.AuthPatternsRegistry;
 import io.wwan13.wintersecurity.resolve.support.TargetAnnotationsRegistry;
 
-import javax.validation.constraints.NotNull;
-
 public interface SecureRequestConfigurer extends SecretKeyConfigurer {
 
-    void registerAuthPatterns(@NotNull AuthPatternsRegistry registry);
+    void registerAuthPatterns(AuthPatternsRegistry registry);
 
-    default void registerTargetAnnotations(@NotNull TargetAnnotationsRegistry registry) {
+    default void registerTargetAnnotations(TargetAnnotationsRegistry registry) {
     }
 }

src/main/java/io/wwan13/wintersecurity/jwt/provider/JwtTokenDecoder.java

@@ -17,6 +17,7 @@
 package io.wwan13.wintersecurity.jwt.provider;
 
 import io.jsonwebtoken.*;
+import io.jsonwebtoken.security.SignatureException;
 import io.wwan13.wintersecurity.exception.unauthirized.ExpiredJwtTokenException;
 import io.wwan13.wintersecurity.exception.unauthirized.InvalidJwtTokenException;
 import io.wwan13.wintersecurity.jwt.TokenClaims;
@@ -51,6 +52,8 @@ public Claims parseClaimsWithExceptionHandling(String token) {
             throw new ExpiredJwtTokenException();
         } catch (MalformedJwtException | UnsupportedJwtException | IllegalArgumentException e) {
             throw new InvalidJwtTokenException();
+        } catch (SignatureException e) {
+            throw new IllegalStateException("Secret key does not match where jwt token provided.");
         }
     }
 }