Skip to content

Commit dee2167

Browse files
committed
fix: 구글 설정
1 parent 237f57a commit dee2167

File tree

8 files changed

+30
-32
lines changed

8 files changed

+30
-32
lines changed
0 Bytes
Binary file not shown.
150 Bytes
Binary file not shown.
378 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

Location-based-target-authentication/build.gradle

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,44 +23,53 @@ repositories {
2323
mavenCentral()
2424
}
2525

26-
27-
dependencies {
28-
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
29-
}
30-
3126
dependencies {
32-
27+
// Spring Boot Starters
3328
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
3429
implementation 'org.springframework.boot:spring-boot-starter-jdbc'
3530
implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
3631
implementation 'org.springframework.boot:spring-boot-starter-security'
3732
implementation 'org.springframework.boot:spring-boot-starter-validation'
3833
implementation 'org.springframework.boot:spring-boot-starter-web'
3934
implementation 'org.springframework.boot:spring-boot-starter-webflux'
35+
implementation 'org.springframework.boot:spring-boot-starter-mail'
36+
37+
// JWT
4038
implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
39+
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
40+
runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
41+
42+
// JSP & Servlet
4143
implementation 'org.apache.tomcat.embed:tomcat-embed-jasper'
4244
implementation 'jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api'
4345
implementation 'org.glassfish.web:jakarta.servlet.jsp.jstl'
46+
implementation 'jakarta.servlet:jakarta.servlet-api:6.0.0'
47+
48+
// Swagger/OpenAPI
4449
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
4550
implementation 'org.springdoc:springdoc-openapi-security:1.7.0'
46-
implementation 'org.springframework.boot:spring-boot-starter-mail'
47-
implementation 'jakarta.servlet:jakarta.servlet-api:6.0.0'
48-
implementation 'com.fasterxml.jackson.core:jackson-databind'
51+
52+
// Database
53+
runtimeOnly 'com.mysql:mysql-connector-j'
4954
implementation 'org.liquibase:liquibase-core'
50-
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
51-
runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
55+
56+
// JSON
57+
implementation 'com.fasterxml.jackson.core:jackson-databind'
58+
59+
// Development Tools
5260
compileOnly 'org.projectlombok:lombok'
53-
developmentOnly 'org.springframework.boot:spring-boot-devtools'
54-
runtimeOnly 'com.mysql:mysql-connector-j'
5561
annotationProcessor 'org.projectlombok:lombok'
62+
developmentOnly 'org.springframework.boot:spring-boot-devtools'
63+
64+
// Test Dependencies
5665
testImplementation 'org.springframework.boot:spring-boot-starter-test'
57-
testImplementation 'io.projectreactor:reactor-test'
5866
testImplementation 'org.springframework.security:spring-security-test'
59-
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
67+
testImplementation 'io.projectreactor:reactor-test'
6068
testImplementation 'org.mockito:mockito-core'
6169
testImplementation 'org.mockito:mockito-junit-jupiter'
6270
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2'
6371
testImplementation 'org.assertj:assertj-core'
72+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
6473
}
6574

6675
tasks.named('test') {
@@ -75,4 +84,3 @@ tasks.withType(Jar) {
7584
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
7685
}
7786

78-

Location-based-target-authentication/src/main/java/com/swyp/global/config/OAuth2Config.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
@Configuration
1313
public class OAuth2Config {
1414

15-
@Value("${google.client.id}")
15+
@Value("${spring.security.oauth2.client.registration.google.client-id}")
1616
private String googleClientId;
1717

18-
@Value("${google.client.secret}")
18+
@Value("${spring.security.oauth2.client.registration.google.client-secret}")
1919
private String googleClientSecret;
2020

21-
@Value("${google.redirect.url}")
21+
@Value("${spring.security.oauth2.client.registration.google.redirect-uri}")
2222
private String googleRedirectUri;
2323

2424
@Value("${kakao.client.id}")

Location-based-target-authentication/src/main/java/com/swyp/social_login/service/auth/GoogleAuthImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ public class GoogleAuthImpl implements GoogleAuthService {
1919
private final String GOOGLE_TOKEN_URL = "https://oauth2.googleapis.com/token";
2020
private final String GOOGLE_USERINFO_URL = "https://www.googleapis.com/oauth2/v2/userinfo";
2121

22-
@Value("${google.client.id}")
22+
@Value("${spring.security.oauth2.client.registration.google.client-id}")
2323
private String clientId;
24-
@Value("${google.client.secret}")
24+
@Value("${spring.security.oauth2.client.registration.google.client-secret}")
2525
private String clientSecret;
26-
@Value("${google.redirect.url}")
26+
@Value("${spring.security.oauth2.client.registration.google.redirect-uri}")
2727
private String redirectUrl;
2828
@Value("${google.redirect.url.local}")
2929
private String redirectUrlLocal;

build.gradle

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)