Dtos have been defined.

Author: zcomert

Readme.md

@@ -175,4 +175,35 @@
 - Yup
   - validationSchema
   - erros
-  - handleBlur
+  - handleBlur
+
+# 13. Gün 
+- Authentication and Authorization
+- WebSecurityConfigurerAdapter
+- UserDetails
+- UserDetailsService
+- InMemoryUserDetailsManager
+- PasswordEncoder
+- httpBasic
+- Guava Utility Library
+- CSRF
+- Basic Authentication
+- Permission-based Authentication
+- PreAuthorization
+- EnableGlobalMethodSecurity
+- antMatchers
+- UserDetails Implementation (ApplicationUser)
+- UserDetailsService Implementation (ApplicationUserService)
+- ApplicationDao
+  - ApplicationDao Implementation (FakeApplicationUserDao)
+  - ApplicationDao Implementation (UserServiceImp)
+
+# 14. Gün 
+- JWT
+- JwtConfig
+- JwtSecretKey
+- JsonTokenProvider
+- JsonAuthenticationFilter
+- JwtAuthenticationEntryPoint
+- sessionCreationPolicy
+- JwtAuthenticationFilter

day-14/Readme.md

@@ -0,0 +1,9 @@
+# 14. Gün 
+- JWT
+- JwtConfig
+- JwtSecretKey
+- JsonTokenProvider
+- JsonAuthenticationFilter
+- JwtAuthenticationEntryPoint
+- sessionCreationPolicy
+- JwtAuthenticationFilter

day-14/api/Readme.md

@@ -1,22 +1,3 @@
-# 13. Gün 
-- Authentication and Authorization
-- WebSecurityConfigurerAdapter
-- UserDetails
-- UserDetailsService
-- InMemoryUserDetailsManager
-- PasswordEncoder
-- httpBasic
-- Guava Utility Library
-- CSRF
-- Basic Authentication
-- Permission-based Authentication
-- PreAuthorization
-- EnableGlobalMethodSecurity
-- antMatchers
-- UserDetails Implementation (ApplicationUser)
-- UserDetailsService Implementation (ApplicationUserService)
-- ApplicationDao
-  - ApplicationDao Implementation (FakeApplicationUserDao)
-  - ApplicationDao Implementation (UserServiceImp)
-
-![BasicAuthentication](http://www.zafercomert.com/medya/java/SpringSecurityBasicAuth.svg)
+# 14. Gün 
+- Json Web Token
+- STATELESS

day-14/api/src/main/java/com/bookstore/api/controllers/AuthController.java

@@ -20,8 +20,8 @@
 
 import com.bookstore.api.entities.RefreshToken;
 import com.bookstore.api.entities.User;
-import com.bookstore.api.entities.dto.AuthResponse;
-import com.bookstore.api.entities.dto.RefreshRequest;
+import com.bookstore.api.entities.dto.AuthDto;
+import com.bookstore.api.entities.dto.RefreshDto;
 import com.bookstore.api.entities.dto.UserRequest;
 import com.bookstore.api.entities.dto.UserRequestForRegister;
 import com.bookstore.api.jwt.JwtTokenProvider;
@@ -50,7 +50,7 @@ public AuthController(AuthenticationManager authenticationManager, JwtTokenProvi
     }
 
     @PostMapping("/login")
-    public AuthResponse login(@RequestBody UserRequest loginRequest) {
+    public AuthDto login(@RequestBody UserRequest loginRequest) {
         UsernamePasswordAuthenticationToken authToken = new UsernamePasswordAuthenticationToken(
                 loginRequest.getUserName(),
                 loginRequest.getPassword());
@@ -63,7 +63,7 @@ public AuthResponse login(@RequestBody UserRequest loginRequest) {
 
         User user = userService.getOneUserByUserName(loginRequest.getUserName());
 
-        AuthResponse authResponse = new AuthResponse();
+        AuthDto authResponse = new AuthDto();
         authResponse.setAccessToken("Bearer " + jwtToken);
         authResponse.setRefreshToken(refreshTokenService.createRefreshToken(user));
         authResponse.setUserId(user.getId());
@@ -75,9 +75,9 @@ public AuthResponse login(@RequestBody UserRequest loginRequest) {
     }
 
     @PostMapping("/register")
-    public ResponseEntity<AuthResponse> register(@RequestBody UserRequestForRegister registerRequest) {
+    public ResponseEntity<AuthDto> register(@RequestBody UserRequestForRegister registerRequest) {
 
-        AuthResponse authResponse = new AuthResponse();
+        AuthDto authResponse = new AuthDto();
 
         // User exists?
         if (userService.getOneUserByUserName(registerRequest.getUserName()) != null) {
@@ -92,8 +92,6 @@ public ResponseEntity<AuthResponse> register(@RequestBody UserRequestForRegister
         user.setUserName(registerRequest.getUserName());
         user.setPassword(registerRequest.getPassword());
 
-        
-
         userService.saveOneUser(user);
 
         // Adding role -> User role is given by default
@@ -120,8 +118,8 @@ public ResponseEntity<AuthResponse> register(@RequestBody UserRequestForRegister
     }
 
     @PostMapping("/refresh")
-    public ResponseEntity<AuthResponse> refresh(@RequestBody RefreshRequest refreshRequest) {
-        AuthResponse authResponse = new AuthResponse();
+    public ResponseEntity<AuthDto> refresh(@RequestBody RefreshDto refreshRequest) {
+        AuthDto authResponse = new AuthDto();
 
         RefreshToken token = refreshTokenService.getByUser(refreshRequest.getUserId());
 

…store/api/entities/dto/AuthResponse.java …/bookstore/api/entities/dto/AuthDto.javaday-14/api/src/main/java/com/bookstore/api/entities/dto/AuthResponse.java renamed to day-14/api/src/main/java/com/bookstore/api/entities/dto/AuthDto.java day-14/api/src/main/java/com/bookstore/api/entities/dto/AuthResponse.java renamed to day-14/api/src/main/java/com/bookstore/api/entities/dto/AuthDto.java

@@ -3,9 +3,9 @@
 import lombok.Data;
 
 @Data
-public class AuthResponse {
-    private String message;
+public class AuthDto {
 
+    private String message;
     private int userId;
     private String userName;
 

…ore/api/entities/dto/RefreshRequest.java …okstore/api/entities/dto/RefreshDto.javaday-14/api/src/main/java/com/bookstore/api/entities/dto/RefreshRequest.java renamed to day-14/api/src/main/java/com/bookstore/api/entities/dto/RefreshDto.java day-14/api/src/main/java/com/bookstore/api/entities/dto/RefreshRequest.java renamed to day-14/api/src/main/java/com/bookstore/api/entities/dto/RefreshDto.java

@@ -3,7 +3,7 @@
 import lombok.Data;
 
 @Data
-public class RefreshRequest {
+public class RefreshDto {
     private int userId;
     private String refreshToken;
 }

day-14/api/src/main/java/com/bookstore/api/jwt/JwtTokenProvider.java

@@ -8,26 +8,26 @@
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
+import com.bookstore.api.entities.User;
+import com.bookstore.api.exceptions.notFoundExceptions.UserNotFoundException;
 import com.bookstore.api.security.ApplicationUser;
+import com.bookstore.api.services.Abstract.UserService;
 
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.ExpiredJwtException;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.MalformedJwtException;
 import io.jsonwebtoken.SignatureException;
 import io.jsonwebtoken.UnsupportedJwtException;
+import lombok.RequiredArgsConstructor;
 
 @Component
+@RequiredArgsConstructor
 public class JwtTokenProvider {
 
     private final JwtConfig jwtConfig;
     private final SecretKey secretKey;
-
-    public JwtTokenProvider(JwtConfig jwtConfig, SecretKey secretKey) {
-        this.jwtConfig = jwtConfig;
-        this.secretKey = secretKey;
-        System.out.println(jwtConfig.getExpiresIn());
-    }
+    private final UserService userService;
 
     public String generateJwtToken(Authentication auth) {
 
@@ -44,9 +44,14 @@ public String generateJwtToken(Authentication auth) {
 
     public String generateJwtTokenByUserId(int userId) {
 
+        User user = userService.getOneUser(userId).getData();
+        ApplicationUser userDetails = userService.selectApplicationUserByUsername(user.getUserName())
+                .orElseThrow(() -> new UserNotFoundException(userId));
+
         Date expireDate = new Date(new Date().getTime() + jwtConfig.getExpiresIn());
         return Jwts.builder()
                 .setSubject(Integer.toString(userId))
+                .claim("authorities", userDetails.getAuthorities())
                 .setIssuedAt(new Date())
                 .setExpiration(expireDate)
                 .signWith(secretKey)
@@ -55,8 +60,13 @@ public String generateJwtTokenByUserId(int userId) {
 
     public String generateJwtTokenByUserName(String username) {
         Date expireDate = new Date(new Date().getTime() + jwtConfig.getExpiresIn());
+        // Yetkileri de ekle.
+        ApplicationUser userDetails = userService.selectApplicationUserByUsername(username)
+                .orElseThrow(() -> new RuntimeException(String.format("%s could not found.", username)));
+
         return Jwts.builder()
                 .setSubject(username)
+                .claim("authorities", userDetails.getAuthorities())
                 .setIssuedAt(new Date())
                 .setExpiration(expireDate)
                 .signWith(secretKey)

day-14/bs-store/.env

@@ -0,0 +1,2 @@
+REACT_APP_BASE_ENDPOINT  = http://localhost:8080/api/v1
+

day-14/bs-store/.gitignore

@@ -0,0 +1,24 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*

day-14/bs-store/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "editor.fontSize": 22
+}