Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(991)

Unified Diff: remoting/client/appengine/main.py

Issue 7033042: Update the appengine code to use OAuth2 and break the gdata dependency. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixed. Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/client/appengine/main.py
diff --git a/remoting/client/appengine/main.py b/remoting/client/appengine/main.py
index 36f81d73ef78d7c023cd6e8a2dd2812c2a636575..878e71e5f4996210648397e82e96476b8356c6ca 100644
--- a/remoting/client/appengine/main.py
+++ b/remoting/client/appengine/main.py
@@ -9,9 +9,6 @@ import os
from django.utils import simplejson as json
-import gdata.gauth
-import gdata.client
-
from google.appengine.api import users
from google.appengine.ext import webapp
from google.appengine.ext.webapp import template
@@ -25,7 +22,7 @@ class HostListHandler(webapp.RequestHandler):
@login_required
def get(self):
template_params = {
- 'chromoting_token': auth.GetChromotingToken(throws=False),
+ 'has_oauth2_tokens': auth.HasOAuth2Tokens(),
'xmpp_token': auth.GetXmppToken(throws=False)
}
path = os.path.join(os.path.dirname(__file__), 'hostlist.html')
@@ -43,7 +40,7 @@ class ChromotingSessionHandler(webapp.RequestHandler):
'connect_method': self.request.get('connect_method'),
'insecure': self.request.get('insecure'),
'xmpp_token': auth.GetXmppToken(),
- 'http_xmpp_proxy': auth.GetHttpXmppProxy(),
+ 'http_xmpp_proxy': self.request.get('http_xmpp_proxy')
}
path = os.path.join(os.path.dirname(__file__), 'chromoting_session.html')
self.response.out.write(template.render(path, template_params))

Powered by Google App Engine
This is Rietveld 408576698