Skip to content

Commit 9f1ed19

Browse files
committed
Update sample with placeholders for oauth client
1 parent 9692abb commit 9f1ed19

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public void getClientRegistrationsWhenUsingCommonProviderShouldAdapt()
110110
assertThat(adapted.getAuthorizationGrantType()).isEqualTo(
111111
org.springframework.security.oauth2.core.AuthorizationGrantType.AUTHORIZATION_CODE);
112112
assertThat(adapted.getRedirectUri()).isEqualTo(
113-
"{scheme}://{serverName}:{serverPort}{contextPath}/oauth2/authorize/code/{clientAlias}");
113+
"{scheme}://{serverName}:{serverPort}{contextPath}/oauth2/authorize/code/{registrationId}");
114114
assertThat(adapted.getScope()).containsExactly("openid", "profile", "email",
115115
"address", "phone");
116116
assertThat(adapted.getClientName()).isEqualTo("Google");

spring-boot-samples/spring-boot-sample-oauth2-client/src/main/resources/application.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ spring:
44
client:
55
registration:
66
github-client-1:
7-
client-id: 1b4c6c2d23a2dbec8959
8-
client-secret: 8bdb4047d98f37e1c6aeba9ffd2017bc31682e1b
7+
client-id: ${APP-CLIENT-ID}
8+
client-secret: ${APP-CLIENT-SECRET}
99
client-name: Github user
1010
provider: github
1111
scope: user
1212
redirect_uri: http://localhost:8080/oauth2/authorize/code/github
1313
github-client-2:
14-
client-id: 1b4c6c2d23a2dbec8959
15-
client-secret: 8bdb4047d98f37e1c6aeba9ffd2017bc31682e1b
14+
client-id: ${APP-CLIENT-ID}
15+
client-secret: ${APP-CLIENT-SECRET}
1616
client-name: Github email
1717
provider: github
1818
scope: user:email

spring-boot-samples/spring-boot-sample-oauth2-client/src/test/main/java/sample/oauth2/client/SampleOAuth2ClientApplicationTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
* @author Madhura Bhave
2323
*/
2424
@RunWith(SpringRunner.class)
25-
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
25+
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = {
26+
"APP-CLIENT-ID=my-client-id", "APP-CLIENT-SECRET=my-client-secret" })
2627
@DirtiesContext
2728
public class SampleOAuth2ClientApplicationTests {
2829

0 commit comments

Comments
 (0)