Skip to content

Commit 0ba6d8d

Browse files
committed
Switch to Yahoo for OIDC as Google's cert is not yet trusted by Java 11
Until the fix for JDK-8209506 [1] is available in Java 11 builds, SSL connections to services using Google's SSL certificate do not work due to a lack of trust. This affects both our OAuth2 client samples which were using https://accounts.google.com as an OpenID Connect provider. This commit switches the two samples to use Yahoo in place of Google. See gh-14028 [1] https://bugs.openjdk.java.net/browse/JDK-8209506
1 parent 4a68e2e commit 0ba6d8d

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ spring:
1717
provider: github
1818
scope: user:email
1919
redirect-uri-template: http://localhost:8080/login/oauth2/code/github
20-
google-oidc:
21-
client-id: ${GOOGLE-CLIENT-ID}
22-
client-secret: ${GOOGLE-CLIENT-SECRET}
20+
yahoo-oidc:
21+
client-id: ${YAHOO-CLIENT-ID}
22+
client-secret: ${YAHOO-CLIENT-SECRET}
2323
provider:
24-
google-oidc:
25-
issuer-uri: https://accounts.google.com
24+
yahoo-oidc:
25+
issuer-uri: https://api.login.yahoo.com/

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
@RunWith(SpringRunner.class)
3535
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = {
3636
"APP-CLIENT-ID=my-client-id", "APP-CLIENT-SECRET=my-client-secret",
37-
"GOOGLE-CLIENT-ID=my-google-client-id",
38-
"GOOGLE-CLIENT-SECRET=my-google-client-secret" })
37+
"YAHOO-CLIENT-ID=my-yahoo-client-id",
38+
"YAHOO-CLIENT-SECRET=my-yahooo-client-secret" })
3939
public class SampleOAuth2ClientApplicationTests {
4040

4141
@LocalServerPort
@@ -57,7 +57,7 @@ public void loginShouldHaveBothOAuthClientsToChooseFrom() {
5757
ResponseEntity<String> entity = this.restTemplate.getForEntity("/login",
5858
String.class);
5959
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
60-
assertThat(entity.getBody()).contains("/oauth2/authorization/google");
60+
assertThat(entity.getBody()).contains("/oauth2/authorization/yahoo");
6161
assertThat(entity.getBody()).contains("/oauth2/authorization/github-client-1");
6262
assertThat(entity.getBody()).contains("/oauth2/authorization/github-client-2");
6363
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ spring:
1717
provider: github
1818
scope: user:email
1919
redirect-uri-template: http://localhost:8080/login/oauth2/code/github
20-
google-oidc:
21-
client-id: ${GOOGLE-CLIENT-ID}
22-
client-secret: ${GOOGLE-CLIENT-SECRET}
20+
yahoo-oidc:
21+
client-id: ${YAHOO-CLIENT-ID}
22+
client-secret: ${YAHOO-CLIENT-SECRET}
2323
provider:
24-
google-oidc:
25-
issuer-uri: https://accounts.google.com
24+
yahoo-oidc:
25+
issuer-uri: https://api.login.yahoo.com/

spring-boot-samples/spring-boot-sample-reactive-oauth2-client/src/test/java/sample/oauth2/client/SampleReactiveOAuth2ClientApplicationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
@RunWith(SpringRunner.class)
3030
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = {
3131
"APP-CLIENT-ID=my-client-id", "APP-CLIENT-SECRET=my-client-secret",
32-
"GOOGLE-CLIENT-ID=my-google-client-id",
33-
"GOOGLE-CLIENT-SECRET=my-google-client-secret" })
32+
"YAHOO-CLIENT-ID=my-google-client-id",
33+
"YAHOO-CLIENT-SECRET=my-google-client-secret" })
3434
public class SampleReactiveOAuth2ClientApplicationTests {
3535

3636
@Autowired
@@ -47,7 +47,7 @@ public void loginShouldHaveBothOAuthClientsToChooseFrom() {
4747
byte[] body = this.webTestClient.get().uri("/login").exchange().expectStatus()
4848
.isOk().returnResult(String.class).getResponseBodyContent();
4949
String bodyString = new String(body);
50-
assertThat(bodyString).contains("/oauth2/authorization/google");
50+
assertThat(bodyString).contains("/oauth2/authorization/yahoo");
5151
assertThat(bodyString).contains("/oauth2/authorization/github-client-1");
5252
assertThat(bodyString).contains("/oauth2/authorization/github-client-2");
5353
}

0 commit comments

Comments
 (0)