Skip to content

Commit

Permalink
[BE] Auth 리팩토링
Browse files Browse the repository at this point in the history
  • Loading branch information
@Jinwook94
Jinwook94 committed Nov 7, 2023
1 parent 388f174 commit 2e066f6
Show file tree
Hide file tree
Showing 21 changed files with 173 additions and 223 deletions.
10 changes: 6 additions & 4 deletions backend/src/main/java/com/bootme/auth/controller/AuthController.java
View file
Expand Up @@ -22,15 +22,18 @@ public class AuthController {
private final AuthService authService;
private final TokenProvider tokenProvider;
private final SseEmitterManager sseEmitterManager;
private final AwsSecrets awsSecrets;
private final String domain;

public AuthController(AuthService authService,
TokenProvider tokenProvider,
SseEmitterManager sseEmitterManager,
AwsSecrets awsSecrets,
@Value("${domain}") String domain) {
this.authService = authService;
this.tokenProvider = tokenProvider;
this.sseEmitterManager = sseEmitterManager;
this.awsSecrets = awsSecrets;
this.domain = domain;
}

Expand All @@ -51,7 +54,7 @@ public ResponseEntity<LoginResponse> login(@RequestHeader("Authorization") Strin

@PostMapping("/login/naver")
public ResponseEntity<LoginResponse> naverLogin(@RequestBody Map<String, String> body) {
LoginResponse response = authService.processNaverLogin(body.get("url"));
LoginResponse response = authService.naverLogin(body.get("url"));
Long memberId = response.getMemberId();
String email = response.getEmail();

Expand All @@ -74,10 +77,9 @@ public ResponseEntity<Void> logOut(@Login AuthInfo authInfo, HttpServletResponse

// @IPFilter
@GetMapping("/secrets")
public ResponseEntity<AwsSecrets> getSecrets(@RequestHeader(name = "Bootme_Secret") String secret,
public ResponseEntity<AwsSecrets> getSecrets(@RequestHeader(name = "Bootme_Secret") String secretHeader,
@RequestHeader(value = "Origin", required = false) String origin) {
authService.verifySecretRequest(secret, origin);
AwsSecrets awsSecrets = authService.getAwsSecrets();
authService.verifySecretRequest(secretHeader, origin);
return ResponseEntity.ok(awsSecrets);
}

Expand Down
18 changes: 3 additions & 15 deletions backend/src/main/java/com/bootme/auth/dto/AwsSecrets.java
View file
Expand Up @@ -10,19 +10,15 @@ public class AwsSecrets {

private String apiUrl;
private String googleClientId;
private String googleIssuer;
private String googleAudience;
private String naverClientId;
private String naverClientSecret;
private String naverIssuer;
private String naverAudience;
private String naverSigningKey;
private String kakaoRestApiKey;
private String kakaoClientSecret;
private String kakaoIssuer;
private String kakaoAudience;
private String kakaoJavascriptKey;
private String bootmeIssuer;
private String bootmeAudience;
private String bootmeSigningKey;
private String gaMeasurementId;
Expand All @@ -31,24 +27,20 @@ public AwsSecrets() {
}

@Builder
public AwsSecrets(String apiUrl, String googleClientId, String googleIssuer, String googleAudience, String naverClientId, String naverClientSecret,
String naverIssuer, String naverAudience, String naverSigningKey, String kakaoRestApiKey, String kakaoClientSecret,
String kakaoIssuer, String kakaoAudience, String kakaoJavascriptKey, String bootmeIssuer, String bootmeAudience, String bootmeSigningKey, String gaMeasurementId) {
public AwsSecrets(String apiUrl, String googleClientId, String googleAudience, String naverClientId, String naverClientSecret,
String naverAudience, String naverSigningKey, String kakaoRestApiKey, String kakaoClientSecret,
String kakaoAudience, String kakaoJavascriptKey, String bootmeAudience, String bootmeSigningKey, String gaMeasurementId) {
this.apiUrl = apiUrl;
this.googleClientId = googleClientId;
this.googleIssuer = googleIssuer;
this.googleAudience = googleAudience;
this.naverClientId = naverClientId;
this.naverClientSecret = naverClientSecret;
this.naverIssuer = naverIssuer;
this.naverAudience = naverAudience;
this.naverSigningKey = naverSigningKey;
this.kakaoRestApiKey = kakaoRestApiKey;
this.kakaoClientSecret = kakaoClientSecret;
this.kakaoIssuer = kakaoIssuer;
this.kakaoAudience = kakaoAudience;
this.kakaoJavascriptKey = kakaoJavascriptKey;
this.bootmeIssuer = bootmeIssuer;
this.bootmeAudience = bootmeAudience;
this.bootmeSigningKey = bootmeSigningKey;
this.gaMeasurementId = gaMeasurementId;
Expand All @@ -58,19 +50,15 @@ public static AwsSecrets of(Map<String, String> secrets) {
return AwsSecrets.builder()
.apiUrl(secrets.get("api-url"))
.googleClientId(secrets.get("google-client-id"))
.googleIssuer(secrets.get("google-issuer"))
.googleAudience(secrets.get("google-audience"))
.naverClientId(secrets.get("naver-client-id"))
.naverClientSecret(secrets.get("naver-client-secret"))
.naverIssuer(secrets.get("naver-issuer"))
.naverAudience(secrets.get("naver-audience"))
.naverSigningKey(secrets.get("naver-signing-key"))
.kakaoRestApiKey(secrets.get("kakao-rest-api-key"))
.kakaoClientSecret(secrets.get("kakao-client-secret"))
.kakaoIssuer(secrets.get("kakao-issuer"))
.kakaoAudience(secrets.get("kakao-audience"))
.kakaoJavascriptKey(secrets.get("kakao-javascript-key"))
.bootmeIssuer(secrets.get("bootme-issuer"))
.bootmeAudience(secrets.get("bootme-audience"))
.bootmeSigningKey(secrets.get("bootme-signing-key"))
.gaMeasurementId(secrets.get("ga-measurement-id"))
Expand Down
7 changes: 1 addition & 6 deletions backend/src/main/java/com/bootme/auth/dto/JwtVo.java
View file
Expand Up @@ -60,12 +60,11 @@ public Body() {
}

@Builder
public Body(String oAuthProvider, String iss, String aud, String sub, Long iat,
public Body(String iss, String aud, String sub, Long iat,
Long exp, String email, String nickname, String name, String picture,
String given_name, String family_name, String locale, String azp, String jti, Long nbf,
boolean email_verified, String ageRange, String birthDay, String birthYear,
String gender, String id, String phoneNumber, String auth_time) {
this.oAuthProvider = oAuthProvider;
this.iss = iss;
this.aud = aud;
this.sub = sub;
Expand All @@ -90,10 +89,6 @@ public Body(String oAuthProvider, String iss, String aud, String sub, Long iat,
this.phoneNumber = phoneNumber;
this.auth_time = auth_time;
}

public void setOAuthProvider(String oAuthProvider) {
this.oAuthProvider = oAuthProvider;
}
}

}
15 changes: 5 additions & 10 deletions backend/src/main/java/com/bootme/auth/dto/NaverResponse.java
View file
Expand Up @@ -4,6 +4,8 @@
import lombok.Getter;
import lombok.Setter;

import static com.bootme.common.enums.JwtIssuer.BOOTME_ISSUER;

@Getter
@Setter
public class NaverResponse {
Expand All @@ -15,8 +17,7 @@ public class NaverResponse {
@Getter
@Setter
public static class NaverUserInfo implements UserInfo {
private String oAuthProvider = "naver";
private String iss = "https://bootme.co.kr";
private String iss = BOOTME_ISSUER;
private String id;
private String nickname;
@JsonProperty("profile_image")
Expand All @@ -31,7 +32,7 @@ public static class NaverUserInfo implements UserInfo {
private String birthday;
private String birthyear;

public NaverUserInfo() {
private NaverUserInfo() {
}

@Override
Expand All @@ -41,14 +42,8 @@ public String getPicture() {

@Override
public String getIss() {
return "https://bootme.co.kr";
return iss;
}

@Override
public void setOAuthProvider(String oAuthProvider) {
this.oAuthProvider = "naver";
}

}

}
Expand Down
2 changes: 0 additions & 2 deletions backend/src/main/java/com/bootme/auth/dto/UserInfo.java
View file
@@ -1,11 +1,9 @@
package com.bootme.auth.dto;

public interface UserInfo {
String getOAuthProvider();
String getIss();
String getEmail();
String getName();
String getNickname();
String getPicture();
void setOAuthProvider(String oAuthProvider);
}

0 comments on commit 2e066f6

Please sign in to comment.