Don't ask for the requestToken if we haven't told OAuthPanel which connection to...
authorRichard Fairhurst <richard@systemeD.net>
Thu, 9 Jun 2011 15:49:24 +0000 (16:49 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Thu, 9 Jun 2011 15:49:24 +0000 (16:49 +0100)
REFACTOR.txt
net/systemeD/potlatch2/save/OAuthPanel.mxml

index 391dbac..dc76e3d 100644 (file)
@@ -8,7 +8,6 @@ To check:
 - MapDust
 - VectorLayers from GPX
 - VectorLayers from shapefiles
-- Save/OAuth not tested
 - removeLayer in MapPaint.as should blank - does it?
 
 == Changes overall ==
index 5a9285f..f972f92 100644 (file)
@@ -81,6 +81,7 @@
         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";
         
@@ -91,6 +92,7 @@
         
                public function setConnection(connection:Connection):void {
                        this.connection=connection;
+                       if (waiting) { waiting=false; getRequestToken(); }
                }
 
         private function openURL(url:String):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");