edited auth api

Author: dchprojects-zz

src/main/java/com/dchprojects/mydictionaryrestapi/api/AuthApi.java

@@ -3,7 +3,6 @@
 import com.dchprojects.mydictionaryrestapi.domain.dto.AuthRequest;
 import com.dchprojects.mydictionaryrestapi.domain.dto.AuthResponse;
 import com.dchprojects.mydictionaryrestapi.domain.dto.CreateUserRequest;
-import com.dchprojects.mydictionaryrestapi.domain.entity.UserEntity;
 import com.dchprojects.mydictionaryrestapi.service.AuthService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -39,7 +38,7 @@ public ResponseEntity<AuthResponse> login(@RequestBody @Valid AuthRequest reques
     }
 
     @PostMapping("/register")
-    public ResponseEntity<UserEntity> register(@RequestBody @Valid CreateUserRequest createUserRequest) {
+    public ResponseEntity<AuthResponse> register(@RequestBody @Valid CreateUserRequest createUserRequest) {
         try {
             return new ResponseEntity<>(authService.register(createUserRequest), HttpStatus.OK);
         } catch (ValidationException validationException) {

src/main/java/com/dchprojects/mydictionaryrestapi/domain/dto/AuthResponse.java

@@ -1,24 +1,27 @@
 package com.dchprojects.mydictionaryrestapi.domain.dto;
 
+import com.dchprojects.mydictionaryrestapi.domain.entity.UserEntity;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class AuthResponse {
 
-    @JsonProperty("access_token")
-    private String accessToken;
+    @JsonProperty("user_entity")
+    private UserEntity userEntity;
 
-    @JsonProperty("expiration_date")
-    private String expirationDate;
+    @JsonProperty("jwt")
+    private JWTResponse jwtResponse;
 
-    public AuthResponse(String accessToken, String expirationDate) {
-        this.accessToken = accessToken;
-        this.expirationDate = expirationDate;
-    }
+    public AuthResponse(UserEntity userEntity,
+                        JWTResponse jwtResponse) {
+
+        this.userEntity = userEntity;
+        this.jwtResponse = jwtResponse;
 
-    public String getAccessToken() {
-        return accessToken;
     }
 
-    public String getExpirationDate() { return expirationDate; }
+    public UserEntity getUserEntity() { return userEntity; }
+
+    public JWTResponse getJwtResponse() { return jwtResponse; }
 
-}
+}

src/main/java/com/dchprojects/mydictionaryrestapi/domain/dto/JWTResponse.java

@@ -0,0 +1,27 @@
+package com.dchprojects.mydictionaryrestapi.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class JWTResponse {
+
+    @JsonProperty("access_token")
+    private String accessToken;
+
+    @JsonProperty("expiration_date")
+    private String expirationDate;
+
+    public JWTResponse(String accessToken,
+                       String expirationDate) {
+
+        this.accessToken = accessToken;
+        this.expirationDate = expirationDate;
+
+    }
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+
+    public String getExpirationDate() { return expirationDate; }
+
+}

src/main/java/com/dchprojects/mydictionaryrestapi/service/AuthService.java

@@ -3,12 +3,11 @@
 import com.dchprojects.mydictionaryrestapi.domain.dto.AuthRequest;
 import com.dchprojects.mydictionaryrestapi.domain.dto.AuthResponse;
 import com.dchprojects.mydictionaryrestapi.domain.dto.CreateUserRequest;
-import com.dchprojects.mydictionaryrestapi.domain.entity.UserEntity;
 
 public interface AuthService {
 
     public AuthResponse login(AuthRequest request);
 
-    public UserEntity register(CreateUserRequest createUserRequest);
+    public AuthResponse register(CreateUserRequest createUserRequest);
 
 }

src/main/java/com/dchprojects/mydictionaryrestapi/service/impl/AuthServiceImpl.java

@@ -1,10 +1,7 @@
 package com.dchprojects.mydictionaryrestapi.service.impl;
 
 import com.dchprojects.mydictionaryrestapi.configuration.security.JwtTokenUtil;
-import com.dchprojects.mydictionaryrestapi.domain.dto.AuthRequest;
-import com.dchprojects.mydictionaryrestapi.domain.dto.AuthResponse;
-import com.dchprojects.mydictionaryrestapi.domain.dto.CreateUserRequest;
-import com.dchprojects.mydictionaryrestapi.domain.dto.JwtTokenResponse;
+import com.dchprojects.mydictionaryrestapi.domain.dto.*;
 import com.dchprojects.mydictionaryrestapi.domain.entity.UserEntity;
 import com.dchprojects.mydictionaryrestapi.service.AuthService;
 import com.dchprojects.mydictionaryrestapi.service.UserService;
@@ -30,6 +27,7 @@ public class AuthServiceImpl implements AuthService {
     @Override
     public AuthResponse login(AuthRequest request) {
         try {
+
             Authentication authenticate = authenticationManager
                     .authenticate(new UsernamePasswordAuthenticationToken(request.getNickname(),
                             request.getPassword()));
@@ -40,8 +38,11 @@ public AuthResponse login(AuthRequest request) {
 
             JwtTokenResponse jwtTokenResponse = jwtTokenUtil.generateAccessToken(userEntity);
 
-            return new AuthResponse(jwtTokenResponse.getAccessToken(), jwtTokenResponse.getExpirationDate().toString());
+            JWTResponse jwtResponse = new JWTResponse(jwtTokenResponse.getAccessToken(),
+                    jwtTokenResponse.getExpirationDate().toString());
 
+            return new AuthResponse(userEntity, jwtResponse);
+            
         } catch (BadCredentialsException badCredentialsException) {
             throw new BadCredentialsException(badCredentialsException.getLocalizedMessage());
         } catch (NoSuchElementException noSuchElementException) {
@@ -50,9 +51,19 @@ public AuthResponse login(AuthRequest request) {
     }
 
     @Override
-    public UserEntity register(CreateUserRequest createUserRequest) {
+    public AuthResponse register(CreateUserRequest createUserRequest) {
         try {
-            return userService.createUser(createUserRequest);
+
+            UserEntity savedUser = userService.createUser(createUserRequest);
+
+            JwtTokenResponse jwtTokenResponse = jwtTokenUtil.generateAccessToken(savedUser);
+            JWTResponse jwtResponse = new JWTResponse(jwtTokenResponse.getAccessToken(),
+                    jwtTokenResponse.getExpirationDate().toString());
+
+            return new AuthResponse(savedUser, jwtResponse);
+
+        } catch (BadCredentialsException badCredentialsException) {
+            throw new BadCredentialsException(badCredentialsException.getLocalizedMessage());
         } catch (ValidationException validationException) {
             throw new ValidationException(validationException.getLocalizedMessage());
         }