Include /oauth/token endpoint using OpenApi Swagger 1.6.5. Fixes #1481

Author: bnasslahsen

pom.xml

@@ -80,6 +80,7 @@
 		<spring-native.version>0.11.1</spring-native.version>
 		<therapi-runtime-javadoc.version>0.13.0</therapi-runtime-javadoc.version>
 		<spring-cloud.version>2021.0.0</spring-cloud.version>
+		<spring-cloud-netflix.version>2.2.10.RELEASE</spring-cloud-netflix.version>
 	</properties>
 
 	<dependencyManagement>
@@ -208,6 +209,11 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
+				<version>${spring-cloud-netflix.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<dependencies>

springdoc-openapi-security/pom.xml

@@ -52,6 +52,16 @@
 			<artifactId>jjwt</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

springdoc-openapi-security/src/test/java/test/org/springdoc/api/app1/SpringDocApp1Test.java

@@ -28,7 +28,7 @@
 
 public class SpringDocApp1Test extends AbstractSpringDocTest {
 
-	@SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.configuration,test.org.springdoc.api.app1" })
+	@SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.configuration","test.org.springdoc.api.app1" })
 	static class SpringDocTestApp {
 		@Bean
 		public OpenAPI customOpenAPI() {

springdoc-openapi-security/src/test/java/test/org/springdoc/api/app2/SpringDocApp2Test.java

@@ -28,7 +28,7 @@
 
 public class SpringDocApp2Test extends AbstractSpringDocTest {
 
-	@SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.configuration,test.org.springdoc.api.app2" })
+	@SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.configuration","test.org.springdoc.api.app2" })
 	static class SpringDocTestApp {
 		@Bean
 		public OpenAPI customOpenAPI() {

springdoc-openapi-security/src/test/java/test/org/springdoc/api/app4/SpringDocApp4Test.java

@@ -41,7 +41,7 @@ public void configurations_successfully_loaded() {
 				);
 	}
 
-	@SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.configuration,test.org.springdoc.api.app4" })
+	@SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.configuration","test.org.springdoc.api.app4" })
 	@EnableAuthorizationServer
 	static class TestApp {
 	}

springdoc-openapi-security/src/test/java/test/org/springdoc/api/app5/SpringDocApp5Test.java

@@ -24,7 +24,7 @@
 
 public class SpringDocApp5Test extends AbstractSpringDocTest {
 
-	@SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.configuration,test.org.springdoc.api.app5" })
+	@SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.configuration","test.org.springdoc.api.app5" })
 	static class SpringDocTestApp {}
 
 }

springdoc-openapi-security/src/test/java/test/org/springdoc/api/app6/SpringDocApp6Test.java

@@ -28,7 +28,7 @@
 @TestPropertySource(properties = "springdoc.show-login-endpoint=true")
 public class SpringDocApp6Test extends AbstractSpringDocTest {
 
-	@SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.configuration,test.org.springdoc.api.app6" })
+	@SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.configuration","test.org.springdoc.api.app6" })
 	static class SpringDocTestApp {
 		@Bean
 		MyUserDetailsService userDetailsService() {

springdoc-openapi-security/src/test/java/test/org/springdoc/api/app7/SpringDocApp7Test.java

@@ -28,7 +28,7 @@
 
 public class SpringDocApp7Test extends AbstractSpringDocTest {
 
-	@SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.configuration,test.org.springdoc.api.app7" })
+	@SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.configuration","test.org.springdoc.api.app7" })
 	static class SpringDocTestApp {
 		@Bean
 		public OpenAPI customOpenAPI() {

springdoc-openapi-security/src/test/java/test/org/springdoc/api/app8/SpringDocApp8Test.java

@@ -12,7 +12,7 @@
 @TestPropertySource(properties = "springdoc.show-login-endpoint=true")
 public class SpringDocApp8Test extends AbstractSpringDocTest {
 
-    @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.configuration,test.org.springdoc.api.app8" })
+    @SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.configuration","test.org.springdoc.api.app8" })
     static class SpringDocTestApp {
         @Bean
         public OpenAPI customOpenAPI() {

springdoc-openapi-security/src/test/java/test/org/springdoc/api/app9/AuthorizationServerConfiguration.java

@@ -0,0 +1,63 @@
+/*
+ *
+ *  * Copyright 2019-2020 the original author or authors.
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  * you may not use this file except in compliance with the License.
+ *  * You may obtain a copy of the License at
+ *  *
+ *  *      https://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the License for the specific language governing permissions and
+ *  * limitations under the License.
+ *
+ */
+
+package test.org.springdoc.api.app9;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer;
+import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter;
+import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer;
+import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer;
+import org.springframework.security.oauth2.provider.token.store.InMemoryTokenStore;
+
+@Configuration
+class AuthorizationServerConfiguration extends AuthorizationServerConfigurerAdapter {
+
+	@Autowired
+	private AuthenticationManager authenticationManager;
+
+	@Override
+	public void configure(final AuthorizationServerSecurityConfigurer security) throws Exception {
+		security
+				.tokenKeyAccess("permitAll()")
+				.checkTokenAccess("isAuthenticated()");
+	}
+
+	@Override
+	public void configure(final ClientDetailsServiceConfigurer clients) throws Exception {
+		clients
+				.inMemory()
+				.withClient("ABC")
+				.secret("{noop}sec1")
+				.autoApprove(true)
+				.authorizedGrantTypes("authorization_code", "client_credentials", "password", "refresh_token")
+				.scopes("read", "write")
+				.redirectUris("http://google.com")
+		;
+	}
+
+	@Override
+	public void configure(final AuthorizationServerEndpointsConfigurer endpoints) throws Exception {
+		endpoints
+				.tokenStore(new InMemoryTokenStore())
+				.authenticationManager(authenticationManager);
+	}
+
+}

springdoc-openapi-security/src/test/java/test/org/springdoc/api/app9/HelloController.java

@@ -0,0 +1,13 @@
+package test.org.springdoc.api.app9;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class HelloController {
+
+    @GetMapping("/hello")
+    public String hello() {
+        return "Hello World!";
+    }
+}

springdoc-openapi-security/src/test/java/test/org/springdoc/api/app9/SpringDocApp9Test.java

@@ -0,0 +1,47 @@
+/*
+ *
+ *  * Copyright 2019-2020 the original author or authors.
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  * you may not use this file except in compliance with the License.
+ *  * You may obtain a copy of the License at
+ *  *
+ *  *      https://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the License for the specific language governing permissions and
+ *  * limitations under the License.
+ *
+ */
+
+package test.org.springdoc.api.app9;
+
+import org.junit.jupiter.api.Test;
+import org.springdoc.core.Constants;
+import test.org.springdoc.api.AbstractSpringDocTest;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+public class SpringDocApp9Test extends AbstractSpringDocTest {
+
+	@SpringBootApplication(scanBasePackages = { "test.org.springdoc.api.configuration","test.org.springdoc.api.app9" })
+	@EnableAuthorizationServer
+	static class SpringDocTestApp {}
+
+	@Test
+	public void testApp() throws Exception {
+		mockMvc.perform(get(Constants.DEFAULT_API_DOCS_URL)).andExpect(status().isOk())
+				.andExpect(jsonPath("$.openapi", is("3.0.1")))
+				.andExpect(jsonPath("$.paths./oauth/token.get.operationId", containsString("getAccessToken")))
+				.andExpect(jsonPath("$.paths./oauth/token.post.operationId", containsString("postAccessToken")));
+	}
+}

springdoc-openapi-security/src/test/java/test/org/springdoc/api/app9/TokenEndpointRetryInterceptor.java

@@ -0,0 +1,29 @@
+package test.org.springdoc.api.app9;
+
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+
+import org.springframework.stereotype.Component;
+
+@Aspect
+@Component
+public class TokenEndpointRetryInterceptor {
+
+    private static final int MAX_RETRIES = 3;
+
+    @Around("execution(* org.springframework.security.oauth2.provider.endpoint.TokenEndpoint.*(..))")
+    public Object execute (ProceedingJoinPoint aJoinPoint) throws Throwable {
+        int tts = 1000;
+        for (int i=1; i<=MAX_RETRIES; i++) {
+            try {
+                return aJoinPoint.proceed();
+            } catch (Exception e) {
+                Thread.sleep(tts);
+                tts=tts*2;
+            }
+        }
+        throw new IllegalStateException("Could not execute: " + aJoinPoint.getSignature().getName());
+    }
+
+}