refactored authentication into a restcontroller

Riccardo Causo · Riccardo Causo · commit ec0f9aecd82b · 2016-10-17T16:05:55.000+02:00
diff --git a/src/main/java/com/myapp/auth/SecurityConfig.java b/src/main/java/com/myapp/auth/SecurityConfig.java
@@ -32,6 +32,12 @@ public SecurityConfig(UserService userService,
         this.tokenAuthenticationService = tokenAuthenticationService;
     }
 
+    @Bean
+    public StatelessAuthenticationFilter authenticationTokenFilterBean() throws Exception {
+        StatelessAuthenticationFilter authenticationTokenFilter = new StatelessAuthenticationFilter(tokenAuthenticationService);
+        return authenticationTokenFilter;
+    }
+
     @Override
     protected void configure(HttpSecurity http) throws Exception {
         // we use jwt so that we can disable csrf protection
@@ -55,12 +61,7 @@ protected void configure(HttpSecurity http) throws Exception {
                 .antMatchers(HttpMethod.GET, "/api/feed").hasRole("USER")
         ;
 
-        http.addFilterBefore(
-                new StatelessLoginFilter("/api/login", tokenAuthenticationService, userService, authenticationManager()),
-                UsernamePasswordAuthenticationFilter.class);
-
-        http.addFilterBefore(
-                new StatelessAuthenticationFilter(tokenAuthenticationService),
+        http.addFilterBefore(authenticationTokenFilterBean(),
                 UsernamePasswordAuthenticationFilter.class);
     }
 
diff --git a/src/main/java/com/myapp/auth/StatelessLoginFilter.java b/src/main/java/com/myapp/auth/StatelessLoginFilter.java
diff --git a/src/main/java/com/myapp/controller/AuthController.java b/src/main/java/com/myapp/controller/AuthController.java
@@ -0,0 +1,61 @@
+package com.myapp.controller;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.myapp.auth.TokenHandler;
+import com.myapp.dto.UserParams;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by riccardo.causo on 17.10.2016.
+ */
+@RestController
+@RequestMapping("/api/login")
+public class AuthController {
+
+    private final AuthenticationManager authenticationManager;
+    private final TokenHandler tokenHandler;
+    private final UserDetailsService userDetailsService;
+
+    @Autowired
+    AuthController(
+            AuthenticationManager authenticationManager,
+            TokenHandler tokenHandler,
+            UserDetailsService userDetailsService
+    ){
+
+        this.authenticationManager = authenticationManager;
+        this.tokenHandler = tokenHandler;
+        this.userDetailsService = userDetailsService;
+    }
+
+
+    @RequestMapping(method = RequestMethod.POST)
+    public ResponseEntity<String> authenticationRequest(@RequestBody UserParams params) throws AuthenticationException {
+
+        UsernamePasswordAuthenticationToken loginToken = params.toAuthenticationToken();
+        Authentication authentication =  authenticationManager.authenticate(loginToken);
+
+        SecurityContextHolder.getContext().setAuthentication(authentication);
+
+        UserDetails userDetails = userDetailsService.loadUserByUsername(params.getEmail().get());
+
+        String token = tokenHandler.createTokenForUser(userDetails);
+
+        // Return the token
+        return ResponseEntity.ok().header("x-auth-token",token).body("");
+    }
+
+
+}
