From: Ernest W. Durbin III <ewdurbin@gmail.com>
Date: Mon, 30 Jul 2012 15:16:56 +0000 (-0400)
Subject: more oob changes
X-Git-Tag: v2.4.0~36^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F573%2Fhead;p=thirdparty%2Ftornado.git

more oob changes
---

diff --git a/tornado/auth.py b/tornado/auth.py
index a61e359ac..4f9a980b8 100644
--- a/tornado/auth.py
+++ b/tornado/auth.py
@@ -289,7 +289,9 @@ class OAuthMixin(object):
             oauth_version=getattr(self, "_OAUTH_VERSION", "1.0a"),
         )
         if getattr(self, "_OAUTH_VERSION", "1.0a") == "1.0a":
-            if callback_uri:
+            if callback_uri == "oob":
+                args["oauth_callback"] = "oob"
+            elif callback_uri:
                 args["oauth_callback"] = urlparse.urljoin(
                     self.request.full_url(), callback_uri)
             if extra_params:
@@ -309,7 +311,10 @@ class OAuthMixin(object):
                 base64.b64encode(request_token["secret"]))
         self.set_cookie("_oauth_request_token", data)
         args = dict(oauth_token=request_token["key"])
-        if callback_uri:
+        if callback_uri == "oob":
+            self.finish(authorize_url + "?" + urllib.urlencode(args)) 
+            return
+        elif callback_uri:
             args["oauth_callback"] = urlparse.urljoin(
                 self.request.full_url(), callback_uri)
         self.redirect(authorize_url + "?" + urllib.urlencode(args))