cleanup work

MrHanachoo · Apr 24, 2017 · edfefa5 · edfefa5
1 parent 9904f03
commit edfefa5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/...rity-oauth-resource-demo/src/main/java/org/baeldung/config/ResourceServerApplication.java b/...rity-oauth-resource-demo/src/main/java/org/baeldung/config/ResourceServerApplication.java
@@ -2,7 +2,7 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.context.web.SpringBootServletInitializer;
+import org.springframework.boot.web.support.SpringBootServletInitializer;
 
 @SpringBootApplication
 public class ResourceServerApplication extends SpringBootServletInitializer {

diff --git a/...y-oauth-server-demo/src/main/java/org/baeldung/config/AuthorizationServerApplication.java b/...y-oauth-server-demo/src/main/java/org/baeldung/config/AuthorizationServerApplication.java
@@ -2,7 +2,7 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.context.web.SpringBootServletInitializer;
+import org.springframework.boot.web.support.SpringBootServletInitializer;
 
 @SpringBootApplication
 public class AuthorizationServerApplication extends SpringBootServletInitializer {

diff --git a/spring-security-oauth-server/src/main/java/org/baeldung/config/RevokeTokenEndpoint.java b/spring-security-oauth-server/src/main/java/org/baeldung/config/RevokeTokenEndpoint.java
@@ -3,13 +3,12 @@
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import org.springframework.security.oauth2.provider.endpoint.FrameworkEndpoint;
 import org.springframework.security.oauth2.provider.token.ConsumerTokenServices;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-@FrameworkEndpoint
+// @FrameworkEndpoint
 public class RevokeTokenEndpoint {
 
     @Resource(name = "tokenServices")

diff --git a/spring-security-oauth-server/src/main/java/org/baeldung/config/TokenController.java b/spring-security-oauth-server/src/main/java/org/baeldung/config/TokenController.java
@@ -26,6 +26,16 @@ public class TokenController {
     @Resource(name = "tokenStore")
     TokenStore tokenStore;
 
+    @RequestMapping(method = RequestMethod.DELETE, value = "/oauth/token")
+    @ResponseBody
+    public void revokeToken(HttpServletRequest request) {
+        String authorization = request.getHeader("Authorization");
+        if (authorization != null && authorization.contains("Bearer")) {
+            String tokenId = authorization.substring("Bearer".length() + 1);
+            tokenServices.revokeToken(tokenId);
+        }
+    }
+
     @RequestMapping(method = RequestMethod.POST, value = "/oauth/token/revokeById/{tokenId}")
     @ResponseBody
     public void revokeToken(HttpServletRequest request, @PathVariable String tokenId) {