Merge branch '1.0.x' into 1.1.x

Closes gh-1437

oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/config/annotation/web/configurers/OidcProviderConfigurationTests.java

@@ -162,6 +162,13 @@ public class OidcProviderConfigurationTests {
 		);
 	}
 
+	@Test
+	public void loadContextWhenIssuerWithPathThenThrowException() {
+		assertThatThrownBy(
+				() -> this.spring.register(AuthorizationServerConfigurationWithIssuerPath.class).autowire()
+		);
+	}
+
 	@Test
 	public void loadContextWhenIssuerWithQueryThenThrowException() {
 		assertThatThrownBy(
@@ -183,6 +190,13 @@ public class OidcProviderConfigurationTests {
 		);
 	}
 
+	@Test
+	public void loadContextWhenIssuerWithEmptyPathThenThrowException() {
+		assertThatThrownBy(
+				() -> this.spring.register(AuthorizationServerConfigurationWithIssuerEmptyPath.class).autowire()
+		);
+	}
+
 	@Test
 	public void loadContextWhenIssuerWithEmptyQueryThenThrowException() {
 		assertThatThrownBy(
@@ -300,6 +314,15 @@ public class OidcProviderConfigurationTests {
 		}
 	}
 
+	@EnableWebSecurity
+	static class AuthorizationServerConfigurationWithIssuerPath extends AuthorizationServerConfiguration {
+
+		@Bean
+		AuthorizationServerSettings authorizationServerSettings() {
+			return AuthorizationServerSettings.builder().issuer(ISSUER_URL + "/issuer1").build();
+		}
+	}
+
 	@EnableWebSecurity
 	static class AuthorizationServerConfigurationWithIssuerQuery extends AuthorizationServerConfiguration {
 
@@ -327,6 +350,15 @@ public class OidcProviderConfigurationTests {
 		}
 	}
 
+	@EnableWebSecurity
+	static class AuthorizationServerConfigurationWithIssuerEmptyPath extends AuthorizationServerConfiguration {
+
+		@Bean
+		AuthorizationServerSettings authorizationServerSettings() {
+			return AuthorizationServerSettings.builder().issuer(ISSUER_URL + "/").build();
+		}
+	}
+
 	@EnableWebSecurity
 	static class AuthorizationServerConfigurationWithIssuerEmptyQuery extends AuthorizationServerConfiguration {