-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #622 from woowacourse-teams/dev/be
[BE] allow origin 을 yml에서 읽어오도록 변경
- Loading branch information
Showing
8 changed files
with
83 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
backend/src/main/java/codezap/global/cors/CorsProperties.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
package codezap.global.cors; | ||
|
||
|
||
import org.springframework.boot.context.properties.ConfigurationProperties; | ||
import org.springframework.boot.context.properties.bind.DefaultValue; | ||
|
||
@ConfigurationProperties(prefix = "cors") | ||
public class CorsProperties { | ||
private final String[] allowedOrigins; | ||
private final String[] allowedOriginsPatterns; | ||
|
||
public CorsProperties( | ||
@DefaultValue(value = "") String[] allowedOrigins, | ||
@DefaultValue(value = "") String[] allowedOriginsPatterns | ||
) { | ||
this.allowedOrigins = allowedOrigins; | ||
this.allowedOriginsPatterns = allowedOriginsPatterns; | ||
} | ||
|
||
public String[] getAllowedOrigins() { | ||
return allowedOrigins; | ||
} | ||
|
||
public String[] getAllowedOriginsPatterns() { | ||
return allowedOriginsPatterns; | ||
} | ||
} |
13 changes: 10 additions & 3 deletions
13
backend/src/main/java/codezap/global/cors/WebCorsConfiguration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,3 +2,5 @@ spring: | |
output: | ||
ansi: | ||
enabled: always | ||
cors: | ||
allowed-origins: http://localhost:3000 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
backend/src/test/java/codezap/global/cors/CorsPropertiesTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
package codezap.global.cors; | ||
|
||
import static org.assertj.core.api.AssertionsForClassTypes.assertThat; | ||
import static org.junit.jupiter.api.Assertions.*; | ||
|
||
import org.junit.jupiter.api.DisplayName; | ||
import org.junit.jupiter.api.Test; | ||
import org.junit.jupiter.api.extension.ExtendWith; | ||
import org.springframework.beans.factory.annotation.Autowired; | ||
import org.springframework.boot.context.properties.EnableConfigurationProperties; | ||
import org.springframework.boot.test.context.ConfigDataApplicationContextInitializer; | ||
import org.springframework.boot.test.context.SpringBootTest; | ||
import org.springframework.test.context.ContextConfiguration; | ||
import org.springframework.test.context.TestPropertySource; | ||
import org.springframework.test.context.junit.jupiter.SpringExtension; | ||
|
||
@SpringBootTest | ||
class CorsPropertiesTest { | ||
|
||
@Autowired | ||
private CorsProperties corsProperties; | ||
|
||
@Test | ||
@DisplayName("yml 파일로부터 allowed-origins 값을 가져오는지 확인") | ||
void getAllowedOrigins() { | ||
assertThat(corsProperties.getAllowedOrigins()).isEqualTo(new String[]{"http://localhost:3000"}); | ||
} | ||
|
||
@Test | ||
@DisplayName("yml 파일로부터 allowed-origins-patterns 값을 가져오는지 확인") | ||
void getAllowedOriginsPatterns() { | ||
assertThat(corsProperties.getAllowedOriginsPatterns()).isEqualTo(new String[]{""}); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,3 +2,5 @@ spring: | |
output: | ||
ansi: | ||
enabled: always | ||
cors: | ||
allowed-origins: http://localhost:3000 |