temp commit

authorization-server2/build.gradle

@@ -24,10 +24,7 @@ ext {
 }
 
 dependencies {
-    compile('org.springframework.security:spring-security-oauth2-client')
-    compile('org.springframework.security:spring-security-oauth2-jose')
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
-    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.cloud:spring-cloud-starter-oauth2'
 //    implementation 'org.springframework.security.oauth.boot:spring-security-oauth2-autoconfigure:2.1.5.RELEASE'

authorization-server2/src/main/java/io/bluemoon/authorizationserver2/AuthorizationServer2Application.java

@@ -2,7 +2,9 @@ package io.bluemoon.authorizationserver2;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
 
+@EnableResourceServer
 @SpringBootApplication
 public class AuthorizationServer2Application {
 

authorization-server2/src/main/java/io/bluemoon/authorizationserver2/controller/AuthController.java

@@ -1,5 +1,7 @@
 package io.bluemoon.authorizationserver2.controller;
 
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,4 +14,6 @@ public class AuthController {
         return user;
     }
 
+    SecurityContextHolder
+
 }

test-service/src/main/resources/application.properties

@@ -8,4 +8,4 @@ server.servlet.context-path=/api
 #security.oauth2.client.client-id=system1
 #security.oauth2.client.client-secret=1234
 #security.oauth2.resource.token-info-uri=http://127.0.0.1:8081/mk-auth/oauth/check_token
-security.oauth2.resource.user-info-uri=http://127.0.0.1:8081/mk-auth/user
+security.oauth2.resource.user-info-uri=http://127.0.0.1:8765/auth/user

zuul-oauth2/src/main/resources/application.properties

@@ -7,7 +7,7 @@ zuul.routes.mk2-service.url=http://127.0.0.1:8082/api
 zuul.routes.mk2-service.sensitive-headers=
 #zuul.routes.mk2-service.sensitive-headers=Cookie,Set-Cookie,Authorization
 
-zuul.routes.mk2-oauth.path=/auth
+zuul.routes.mk2-oauth.path=/auth/**
 #zuul.routes.mk2-oauth.url=https://59a7bc58.ngrok.io
 zuul.routes.mk2-oauth.url=http://localhost:8081/auth
 zuul.routes.mk2-oauth.sensitive-headers=