Changeset 2426

Timestamp:

12/14/12 13:03:27 (11 years ago)

Author:

twagoo

Message:

Check/connect OAuth2 token interaction with javascript

Location:

ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry

Files:

• editor/IsocatConnectLinkButton.as (modified) (1 diff)
• services/Config.as (modified) (1 diff)
• services/OAuth2Service.as (modified) (4 diffs)

ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/IsocatConnectLinkButton.as

@@ -10 +10 @@
         import flash.net.navigateToURL;
         
+        import mx.controls.Alert;
+        
         public class IsocatConnectLinkButton extends LabelButton
         {
                 public function IsocatConnectLinkButton()
                 {
-                        super(connectToIsocat);
+                        super(connectToIsocat); 
                 }
                 

ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/services/Config.as

@@ -41 +41 @@
                 private static const USER_SETTINGS_URL:String = "/admin/userSettings";
                 private static const COMMENTS_URL_PATH:String = "/comments/";
-                private static const OAUTH_SERVLET:String = "/oauth2/connect";
-                private static const OAUTH_CONNECT_SERVLET:String = OAUTH_SERVLET;
-                private static const OAUTH_CHECK_SERVLET:String = OAUTH_SERVLET + "?acquire=false";
+                private static const OAUTH_CONNECT_SERVLET:String = "/oauth2/connect";
+                private static const OAUTH_CHECK_SERVLET:String = "/oauth2/check";
                 private static const ISOCAT_SERVLET:String = "/oauth2/isocat";
 

ComponentRegistry/branches/ComponentRegistry-oauth-1.13.0/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/services/OAuth2Service.as

@@ -3 +3 @@
         
         import flash.events.EventDispatcher;
+        import flash.external.ExternalInterface;
         
         import mx.controls.Alert;
@@ -24 +25 @@
 
                 public function OAuth2Service() {
+                        ExternalInterface.addCallback("handleOAuthConnect", handleOAuthConnect);
                 }
                 
@@ -68 +70 @@
                         }
                 }
-                
-//              private function handleAcquireResult(resultEvent:ResultEvent):void {
-//                      if (resultEvent.statusCode >= 200 && resultEvent.statusCode < 300) {
-//                              var data:XML = new XML(resultEvent.result);
-//                              searchResults = data.dcif::dataCategory;
-//                      } else {
-//                              Alert.show("Unexpected error, server returned status: " + resultEvent.statusCode + "\n Message = ");
-//                      }
-//              }
 
                 private function handleError(faultEvent:FaultEvent):void {
@@ -84 +77 @@
                 }
 
-
+                /***
+                 * To be called from JavaScript in embedding page
+                 */
+                private function handleOAuthConnect(result:String):void{
+                        // OAuth connect finished, either failed or succeeded. Update status.
+                        check();
+                        ExternalInterface.call("hideOAuthFrame");
+                }
         }
 }