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

chore: 토큰 자체 검증 함수 미사용 #38

Merged
merged 1 commit into from
Feb 18, 2024
Merged
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
22 changes: 13 additions & 9 deletions src/main/java/zero/eight/donut/service/AuthService.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package zero.eight.donut.service;

import com.google.api.client.googleapis.auth.oauth2.GoogleIdToken;
import com.google.api.client.googleapis.auth.oauth2.GoogleIdTokenVerifier;
import com.google.api.client.http.javanet.NetHttpTransport;
import com.google.api.client.json.jackson2.JacksonFactory;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand All @@ -25,11 +27,13 @@
import zero.eight.donut.repository.ReceiverRepository;

import java.io.IOException;
import java.security.GeneralSecurityException;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.Month;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.Collections;
import java.util.Optional;

@Slf4j
Expand Down Expand Up @@ -158,7 +162,7 @@ private GoogleIdToken verifyEmail(String googleToken) {
catch (Exception e) {
log.info("에러");
}

*/

GoogleIdTokenVerifier verifier = new GoogleIdTokenVerifier.Builder(new NetHttpTransport(), new JacksonFactory())
// Specify the CLIENT_ID of the app that accesses the backend:
Expand All @@ -170,22 +174,21 @@ private GoogleIdToken verifyEmail(String googleToken) {

try {
idToken = verifier.verify(googleToken);
} catch (GeneralSecurityException e) {
throw new RuntimeException(e);
} catch (IOException e) {
} catch (GeneralSecurityException | IOException e) {
throw new RuntimeException(e);
}

*/

if (idToken != null) {

log.info("idToken is not null");
GoogleIdToken.Payload payload = idToken.getPayload();

if (!tokenVerifier(payload)) {
log.info("token 검증 결과 유효하지 않음");
return null;
}
// if (!tokenVerifier(payload)) {
// log.info("token 검증 결과 유효하지 않음");
// return null;
// }

// Print user identifier
String googleId = payload.getSubject();
log.info("User ID: " + googleId);
Expand Down Expand Up @@ -392,6 +395,7 @@ protected Benefit createBenefit(Receiver receiver) {
return benefit;
}

// 구글 토큰 자체 검증 함수
private Boolean tokenVerifier(GoogleIdToken.Payload payload) {

log.info("tokenVerifier 진입");
Expand Down
Loading