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.

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

Dev #10

Merged
merged 2 commits into from
Jul 5, 2023
Merged

Dev #10

Show file tree
Hide file tree
Changes from all commits
Commits
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/trothly/trothcam/config/SecurityConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {

@Override
public void configure(WebSecurity web) {
web.ignoring().antMatchers("/login/**" );
web.ignoring().antMatchers("/login/**", "/health-check/**");
}

@Override
Expand All @@ -42,7 +42,7 @@ protected void configure(HttpSecurity http) throws Exception {
.addFilter(new JwtAuthenticationFilter(authenticationManager(),jwtService))
.authorizeRequests()
.antMatchers("/login/**").permitAll()
//.antMatchers("/**").permitAll()
.antMatchers("/health-check/**").permitAll()
.anyRequest().authenticated()
.and()
// .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package trothly.trothcam.controller.auth;

import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
public class StatusCheckController {

@GetMapping("/health-check")
public ResponseEntity<Void> checkHealthStatus() {
return new ResponseEntity<>(HttpStatus.OK);
}
}
13 changes: 0 additions & 13 deletions src/main/java/trothly/trothcam/domain/member/Member.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,9 @@ public class Member extends BaseTimeEntity {
@Enumerated(EnumType.STRING)
private Provider provider;

@Column(name = "refresh_token", nullable = false)
private String refreshToken;

@Column(name = "refresh_token_expires_at", nullable = false)
private LocalDateTime refreshTokenExpiresAt;

@Builder
private Member(String email, Provider provider) {
this.email = email;
this.provider = provider;
this.refreshToken = "";
this.refreshTokenExpiresAt = LocalDateTime.now();
}

public void updateRefreshToken(String refreshToken) {
this.refreshToken = refreshToken;
this.refreshTokenExpiresAt = LocalDateTime.now();
}
}
2 changes: 0 additions & 2 deletions src/main/java/trothly/trothcam/service/auth/OAuthService.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,7 @@ public LoginResDto appleLogin(LoginReqDto loginReqDto) {
logger.info("accessToken : " + newAccessToken);
logger.info("refreshToken : " + newRefreshToken);

member.updateRefreshToken(newRefreshToken);
memberRepository.save(member);

return new LoginResDto(newAccessToken, newRefreshToken);
}
}
Loading