Don't ask for the requestToken if we haven't told OAuthPanel which connection to...

diff --git a/REFACTOR.txt b/REFACTOR.txt
index 391dbacf4f9afbd1fe9ef2990ecda0be88fd174e..dc76e3de668245bb731c147bfa6e7ae8dd84fb1c 100644 (file)
--- a/REFACTOR.txt
+++ b/REFACTOR.txt
@@ -8,7 +8,6 @@ To check:
 - MapDust
 - VectorLayers from GPX
 - VectorLayers from shapefiles
 - MapDust
 - VectorLayers from GPX
 - VectorLayers from shapefiles

-- Save/OAuth not tested

 - removeLayer in MapPaint.as should blank - does it?
 
 == Changes overall ==
 - removeLayer in MapPaint.as should blank - does it?
 
 == Changes overall ==

diff --git a/net/systemeD/potlatch2/save/OAuthPanel.mxml b/net/systemeD/potlatch2/save/OAuthPanel.mxml
index 5a9285fcc496039e6130c9c84d47def1fb193028..f972f927ffa220c0ef0a881d4e24e473394715a0 100644 (file)
--- a/net/systemeD/potlatch2/save/OAuthPanel.mxml
+++ b/net/systemeD/potlatch2/save/OAuthPanel.mxml
@@ -81,6 +81,7 @@
         private var _accessToken:OAuthToken;
         private var authoriseURL:String;
         private var lastHTTPStatus:int = 0;
         private var _accessToken:OAuthToken;
         private var authoriseURL:String;
         private var lastHTTPStatus:int = 0;

+        private var waiting:Boolean = false;

         
         public static var ACCESS_TOKEN_EVENT:String = "gotAccessToken";
         
         
         public static var ACCESS_TOKEN_EVENT:String = "gotAccessToken";
         


@@ -91,6 +92,7 @@
         
                public function setConnection(connection:Connection):void {
                        this.connection=connection;
         
                public function setConnection(connection:Connection):void {
                        this.connection=connection;

+                       if (waiting) { waiting=false; getRequestToken(); }

                }
 
         private function openURL(url:String):void {
                }
 
         private function openURL(url:String):void {


@@ -109,6 +111,8 @@
                }
         
         private function getRequestToken():void {
                }
         
         private function getRequestToken():void {

+            if (!connection) { waiting=true; return; } // in case the connection hasn't been set yet
+

             var sig:IOAuthSignatureMethod = new OAuthSignatureMethod_HMAC_SHA1();
             var consumer:OAuthConsumer = getConsumer();
             var url:String = connection.getParam("oauth_request_url", "http://127.0.0.1:3000/oauth/request_token");
             var sig:IOAuthSignatureMethod = new OAuthSignatureMethod_HMAC_SHA1();
             var consumer:OAuthConsumer = getConsumer();
             var url:String = connection.getParam("oauth_request_url", "http://127.0.0.1:3000/oauth/request_token");