Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit d3581e9

Browse files
committed
RefreshToken service - ApiResponse has been done.
1 parent 507d61f commit d3581e9

File tree

3 files changed

+33
-25
lines changed

3 files changed

+33
-25
lines changed

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

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.List;
44

5+
import org.apache.catalina.connector.Response;
56
import org.springframework.http.HttpStatus;
67
import org.springframework.http.ResponseEntity;
78
import org.springframework.security.access.prepost.PreAuthorize;
@@ -65,7 +66,7 @@ public AuthDto login(@RequestBody UserRequest loginRequest) {
6566

6667
AuthDto authResponse = new AuthDto();
6768
authResponse.setAccessToken("Bearer " + jwtToken);
68-
authResponse.setRefreshToken(refreshTokenService.createRefreshToken(user));
69+
authResponse.setRefreshToken(refreshTokenService.createRefreshToken(user).getData());
6970
authResponse.setUserId(user.getId());
7071
authResponse.setMessage("Successed.");
7172
authResponse.setFirstName(user.getFirstName());
@@ -108,7 +109,7 @@ public ResponseEntity<AuthDto> register(@RequestBody UserRequestForRegister regi
108109

109110
authResponse.setMessage("User successfully registered.");
110111
authResponse.setAccessToken("Bearer " + jwtToken);
111-
authResponse.setRefreshToken(refreshTokenService.createRefreshToken(user));
112+
authResponse.setRefreshToken(refreshTokenService.createRefreshToken(user).getData());
112113
authResponse.setUserId(user.getId());
113114
authResponse.setUserName(user.getUserName());
114115
authResponse.setFirstName(user.getFirstName());
@@ -118,30 +119,33 @@ public ResponseEntity<AuthDto> register(@RequestBody UserRequestForRegister regi
118119
}
119120

120121
@PostMapping("/refresh")
121-
public ResponseEntity<AuthDto> refresh(@RequestBody RefreshDto refreshRequest) {
122-
AuthDto authResponse = new AuthDto();
122+
public ResponseEntity<?> refresh(@RequestBody RefreshDto refreshRequest) {
123+
AuthDto authDto = new AuthDto();
123124

124-
RefreshToken token = refreshTokenService.getByUser(refreshRequest.getUserId());
125+
RefreshToken token = refreshTokenService.getByUser(refreshRequest.getUserId()).getData();
125126

126127
if (token.getToken().equals(refreshRequest.getRefreshToken()) &&
127-
!refreshTokenService.isRefreshExpired(token)) {
128+
!refreshTokenService.isRefreshExpired(token).getData()) {
128129

129130
User user = token.getUser();
130131

131132
String jwtToken = jwtTokenProvider.generateJwtTokenByUserId(user.getId());
132133

133-
authResponse.setMessage("Token has been refreshed successfully.");
134-
authResponse.setAccessToken("Bearer " + jwtToken);
135-
authResponse.setUserId(user.getId());
136-
authResponse.setFirstName(user.getFirstName());
137-
authResponse.setLastName(user.getLastName());
138-
authResponse.setUserName(user.getUserName());
139-
authResponse.setRefreshToken(token.getToken());
134+
authDto.setMessage("Token has been refreshed successfully.");
135+
authDto.setAccessToken("Bearer " + jwtToken);
136+
authDto.setUserId(user.getId());
137+
authDto.setFirstName(user.getFirstName());
138+
authDto.setLastName(user.getLastName());
139+
authDto.setUserName(user.getUserName());
140+
authDto.setRefreshToken(token.getToken());
141+
142+
return ResponseEntity
143+
.status(HttpStatus.OK)
144+
.body(authDto);
140145

141-
return new ResponseEntity<>(authResponse, HttpStatus.OK);
142146
} else {
143-
authResponse.setMessage("refresh token is not valid.");
144-
return new ResponseEntity<>(authResponse, HttpStatus.UNAUTHORIZED);
147+
authDto.setMessage("Refresh token is not valid.");
148+
return new ResponseEntity<>(authDto, HttpStatus.UNAUTHORIZED);
145149
}
146150
}
147151

‎day-14/api/src/main/java/com/bookstore/api/services/Abstract/RefreshTokenService.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22

33
import com.bookstore.api.entities.RefreshToken;
44
import com.bookstore.api.entities.User;
5+
import com.bookstore.api.entities.models.ApiResponse;
56

67
public interface RefreshTokenService {
7-
String createRefreshToken(User user);
88

9-
booleanisRefreshExpired(RefreshTokentoken);
9+
ApiResponse<String> createRefreshToken(Useruser);
1010

11-
RefreshToken getByUser(int userId);
11+
ApiResponse<Boolean> isRefreshExpired(RefreshToken token);
12+
13+
ApiResponse<RefreshToken> getByUser(int userId);
1214
}

‎day-14/api/src/main/java/com/bookstore/api/services/RefreshTokenServiceImp.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import com.bookstore.api.entities.RefreshToken;
1111
import com.bookstore.api.entities.User;
12+
import com.bookstore.api.entities.models.ApiResponse;
1213
import com.bookstore.api.repositories.RefreshTokenRepository;
1314
import com.bookstore.api.services.Abstract.RefreshTokenService;
1415

@@ -24,7 +25,7 @@ public RefreshTokenServiceImp(RefreshTokenRepository refreshTokenRepository) {
2425
this.refreshTokenRepository = refreshTokenRepository;
2526
}
2627

27-
public String createRefreshToken(User user) {
28+
public ApiResponse<String> createRefreshToken(User user) {
2829
RefreshToken token = refreshTokenRepository.findByUserId(user.getId());
2930
if (token == null) {
3031
token = new RefreshToken();
@@ -33,14 +34,15 @@ public String createRefreshToken(User user) {
3334
token.setToken(UUID.randomUUID().toString());
3435
token.setExpiryDate(Date.from(Instant.now().plusSeconds(expireSeconds)));
3536
refreshTokenRepository.save(token);
36-
return token.getToken();
37+
return ApiResponse.default_OK(token.getToken());
3738
}
3839

39-
public boolean isRefreshExpired(RefreshToken token) {
40-
return token.getExpiryDate().before(new Date());
40+
public ApiResponse<Boolean> isRefreshExpired(RefreshToken token) {
41+
Boolean isExpired = token.getExpiryDate().before(new Date());
42+
return ApiResponse.default_OK(isExpired);
4143
}
4244

43-
public RefreshToken getByUser(int userId) {
44-
return refreshTokenRepository.findByUserId(userId);
45+
public ApiResponse<RefreshToken> getByUser(int userId) {
46+
return ApiResponse.default_OK(refreshTokenRepository.findByUserId(userId));
4547
}
4648
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /