Authorization: WIP

Author: Nasruddin

api-gateway-service/pom.xml

@@ -58,7 +58,6 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-sleuth-zipkin</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>io.jsonwebtoken</groupId>
 			<artifactId>jjwt-api</artifactId>

api-gateway-service/src/main/java/com/javatab/gatewayservice/filters/RouterValidator.java

@@ -10,8 +10,8 @@
 public class RouterValidator {
 
     public static final List<String> openApiEndpoints= List.of(
-            "/auth/register",
-            "/auth/login"
+            "/register",
+            "/login"
     );
 
     public Predicate<ServerHttpRequest> isSecured =

auth-service/pom.xml

@@ -55,6 +55,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-security</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>

auth-service/src/main/java/com/javatab/authservice/controllers/AuthController.java

@@ -1,48 +1,27 @@
 package com.javatab.authservice.controllers;
 
-import com.javatab.authservice.domain.Role;
-import com.javatab.authservice.domain.User;
-import com.javatab.authservice.repository.UserRepository;
 import com.javatab.authservice.domain.AuthRequest;
 import com.javatab.authservice.domain.AuthResponse;
-import com.javatab.authservice.security.AuthService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashSet;
-import java.util.Set;
+import com.javatab.authservice.domain.User;
+import com.javatab.authservice.security.JwtUserDetailService;
+import com.javatab.authservice.services.UserService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/login")
+@RequiredArgsConstructor
 public class AuthController {
 
-    private AuthService authService;
-    private UserRepository userRepository;
+    private final JwtUserDetailService userDetailService;
+    private final UserService userService;
 
-    @Autowired
-    public AuthController(AuthService authService, UserRepository userRepository) {
-        this.authService = authService;
-        this.userRepository = userRepository;
+    @PostMapping("/login")
+    public AuthResponse login(@RequestBody AuthRequest request) throws Exception {
+        return userDetailService.createJwtToken(request);
     }
 
-    @PostMapping
-    public AuthResponse login(@RequestBody AuthRequest request) {
-        User user = new User();
-        user.setUsername(request.getUsername());
-        user.setPassword(request.getPassword());
-        user.setEmail(request.getEmail());
-        Role role1 = new Role();
-        role1.setRoleName("USER");
-        Role role2 = new Role();
-        role2.setRoleName("ADMIN");
-        Set<Role> roles = new HashSet<>();
-        roles.add(role1);
-        roles.add(role2);
-        user.setRoles(roles);
-        User user1 = userRepository.save(user);
-        return authService.login(request);
+    @PostMapping("/register")
+    public User registerNewUser(@RequestBody User user) {
+        return userService.createNewUser(user);
     }
 }

auth-service/src/main/java/com/javatab/authservice/controllers/RoleController.java

@@ -0,0 +1,22 @@
+package com.javatab.authservice.controllers;
+
+import com.javatab.authservice.domain.Role;
+import com.javatab.authservice.repository.RoleRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/roles")
+public class RoleController {
+
+    @Autowired
+    private RoleRepository roleRepository;
+
+    @PostMapping
+    public Role createNewRole(@RequestBody Role role) {
+        return roleRepository.save(role);
+    }
+}

auth-service/src/main/java/com/javatab/authservice/domain/Role.java

@@ -1,46 +1,22 @@
 package com.javatab.authservice.domain;
 
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import javax.persistence.*;
 import java.util.Set;
 
 @Entity
 @Table(name = "roles")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class Role {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
     @Column(name = "role")
     private String roleName;
 
-    @ManyToMany(mappedBy = "roles")
-    private Set<User> user;
-
-    public Role() {
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getRoleName() {
-        return roleName;
-    }
-
-    public void setRoleName(String roleName) {
-        this.roleName = roleName;
-    }
-
-    public Set<User> getUser() {
-        return user;
-    }
-
-    public void setUser(Set<User> user) {
-        this.user = user;
-    }
+    private String roleDescription;
 }

auth-service/src/main/java/com/javatab/authservice/domain/User.java

@@ -1,10 +1,17 @@
 package com.javatab.authservice.domain;
 
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 import javax.persistence.*;
 import java.util.Set;
 
 @Entity
 @Table(name = "Users")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class User {
 
     @Id
@@ -20,53 +27,10 @@ public class User {
     @Column(name = "email")
     private String email;
 
-    @ManyToMany(cascade = {CascadeType.ALL})
+    @ManyToMany(fetch = FetchType.EAGER, cascade = {CascadeType.ALL})
     @JoinTable(name = "user_role",
-            joinColumns = @JoinColumn(name = "user_id", referencedColumnName = "id"),
-            inverseJoinColumns = @JoinColumn(name = "role_id", referencedColumnName = "id"))
+            joinColumns = @JoinColumn(name = "user_id"),
+            inverseJoinColumns = @JoinColumn(name = "role_id"))
     private Set<Role> roles;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public Set<Role> getRoles() {
-        return roles;
-    }
-
-    public void setRoles(Set<Role> roles) {
-        this.roles = roles;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public User() {
-    }
 }
 

auth-service/src/main/java/com/javatab/authservice/domain/UserVO.java

@@ -3,5 +3,5 @@
 import com.javatab.authservice.domain.Role;
 import org.springframework.data.repository.CrudRepository;
 
-public interface RoleRepository extends CrudRepository<Role, Long> {
+public interface RoleRepository extends CrudRepository<Role, String> {
 }