Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: QA 1차 대응 #204

Merged
merged 3 commits into from
Sep 7, 2022
Merged

fix: QA 1차 대응 #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7e2cbc
refactor: aT 만료 시간 연장 #203
ozzing Sep 7, 2022
6a19d2e
chore: 1살인 유저 가입 불가 #203
ozzing Sep 7, 2022
804acc2
add: 날짜 유효성 검사 #203
ozzing Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/ceos/bankids/config/security/WebSecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ protected CorsConfigurationSource corsConfigurationSource() {
private CorsConfiguration getDefaultCorsConfiguration() {
CorsConfiguration configuration = new CorsConfiguration();
configuration.setAllowedOrigins(
Arrays.asList("http://localhost:3000", "https://bankids.click", "https://bankidz.com",
"https://api.bankidz.com", "https://appleid.apple.com"));
Arrays.asList("http://localhost:3000", "https://bankidz.com",
"https://appleid.apple.com"));
configuration.setAllowedHeaders(Arrays.asList("*"));
configuration.setAllowedMethods(Arrays.asList("*"));
configuration.setAllowCredentials(true);
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/ceos/bankids/service/JwtTokenServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ public String encodeJwtToken(TokenDTO tokenDTO) {
.setIssuer("bankids")
.setIssuedAt(now)
.setSubject(tokenDTO.getId().toString())
// .setExpiration(new Date(now.getTime() + Duration.ofMinutes(2880).toMillis()))
.setExpiration(new Date(now.getTime() + Duration.ofMinutes(40320).toMillis()))
.setExpiration(new Date(now.getTime() + Duration.ofDays(180).toMillis()))
.claim("id", tokenDTO.getId())
.claim("roles", "USER")
.signWith(SignatureAlgorithm.HS256,
Expand Down
11 changes: 10 additions & 1 deletion src/main/java/com/ceos/bankids/service/UserServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import com.ceos.bankids.repository.KidRepository;
import com.ceos.bankids.repository.ParentRepository;
import com.ceos.bankids.repository.UserRepository;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Optional;
import javax.servlet.http.Cookie;
Expand Down Expand Up @@ -99,9 +101,16 @@ public UserDTO updateUserType(User user, UserTypeRequest userTypeRequest) {
Calendar cal = Calendar.getInstance();
Integer currYear = cal.get(Calendar.YEAR);
Integer birthYear = Integer.parseInt(userTypeRequest.getBirthday()) / 10000;
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
dateFormat.setLenient(false);
try {
dateFormat.parse(userTypeRequest.getBirthday());
} catch (ParseException e) {
throw new BadRequestException(ErrorCode.INVALID_BIRTHDAY.getErrorCode());
}
if (user.getIsFemale() != null) {
throw new BadRequestException(ErrorCode.USER_ALREADY_HAS_TYPE.getErrorCode());
} else if (birthYear > currYear || birthYear <= currYear - 100) {
} else if (birthYear >= currYear || birthYear <= currYear - 100) {
throw new BadRequestException(ErrorCode.INVALID_BIRTHDAY.getErrorCode());
} else {
user.setBirthday(userTypeRequest.getBirthday());
Expand Down