JWT authentication refactoring

fdanismaz · fdanismaz · commit 5e96e1364e4f · 2018-10-21T16:59:50.000+03:00
diff --git a/authentication/authentication-commons-jwt/pom.xml b/authentication/authentication-commons-jwt/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>stateless-auth</artifactId>
+        <artifactId>authentication</artifactId>
         <groupId>com.fd</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
diff --git a/authentication/authentication-commons-jwt/src/main/java/com/fd/tryout/security/jwt/JwtUsernamePasswordAuthenticationFilter.java b/authentication/authentication-commons-jwt/src/main/java/com/fd/tryout/security/jwt/JwtUsernamePasswordAuthenticationFilter.java
@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
+import lombok.Data;
 import lombok.var;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -52,6 +53,11 @@ public Authentication attemptAuthentication(HttpServletRequest request, HttpServ
     @Override
     protected void successfulAuthentication(HttpServletRequest request, HttpServletResponse response,
                                             FilterChain chain, Authentication auth) {
+        String token = this.generateToken(auth);
+        response.addHeader(config.getHeader(), config.getPrefix() + " " + token);
+    }
+
+    private String generateToken(Authentication auth) {
         Instant now = Instant.now();
         List<String> authorities = auth.getAuthorities().stream().map(GrantedAuthority::getAuthority)
                 .collect(Collectors.toList());
@@ -62,6 +68,12 @@ protected void successfulAuthentication(HttpServletRequest request, HttpServletR
                 .setExpiration(Date.from(now.plusSeconds(config.getExpiration())))
                 .signWith(SignatureAlgorithm.HS256, config.getSecret().getBytes())
                 .compact();
-        response.addHeader(config.getHeader(), config.getPrefix() + " " + token);
+        return token;
+    }
+
+    @Data
+    private class User {
+        private String username;
+        private String password;
     }
 }
diff --git a/authentication/authentication-commons-jwt/src/main/java/com/fd/tryout/security/jwt/User.java b/authentication/authentication-commons-jwt/src/main/java/com/fd/tryout/security/jwt/User.java
diff --git a/authentication/authentication-commons/pom.xml b/authentication/authentication-commons/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>stateless-auth</artifactId>
+        <artifactId>authentication</artifactId>
         <groupId>com.fd</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
diff --git a/authentication/authentication-db/pom.xml b/authentication/authentication-db/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>stateless-auth</artifactId>
+        <artifactId>authentication</artifactId>
         <groupId>com.fd</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
diff --git a/authentication/jwt-authentication-filter.graphml b/authentication/jwt-authentication-filter.graphml
diff --git a/authentication/jwt-authentication-service/pom.xml b/authentication/jwt-authentication-service/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>stateless-auth</artifactId>
+        <artifactId>authentication</artifactId>
         <groupId>com.fd</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
diff --git a/authentication/jwt-authentication-service/src/main/java/com/fd/tryout/security/jwt/config/SecurityConfig.java b/authentication/jwt-authentication-service/src/main/java/com/fd/tryout/security/jwt/config/SecurityConfig.java
@@ -40,14 +40,6 @@ public AuthenticationProvider authenticationProvider() {
         return new DbAuthenticationProvider(this.userRepository);
     }
 
-//    @Autowired
-//    public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-//        UserDetails admin = User.withUsername("admin").password("{noop}admin").roles("ADMIN, USER").build();
-//        UserDetails john = User.withUsername("john").password("{noop}doe").roles("ADMIN, USER").build();
-//
-//        auth.inMemoryAuthentication().withUser(admin).withUser(john);
-//    }
-
     @Override
     protected void configure(HttpSecurity httpSecurity) throws Exception {
         httpSecurity
diff --git a/authentication/pom.xml b/authentication/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.fd</groupId>
-    <artifactId>stateless-auth</artifactId>
+    <artifactId>authentication</artifactId>
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
@@ -35,11 +35,11 @@
         <mapstruct.version>1.2.0.Final</mapstruct.version>
         <hibernate.jpamodelgen-version>5.3.2.Final</hibernate.jpamodelgen-version>
         <jaxb.version>2.3.0</jaxb.version>
+        <jjwt.version>0.9.1</jjwt.version>
 
         <maven.plugin.compiler.version>3.7.0</maven.plugin.compiler.version>
         <maven.plugin.build-helper.version>3.0.0</maven.plugin.build-helper.version>
         <maven.plugin.processor.version>3.2.0</maven.plugin.processor.version>
-
     </properties>
 
     <dependencyManagement>
@@ -106,7 +106,7 @@
             <dependency>
                 <groupId>io.jsonwebtoken</groupId>
                 <artifactId>jjwt</artifactId>
-                <version>0.9.1</version>
+                <version>${jjwt.version}</version>
             </dependency>
 
             <dependency>
diff --git a/authentication/simple-authentication-service/pom.xml b/authentication/simple-authentication-service/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>stateless-auth</artifactId>
+        <artifactId>authentication</artifactId>
         <groupId>com.fd</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
diff --git a/authentication/spring-session-authentication-service/pom.xml b/authentication/spring-session-authentication-service/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>stateless-auth</artifactId>
+        <artifactId>authentication</artifactId>
         <groupId>com.fd</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
