Merge pull request #1 from elton-cheong/master

Update-1

Author: Partisian

pom.xml

@@ -9,11 +9,11 @@
 		<version>2.1.8.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
-	<groupId>com.bezkoder</groupId>
-	<artifactId>spring-boot-security-jwt</artifactId>
+	<groupId>com.flame</groupId>
+	<artifactId>auth</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<name>spring-boot-security-jwt</name>
-	<description>Demo project for Spring Boot Security - JWT</description>
+	<name>flame-backend-auth</name>
+	<description>Flame auth project</description>
 
 	<properties>
 		<java.version>1.8</java.version>
@@ -34,12 +34,16 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
-
 		<dependency>
+		<groupId>org.postgresql</groupId>
+		<artifactId>postgresql</artifactId>
+		<scope>runtime</scope>
+		</dependency>
+		<!-- <dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 			<scope>runtime</scope>
-		</dependency>
+		</dependency> -->
 
 		<dependency>
 			<groupId>io.jsonwebtoken</groupId>

src/main/java/com/bezkoder/springjwt/SpringBootSecurityJwtApplication.java renamed to src/main/java/com/flame/auth/SpringBootSecurityJwtApplication.java

@@ -1,12 +1,19 @@
-package com.bezkoder.springjwt;
+package com.flame.auth;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 public class SpringBootSecurityJwtApplication {
 
+	private static final Logger logger = LoggerFactory.getLogger(SpringBootSecurityJwtApplication.class);
 	public static void main(String[] args) {
+		logger.info("this is a info message");
+		logger.warn("this is a warn message");
+		logger.error("this is a error message");
 		SpringApplication.run(SpringBootSecurityJwtApplication.class, args);
 	}
 

src/main/java/com/bezkoder/springjwt/controllers/AuthController.java renamed to src/main/java/com/flame/auth/controllers/AuthController.java

@@ -1,4 +1,4 @@
-package com.bezkoder.springjwt.controllers;
+package com.flame.auth.controllers;
 
 import java.util.HashSet;
 import java.util.List;
@@ -20,22 +20,28 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.bezkoder.springjwt.models.ERole;
-import com.bezkoder.springjwt.models.Role;
-import com.bezkoder.springjwt.models.User;
-import com.bezkoder.springjwt.payload.request.LoginRequest;
-import com.bezkoder.springjwt.payload.request.SignupRequest;
-import com.bezkoder.springjwt.payload.response.JwtResponse;
-import com.bezkoder.springjwt.payload.response.MessageResponse;
-import com.bezkoder.springjwt.repository.RoleRepository;
-import com.bezkoder.springjwt.repository.UserRepository;
-import com.bezkoder.springjwt.security.jwt.JwtUtils;
-import com.bezkoder.springjwt.security.services.UserDetailsImpl;
+import com.flame.auth.models.ERole;
+import com.flame.auth.models.Role;
+import com.flame.auth.models.User;
+import com.flame.auth.payload.request.LoginRequest;
+import com.flame.auth.payload.request.SignupRequest;
+import com.flame.auth.payload.response.JwtResponse;
+import com.flame.auth.payload.response.MessageResponse;
+import com.flame.auth.repository.RoleRepository;
+import com.flame.auth.repository.UserRepository;
+import com.flame.auth.security.jwt.JwtUtils;
+import com.flame.auth.security.services.UserDetailsImpl;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @CrossOrigin(origins = "*", maxAge = 3600)
 @RestController
 @RequestMapping("/api/auth")
 public class AuthController {
+
+	private static final Logger logger = LoggerFactory.getLogger(AuthController.class);
+
 	@Autowired
 	AuthenticationManager authenticationManager;
 
@@ -54,6 +60,7 @@ public class AuthController {
 	@PostMapping("/signin")
 	public ResponseEntity<?> authenticateUser(@Valid @RequestBody LoginRequest loginRequest) {
 
+		logger.info("Entering authenticateUser");
 		Authentication authentication = authenticationManager.authenticate(
 				new UsernamePasswordAuthenticationToken(loginRequest.getUsername(), loginRequest.getPassword()));
 
@@ -65,6 +72,7 @@ public ResponseEntity<?> authenticateUser(@Valid @RequestBody LoginRequest login
 				.map(item -> item.getAuthority())
 				.collect(Collectors.toList());
 
+		logger.info("returning authenticateUser");
 		return ResponseEntity.ok(new JwtResponse(jwt, 
 												 userDetails.getId(), 
 												 userDetails.getUsername(), 
@@ -74,6 +82,7 @@ public ResponseEntity<?> authenticateUser(@Valid @RequestBody LoginRequest login
 
 	@PostMapping("/signup")
 	public ResponseEntity<?> registerUser(@Valid @RequestBody SignupRequest signUpRequest) {
+		logger.info("entering registerUser");
 		if (userRepository.existsByUsername(signUpRequest.getUsername())) {
 			return ResponseEntity
 					.badRequest()
@@ -105,24 +114,26 @@ public ResponseEntity<?> registerUser(@Valid @RequestBody SignupRequest signUpRe
 					Role adminRole = roleRepository.findByName(ERole.ROLE_ADMIN)
 							.orElseThrow(() -> new RuntimeException("Error: Role is not found."));
 					roles.add(adminRole);
-
+					logger.info("Added Admin");
 					break;
 				case "mod":
 					Role modRole = roleRepository.findByName(ERole.ROLE_MODERATOR)
 							.orElseThrow(() -> new RuntimeException("Error: Role is not found."));
 					roles.add(modRole);
-
+					logger.info("Added Moderator");
 					break;
 				default:
 					Role userRole = roleRepository.findByName(ERole.ROLE_USER)
 							.orElseThrow(() -> new RuntimeException("Error: Role is not found."));
 					roles.add(userRole);
+					logger.info("Added User");
 				}
 			});
 		}
 
 		user.setRoles(roles);
 		userRepository.save(user);
+		logger.info("Set role" + user);
 
 		return ResponseEntity.ok(new MessageResponse("User registered successfully!"));
 	}

src/main/java/com/bezkoder/springjwt/controllers/TestController.java renamed to src/main/java/com/flame/auth/controllers/TestController.java

@@ -1,35 +1,46 @@
-package com.bezkoder.springjwt.controllers;
+package com.flame.auth.controllers;
 
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 @CrossOrigin(origins = "*", maxAge = 3600)
 @RestController
 @RequestMapping("/api/test")
 public class TestController {
+
+	private static final Logger log = LoggerFactory.getLogger(TestController.class);
+
 	@GetMapping("/all")
 	public String allAccess() {
+		log.trace("all access");
 		return "Public Content.";
 	}
 
 	@GetMapping("/user")
 	@PreAuthorize("hasRole('USER') or hasRole('MODERATOR') or hasRole('ADMIN')")
 	public String userAccess() {
+		log.trace("user access");
 		return "User Content.";
 	}
 
 	@GetMapping("/mod")
 	@PreAuthorize("hasRole('MODERATOR')")
 	public String moderatorAccess() {
+		log.trace("moderator access");
 		return "Moderator Board.";
 	}
 
 	@GetMapping("/admin")
 	@PreAuthorize("hasRole('ADMIN')")
 	public String adminAccess() {
+		log.trace("admin access");
 		return "Admin Board.";
 	}
 }

src/main/java/com/bezkoder/springjwt/models/ERole.java renamed to src/main/java/com/flame/auth/models/ERole.java

@@ -1,4 +1,4 @@
-package com.bezkoder.springjwt.models;
+package com.flame.auth.models;
 
 public enum ERole {
 	ROLE_USER,

src/main/java/com/bezkoder/springjwt/models/Role.java renamed to src/main/java/com/flame/auth/models/Role.java

@@ -1,4 +1,4 @@
-package com.bezkoder.springjwt.models;
+package com.flame.auth.models;
 
 import javax.persistence.*;
 

src/main/java/com/bezkoder/springjwt/models/User.java renamed to src/main/java/com/flame/auth/models/User.java

@@ -1,4 +1,4 @@
-package com.bezkoder.springjwt.models;
+package com.flame.auth.models;
 
 import java.util.HashSet;
 import java.util.Set;

src/main/java/com/bezkoder/springjwt/payload/request/LoginRequest.java renamed to src/main/java/com/flame/auth/payload/request/LoginRequest.java

@@ -1,4 +1,4 @@
-package com.bezkoder.springjwt.payload.request;
+package com.flame.auth.payload.request;
 
 import javax.validation.constraints.NotBlank;
 

src/main/java/com/bezkoder/springjwt/payload/request/SignupRequest.java renamed to src/main/java/com/flame/auth/payload/request/SignupRequest.java

@@ -1,4 +1,4 @@
-package com.bezkoder.springjwt.payload.request;
+package com.flame.auth.payload.request;
 
 import java.util.Set;
 

src/main/java/com/bezkoder/springjwt/payload/response/JwtResponse.java renamed to src/main/java/com/flame/auth/payload/response/JwtResponse.java

@@ -1,4 +1,4 @@
-package com.bezkoder.springjwt.payload.response;
+package com.flame.auth.payload.response;
 
 import java.util.List;
 

src/main/java/com/bezkoder/springjwt/payload/response/MessageResponse.java renamed to src/main/java/com/flame/auth/payload/response/MessageResponse.java

@@ -1,4 +1,4 @@
-package com.bezkoder.springjwt.payload.response;
+package com.flame.auth.payload.response;
 
 public class MessageResponse {
 	private String message;

src/main/java/com/bezkoder/springjwt/repository/RoleRepository.java renamed to src/main/java/com/flame/auth/repository/RoleRepository.java

@@ -1,12 +1,12 @@
-package com.bezkoder.springjwt.repository;
+package com.flame.auth.repository;
 
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import com.bezkoder.springjwt.models.ERole;
-import com.bezkoder.springjwt.models.Role;
+import com.flame.auth.models.ERole;
+import com.flame.auth.models.Role;
 
 @Repository
 public interface RoleRepository extends JpaRepository<Role, Long> {

src/main/java/com/bezkoder/springjwt/repository/UserRepository.java renamed to src/main/java/com/flame/auth/repository/UserRepository.java

@@ -1,11 +1,11 @@
-package com.bezkoder.springjwt.repository;
+package com.flame.auth.repository;
 
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import com.bezkoder.springjwt.models.User;
+import com.flame.auth.models.User;
 
 @Repository
 public interface UserRepository extends JpaRepository<User, Long> {

src/main/java/com/bezkoder/springjwt/security/WebSecurityConfig.java renamed to src/main/java/com/flame/auth/security/WebSecurityConfig.java

@@ -1,4 +1,4 @@
-package com.bezkoder.springjwt.security;
+package com.flame.auth.security;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -14,9 +14,12 @@
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 
-import com.bezkoder.springjwt.security.jwt.AuthEntryPointJwt;
-import com.bezkoder.springjwt.security.jwt.AuthTokenFilter;
-import com.bezkoder.springjwt.security.services.UserDetailsServiceImpl;
+import com.flame.auth.security.jwt.AuthEntryPointJwt;
+import com.flame.auth.security.jwt.AuthTokenFilter;
+import com.flame.auth.security.services.UserDetailsServiceImpl;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @Configuration
 @EnableWebSecurity
@@ -25,6 +28,9 @@
 		// jsr250Enabled = true,
 		prePostEnabled = true)
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
+
+	private static final Logger logger = LoggerFactory.getLogger(WebSecurityConfig.class);
+
 	@Autowired
 	UserDetailsServiceImpl userDetailsService;
 
@@ -33,27 +39,32 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
 	@Bean
 	public AuthTokenFilter authenticationJwtTokenFilter() {
+		logger.info("authenticationJwtTokenFilter");
 		return new AuthTokenFilter();
 	}
 
 	@Override
 	public void configure(AuthenticationManagerBuilder authenticationManagerBuilder) throws Exception {
+		logger.info("configure");
 		authenticationManagerBuilder.userDetailsService(userDetailsService).passwordEncoder(passwordEncoder());
 	}
 
 	@Bean
 	@Override
 	public AuthenticationManager authenticationManagerBean() throws Exception {
+		logger.info("authenticationManagerBean");
 		return super.authenticationManagerBean();
 	}
 
 	@Bean
 	public PasswordEncoder passwordEncoder() {
+		logger.info("passwordEncoder");
 		return new BCryptPasswordEncoder();
 	}
 
 	@Override
 	protected void configure(HttpSecurity http) throws Exception {
+		logger.info("configure");
 		http.cors().and().csrf().disable()
 			.exceptionHandling().authenticationEntryPoint(unauthorizedHandler).and()
 			.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()

src/main/java/com/bezkoder/springjwt/security/jwt/AuthEntryPointJwt.java renamed to src/main/java/com/flame/auth/security/jwt/AuthEntryPointJwt.java

@@ -1,4 +1,4 @@
-package com.bezkoder.springjwt.security.jwt;
+package com.flame.auth.security.jwt;
 
 import java.io.IOException;
 

src/main/java/com/bezkoder/springjwt/security/jwt/AuthTokenFilter.java renamed to src/main/java/com/flame/auth/security/jwt/AuthTokenFilter.java

@@ -1,4 +1,4 @@
-package com.bezkoder.springjwt.security.jwt;
+package com.flame.auth.security.jwt;
 
 import java.io.IOException;
 
@@ -17,7 +17,7 @@
 import org.springframework.util.StringUtils;
 import org.springframework.web.filter.OncePerRequestFilter;
 
-import com.bezkoder.springjwt.security.services.UserDetailsServiceImpl;
+import com.flame.auth.security.services.UserDetailsServiceImpl;
 
 public class AuthTokenFilter extends OncePerRequestFilter {
 	@Autowired

src/main/java/com/bezkoder/springjwt/security/jwt/JwtUtils.java renamed to src/main/java/com/flame/auth/security/jwt/JwtUtils.java

@@ -1,4 +1,4 @@
-package com.bezkoder.springjwt.security.jwt;
+package com.flame.auth.security.jwt;
 
 import java.util.Date;
 
@@ -8,7 +8,7 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
-import com.bezkoder.springjwt.security.services.UserDetailsImpl;
+import com.flame.auth.security.services.UserDetailsImpl;
 import io.jsonwebtoken.*;
 
 @Component

src/main/java/com/bezkoder/springjwt/security/services/UserDetailsImpl.java renamed to src/main/java/com/flame/auth/security/services/UserDetailsImpl.java

@@ -1,4 +1,4 @@
-package com.bezkoder.springjwt.security.services;
+package com.flame.auth.security.services;
 
 import java.util.Collection;
 import java.util.List;
@@ -9,7 +9,7 @@
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
-import com.bezkoder.springjwt.models.User;
+import com.flame.auth.models.User;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 public class UserDetailsImpl implements UserDetails {