Changeset 2425

Timestamp:

12/14/12 13:00:22 (11 years ago)

Author:

twagoo

Message:

Separated check and connect servlets. In case of connect, respond with page that interacts with Flex UI

Location:

ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentRegistry/src/main

Files:

• java/clarin/cmdi/componentregistry/servlet/OAuthCheckServlet.java (copied) (copied from ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/servlet/OAuthHandshakeServlet.java) (2 diffs)
• java/clarin/cmdi/componentregistry/servlet/OAuthHandshakeServlet.java (modified) (2 diffs)
• webapp/js/oauthConnect.js (modified) (1 diff)
• webapp/pages (added)
• webapp/pages/oauthSuccess.jsp (added)

ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/servlet/OAuthCheckServlet.java

@@ -1 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package clarin.cmdi.componentregistry.servlet;
 
@@ -16 +12 @@
 
 /**
+ * Checks the availability of an OAuth2 access token
  *
  * @author Twan Goosen <twan.goosen@mpi.nl>
  */
 @Controller
-public class OAuthHandshakeServlet extends HttpServlet {
+public class OAuthCheckServlet extends HttpServlet {
 
     private static final long serialVersionUID = 1L;
-    // for access to OAuth2-protected resources, set by spring-security-oauth
+    // for access to OAuth2-protected resources, set by spring-security-oauth    
+    @Autowired
     private OAuth2RestTemplate oauth2RestService;
 
-    @Autowired
-    public OAuthHandshakeServlet(OAuth2RestTemplate oauth2RestService) {
-        super();
-        this.oauth2RestService = oauth2RestService;
-    }
-
+    /**
+     * Serves the content of the current access token, or the string 'null' if none is available
+     */
     @Override
-    @RequestMapping(value = "/connect")
+    @RequestMapping(value = "/check")
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        if (!"false".equalsIgnoreCase(req.getParameter("acquire"))) {
-            oauth2RestService.getAccessToken();
-        }
         resp.getWriter().write(String.format("%s", oauth2RestService.getOAuth2ClientContext().getAccessToken()));
         resp.flushBuffer();

ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/servlet/OAuthHandshakeServlet.java

@@ -1 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package clarin.cmdi.componentregistry.servlet;
 
 import java.io.IOException;
+import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -21 +18 @@
 @Controller
 public class OAuthHandshakeServlet extends HttpServlet {
-
+    
     private static final long serialVersionUID = 1L;
     // for access to OAuth2-protected resources, set by spring-security-oauth
+    @Autowired
     private OAuth2RestTemplate oauth2RestService;
-
-    @Autowired
-    public OAuthHandshakeServlet(OAuth2RestTemplate oauth2RestService) {
-        super();
-        this.oauth2RestService = oauth2RestService;
-    }
-
+    
     @Override
     @RequestMapping(value = "/connect")
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        if (!"false".equalsIgnoreCase(req.getParameter("acquire"))) {
-            oauth2RestService.getAccessToken();
-        }
-        resp.getWriter().write(String.format("%s", oauth2RestService.getOAuth2ClientContext().getAccessToken()));
-        resp.flushBuffer();
+        // Acquire token
+        oauth2RestService.getAccessToken();
+        RequestDispatcher requestDispatcher = req.getRequestDispatcher("/pages/oauthSuccess.jsp");
+        requestDispatcher.forward(req, resp);
+        //TODO: Also provided error response
     }
 }

ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentRegistry/src/main/webapp/js/oauthConnect.js

@@ -8 +8 @@
 
 function hideOAuthFrame() {
-        var frame = document.getElementById('oauth_connect_frame');
+    var frame = document.getElementById('oauth_connect_frame');
     frame.src = "Javascript:''";
     
-        var div = document.getElementById('oauth_connect');
+    var div = document.getElementById('oauth_connect');
     div.style.display = 'none';
 }
 
+function callFlexCallback(result) {
+    var flexUI = parent.document.getElementsByName('ComponentRegistry')[0];
+    flexUI.handleOAuthConnect(result);
+}