mcp-server: rename mcpServerAuthorization to mcpServerOAuth2

Kehrlann · Kehrlann · commit b8162cd0b463 · 2025-09-29T15:39:05.000+02:00
Signed-off-by: Daniel Garnier-Moiroux &lt;git@garnier.wf&gt;
diff --git a/README.md b/README.md
@@ -96,7 +96,7 @@ class McpServerConfiguration {
                 .authorizeHttpRequests(auth -> auth.anyRequest().authenticated())
                 // Configure OAuth2 on the MCP server
                 .with(
-                        McpResourceServerConfigurer.mcpServerAuthorization(),
+                        McpResourceServerConfigurer.mcpServerOAuth2(),
                         (mcpAuthorization) -> {
                             // REQUIRED: the issuerURI
                             mcpAuthorization.authorizationServer(issuerUrl);
@@ -139,7 +139,7 @@ class McpServerConfiguration {
                 })
                 // Configure OAuth2 on the MCP server
                 .with(
-                        McpResourceServerConfigurer.mcpServerAuthorization(),
+                        McpResourceServerConfigurer.mcpServerOAuth2(),
                         (mcpAuthorization) -> {
                             // REQUIRED: the issuerURI
                             mcpAuthorization.authorizationServer(issuerUrl);
diff --git a/mcp-server-security/src/main/java/org/springaicommunity/mcp/security/server/config/McpServerOAuth2Configurer.java b/mcp-server-security/src/main/java/org/springaicommunity/mcp/security/server/config/McpServerOAuth2Configurer.java
@@ -38,7 +38,7 @@
 /**
  * @author Daniel Garnier-Moiroux
  */
-public class McpResourceServerConfigurer extends AbstractHttpConfigurer<McpResourceServerConfigurer, HttpSecurity> {
+public class McpServerOAuth2Configurer extends AbstractHttpConfigurer<McpServerOAuth2Configurer, HttpSecurity> {
 
 	private String issuerUri = null;
 
@@ -54,38 +54,38 @@ public class McpResourceServerConfigurer extends AbstractHttpConfigurer<McpResou
 
 	private boolean validateAudienceClaim = false;
 
-	public McpResourceServerConfigurer authorizationServer(String issuerUri) {
+	public McpServerOAuth2Configurer authorizationServer(String issuerUri) {
 		this.issuerUri = issuerUri;
 		return this;
 	}
 
-	public McpResourceServerConfigurer scope(String scope) {
+	public McpServerOAuth2Configurer scope(String scope) {
 		this.scopes.add(scope);
 		return this;
 	}
 
-	public McpResourceServerConfigurer bearerMethod(String bearerMethod) {
+	public McpServerOAuth2Configurer bearerMethod(String bearerMethod) {
 		this.bearerMethod = bearerMethod;
 		return this;
 	}
 
-	public McpResourceServerConfigurer resourceName(String resourceName) {
+	public McpServerOAuth2Configurer resourceName(String resourceName) {
 		this.resourceName = resourceName;
 		return this;
 	}
 
-	public McpResourceServerConfigurer resourcePath(String resourceIdentifier) {
+	public McpServerOAuth2Configurer resourcePath(String resourceIdentifier) {
 		this.resourceIdentifier = new ResourceIdentifier(resourceIdentifier);
 		return this;
 	}
 
-	public McpResourceServerConfigurer protectedResourceMetadataCustomizer(
+	public McpServerOAuth2Configurer protectedResourceMetadataCustomizer(
 			Consumer<OAuth2ProtectedResourceMetadata.Builder> customizer) {
 		this.customizer = customizer;
 		return this;
 	}
 
-	public McpResourceServerConfigurer validateAudienceClaim(boolean validateAudienceClaim) {
+	public McpServerOAuth2Configurer validateAudienceClaim(boolean validateAudienceClaim) {
 		this.validateAudienceClaim = validateAudienceClaim;
 		return this;
 	}
@@ -133,8 +133,8 @@ private Consumer<OAuth2ProtectedResourceMetadata.Builder> getProtectedMetadataCu
 			.bearerMethod(this.bearerMethod);
 	}
 
-	public static McpResourceServerConfigurer mcpServerAuthorization() {
-		return new McpResourceServerConfigurer();
+	public static McpServerOAuth2Configurer mcpServerOAuth2() {
+		return new McpServerOAuth2Configurer();
 	}
 
 }
diff --git a/samples/integration-tests/src/test/java/org/springaicommunity/mcp/security/tests/common/configuration/McpServerConfiguration.java b/samples/integration-tests/src/test/java/org/springaicommunity/mcp/security/tests/common/configuration/McpServerConfiguration.java
@@ -4,7 +4,7 @@
 import org.eclipse.aether.repository.RemoteRepository;
 import org.junit.jupiter.api.Order;
 import org.springaicommunity.mcp.security.server.oauth2.authentication.BearerResourceMetadataTokenAuthenticationEntryPoint;
-import org.springaicommunity.mcp.security.server.config.McpResourceServerConfigurer;
+import org.springaicommunity.mcp.security.server.config.McpServerOAuth2Configurer;
 import org.springaicommunity.mcp.security.server.oauth2.metadata.ResourceIdentifier;
 import org.springaicommunity.mcp.security.tests.AllowAllCorsConfigurationSource;
 
@@ -43,7 +43,7 @@ public CommonsExecWebServerFactoryBean mcpServer(@Value("${authorization.server.
 				.entries(springBootStarter("web"), springBootStarter("oauth2-resource-server"),
 						springAiStarter("mcp-server-webmvc"))
 				.entries(new ResourceClasspathEntry(mcpServerResourceName, mcpServerResourceName))
-				.classes(McpResourceServerConfigurer.class)
+				.classes(McpServerOAuth2Configurer.class)
 				.classes(BearerResourceMetadataTokenAuthenticationEntryPoint.class)
 				.classes(AllowAllCorsConfigurationSource.class)
 				.scan(ResourceIdentifier.class));
diff --git a/samples/integration-tests/src/test/java/org/springaicommunity/mcp/security/tests/streamable/sync/server/StreamableHttpMcpServer.java b/samples/integration-tests/src/test/java/org/springaicommunity/mcp/security/tests/streamable/sync/server/StreamableHttpMcpServer.java
@@ -15,7 +15,7 @@
 import org.springframework.security.config.annotation.web.configurers.CsrfConfigurer;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.SecurityFilterChain;
-import static org.springaicommunity.mcp.security.server.config.McpResourceServerConfigurer.mcpServerAuthorization;
+import static org.springaicommunity.mcp.security.server.config.McpServerOAuth2Configurer.mcpServerOAuth2;
 
 @Configuration
 @EnableWebSecurity
@@ -64,7 +64,7 @@ List<McpStatelessServerFeatures.SyncToolSpecification> statelessTools() {
 	SecurityFilterChain securityFilterChain(HttpSecurity http,
 			@Value("${spring.security.oauth2.resourceserver.jwt.issuer-uri}") String issuerUrl) throws Exception {
 		return http.authorizeHttpRequests(auth -> auth.anyRequest().authenticated())
-			.with(mcpServerAuthorization(), (mcpAuthorization) -> {
+			.with(mcpServerOAuth2(), (mcpAuthorization) -> {
 				mcpAuthorization.authorizationServer(issuerUrl).resourcePath("/mcp");
 			})
 			// MCP inspector
diff --git a/samples/integration-tests/src/test/java/org/springaicommunity/mcp/security/tests/streamable/sync/server/StreamableHttpMcpServerToolsSecured.java b/samples/integration-tests/src/test/java/org/springaicommunity/mcp/security/tests/streamable/sync/server/StreamableHttpMcpServerToolsSecured.java
@@ -14,7 +14,7 @@
 import org.springframework.security.config.annotation.web.configurers.CsrfConfigurer;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.SecurityFilterChain;
-import static org.springaicommunity.mcp.security.server.config.McpResourceServerConfigurer.mcpServerAuthorization;
+import static org.springaicommunity.mcp.security.server.config.McpServerOAuth2Configurer.mcpServerOAuth2;
 
 /**
  * An MCP server where only tool calling is secured with OAuth2, and not connecting or
@@ -59,7 +59,7 @@ SecurityFilterChain securityFilterChain(HttpSecurity http,
 		return http.authorizeHttpRequests(auth -> {
 			auth.requestMatchers("/mcp").permitAll();
 			auth.anyRequest().denyAll();
-		}).with(mcpServerAuthorization(), (mcpAuthorization) -> {
+		}).with(mcpServerOAuth2(), (mcpAuthorization) -> {
 			mcpAuthorization.authorizationServer(issuerUrl).resourcePath("/mcp");
 		})
 			// MCP inspector
diff --git a/samples/sample-mcp-server-secured-tools/src/main/java/org/springaicommunity/mcp/security/sample/server/securedtools/McpServerConfiguration.java b/samples/sample-mcp-server-secured-tools/src/main/java/org/springaicommunity/mcp/security/sample/server/securedtools/McpServerConfiguration.java
@@ -30,7 +30,7 @@
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.CorsConfigurationSource;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-import static org.springaicommunity.mcp.security.server.config.McpResourceServerConfigurer.mcpServerAuthorization;
+import static org.springaicommunity.mcp.security.server.config.McpServerOAuth2Configurer.mcpServerOAuth2;
 
 @Configuration
 @EnableMethodSecurity
@@ -45,7 +45,7 @@ ToolCallbackProvider toolCallbackProvider(WeatherService weatherService) {
 	SecurityFilterChain securityFilterChain(HttpSecurity http,
 			@Value("${spring.security.oauth2.resourceserver.jwt.issuer-uri}") String issuerUrl) throws Exception {
 		return http.authorizeHttpRequests(auth -> auth.anyRequest().permitAll())
-			.with(mcpServerAuthorization(), (mcpAuthorization) -> {
+			.with(mcpServerOAuth2(), (mcpAuthorization) -> {
 				mcpAuthorization.authorizationServer(issuerUrl).resourcePath("/mcp");
 			})
 			// MCP inspector
diff --git a/samples/sample-mcp-server/src/main/java/org/springaicommunity/mcp/security/sample/server/streamable/McpServerConfiguration.java b/samples/sample-mcp-server/src/main/java/org/springaicommunity/mcp/security/sample/server/streamable/McpServerConfiguration.java
@@ -29,7 +29,7 @@
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.CorsConfigurationSource;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-import static org.springaicommunity.mcp.security.server.config.McpResourceServerConfigurer.mcpServerAuthorization;
+import static org.springaicommunity.mcp.security.server.config.McpServerOAuth2Configurer.mcpServerOAuth2;
 
 @Configuration
 class McpServerConfiguration {
@@ -43,7 +43,7 @@ ToolCallbackProvider toolCallbackProvider(HistoricalWeatherService weatherServic
 	SecurityFilterChain securityFilterChain(HttpSecurity http,
 			@Value("${spring.security.oauth2.resourceserver.jwt.issuer-uri}") String issuerUrl) throws Exception {
 		return http.authorizeHttpRequests(auth -> auth.anyRequest().authenticated())
-			.with(mcpServerAuthorization(), (mcpAuthorization) -> mcpAuthorization.authorizationServer(issuerUrl))
+			.with(mcpServerOAuth2(), (mcpAuthorization) -> mcpAuthorization.authorizationServer(issuerUrl))
 			// MCP inspector
 			.cors(cors -> cors.configurationSource(corsConfigurationSource()))
 			.csrf(CsrfConfigurer::disable)

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`/**`
`39`	`39`	`* @author Daniel Garnier-Moiroux`
`40`	`40`	`*/`
`41`		`-public class McpResourceServerConfigurer extends AbstractHttpConfigurer<McpResourceServerConfigurer, HttpSecurity> {`
	`41`	`+public class McpServerOAuth2Configurer extends AbstractHttpConfigurer<McpServerOAuth2Configurer, HttpSecurity> {`
`42`	`42`
`43`	`43`	`private String issuerUri = null;`
`44`	`44`
`@@ -54,38 +54,38 @@ public class McpResourceServerConfigurer extends AbstractHttpConfigurer<McpResou`
`54`	`54`
`55`	`55`	`private boolean validateAudienceClaim = false;`
`56`	`56`
`57`		`- public McpResourceServerConfigurer authorizationServer(String issuerUri) {`
	`57`	`+ public McpServerOAuth2Configurer authorizationServer(String issuerUri) {`
`58`	`58`	`this.issuerUri = issuerUri;`
`59`	`59`	`return this;`
`60`	`60`	`}`
`61`	`61`
`62`		`- public McpResourceServerConfigurer scope(String scope) {`
	`62`	`+ public McpServerOAuth2Configurer scope(String scope) {`
`63`	`63`	`this.scopes.add(scope);`
`64`	`64`	`return this;`
`65`	`65`	`}`
`66`	`66`
`67`		`- public McpResourceServerConfigurer bearerMethod(String bearerMethod) {`
	`67`	`+ public McpServerOAuth2Configurer bearerMethod(String bearerMethod) {`
`68`	`68`	`this.bearerMethod = bearerMethod;`
`69`	`69`	`return this;`
`70`	`70`	`}`
`71`	`71`
`72`		`- public McpResourceServerConfigurer resourceName(String resourceName) {`
	`72`	`+ public McpServerOAuth2Configurer resourceName(String resourceName) {`
`73`	`73`	`this.resourceName = resourceName;`
`74`	`74`	`return this;`
`75`	`75`	`}`
`76`	`76`
`77`		`- public McpResourceServerConfigurer resourcePath(String resourceIdentifier) {`
	`77`	`+ public McpServerOAuth2Configurer resourcePath(String resourceIdentifier) {`
`78`	`78`	`this.resourceIdentifier = new ResourceIdentifier(resourceIdentifier);`
`79`	`79`	`return this;`
`80`	`80`	`}`
`81`	`81`
`82`		`- public McpResourceServerConfigurer protectedResourceMetadataCustomizer(`
	`82`	`+ public McpServerOAuth2Configurer protectedResourceMetadataCustomizer(`
`83`	`83`	`Consumer<OAuth2ProtectedResourceMetadata.Builder> customizer) {`
`84`	`84`	`this.customizer = customizer;`
`85`	`85`	`return this;`
`86`	`86`	`}`
`87`	`87`
`88`		`- public McpResourceServerConfigurer validateAudienceClaim(boolean validateAudienceClaim) {`
	`88`	`+ public McpServerOAuth2Configurer validateAudienceClaim(boolean validateAudienceClaim) {`
`89`	`89`	`this.validateAudienceClaim = validateAudienceClaim;`
`90`	`90`	`return this;`
`91`	`91`	`}`
`@@ -133,8 +133,8 @@ private Consumer<OAuth2ProtectedResourceMetadata.Builder> getProtectedMetadataCu`
`133`	`133`	`.bearerMethod(this.bearerMethod);`
`134`	`134`	`}`
`135`	`135`
`136`		`- public static McpResourceServerConfigurer mcpServerAuthorization() {`
`137`		`- return new McpResourceServerConfigurer();`
	`136`	`+ public static McpServerOAuth2Configurer mcpServerOAuth2() {`
	`137`	`+ return new McpServerOAuth2Configurer();`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`}`