From 1ca6727a7e24b25a341ad4bbb6a0e97a181a398b Mon Sep 17 00:00:00 2001
From: Andy Allan <gravitystorm@gmail.com>
Date: Tue, 19 Oct 2010 10:10:18 +0000
Subject: [PATCH] Move getAccessToken logic to the connection

---
 net/systemeD/halcyon/connection/Connection.as |  2 ++
 .../halcyon/connection/XMLConnection.as       | 16 ++++++++++++++++
 net/systemeD/potlatch2/save/SaveManager.as    | 19 ++-----------------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/net/systemeD/halcyon/connection/Connection.as b/net/systemeD/halcyon/connection/Connection.as
index a2bbc68b..22696c9c 100755
--- a/net/systemeD/halcyon/connection/Connection.as
+++ b/net/systemeD/halcyon/connection/Connection.as
@@ -6,6 +6,7 @@ package net.systemeD.halcyon.connection {
     import flash.events.Event;
 	import net.systemeD.halcyon.Globals;
 	import net.systemeD.halcyon.connection.actions.*;
+    import org.iotashan.oauth.*;
 
 	public class Connection extends EventDispatcher {
 
@@ -366,6 +367,7 @@ package net.systemeD.halcyon.connection {
 	    public function uploadChanges():void {}
         public function fetchUserTraces(refresh:Boolean=false):void {}
         public function fetchTrace(id:Number, callback:Function):void {}
+        public function getAccessToken(data:Object):OAuthToken { return null; } //todo make private and remove import org.ioshtan etc
     }
 
 }
diff --git a/net/systemeD/halcyon/connection/XMLConnection.as b/net/systemeD/halcyon/connection/XMLConnection.as
index 30d3915a..951f083f 100644
--- a/net/systemeD/halcyon/connection/XMLConnection.as
+++ b/net/systemeD/halcyon/connection/XMLConnection.as
@@ -60,6 +60,22 @@ package net.systemeD.halcyon.connection {
 	        authToken = OAuthToken(id);
 	    }
 
+        override public function getAccessToken(data:Object):OAuthToken {
+            var key:String = Connection.getParam("oauth_token", null);
+            var secret:String = Connection.getParam("oauth_token_secret", null);
+
+            if ( key == null || secret == null ) {
+                //var data:Object = SharedObject.getLocal("access_token").data;
+                key = data["oauth_token"];
+                secret = data["oauth_token_secret"];
+            }
+
+            if ( key == null || secret == null )
+                return null;
+            else
+                return new OAuthToken(key, secret);
+        }
+
         private var httpStatus:int = 0;
         
         private function recordStatus(event:HTTPStatusEvent):void {
diff --git a/net/systemeD/potlatch2/save/SaveManager.as b/net/systemeD/potlatch2/save/SaveManager.as
index 1a72797a..77e4f334 100644
--- a/net/systemeD/potlatch2/save/SaveManager.as
+++ b/net/systemeD/potlatch2/save/SaveManager.as
@@ -30,10 +30,11 @@ package net.systemeD.potlatch2.save {
         }
 
         private function save(callback:Function):void {
+            var conn:Connection = Connection.getConnectionInstance();
             if ( consumer == null )
                 consumer = getConsumer();
             if ( accessToken == null )
-                accessToken = getAccessToken();
+                accessToken = conn.getAccessToken(SharedObject.getLocal("access_token").data);
         
             if ( accessToken == null )
                 getNewToken(callback);
@@ -41,22 +42,6 @@ package net.systemeD.potlatch2.save {
                 callback();
         }
 
-        private function getAccessToken():OAuthToken {
-            var key:String = Connection.getParam("oauth_token", null);
-            var secret:String = Connection.getParam("oauth_token_secret", null);
-            
-            if ( key == null || secret == null ) {
-                var data:Object = SharedObject.getLocal("access_token").data;
-                key = data["oauth_token"];
-                secret = data["oauth_token_secret"];
-            }
-            
-            if ( key == null || secret == null )
-                return null;
-            else    
-                return new OAuthToken(key, secret);
-        }
-
         private function getConsumer():OAuthConsumer {
             var key:String = Connection.getParam("oauth_consumer_key", null);
             var secret:String = Connection.getParam("oauth_consumer_secret", null);
-- 
2.30.0