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

Unified Diff: remoting/webapp/build-webapp.py

Issue 12905012: Webapp changes to support third party authentication (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase, update patch Created 7 years, 8 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
« no previous file with comments | « remoting/webapp/appsv2.patch ('k') | remoting/webapp/client_plugin.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/webapp/build-webapp.py
diff --git a/remoting/webapp/build-webapp.py b/remoting/webapp/build-webapp.py
index 8da88439b442a51e0abf2f41664048f3459adeac..c55ea5022cd16364204d05d34d9616aef65faf4b 100755
--- a/remoting/webapp/build-webapp.py
+++ b/remoting/webapp/build-webapp.py
@@ -242,6 +242,8 @@ def buildWebApp(buildtype, version, mimetype, destination, zip_path, plugin,
else:
oauth2RedirectUrlJs = "'" + oauth2RedirectBaseUrlJs + "/dev'"
oauth2RedirectUrlJson = oauth2RedirectBaseUrlJson + '/dev*'
+ thirdPartyAuthUrlJs = "'" + oauth2RedirectBaseUrlJs + "/thirdpartyauth'"
+ thirdPartyAuthUrlJson = oauth2RedirectBaseUrlJson + '/thirdpartyauth*'
findAndReplace(os.path.join(destination, 'plugin_settings.js'),
"'TALK_GADGET_URL'", "'" + talkGadgetBaseUrl + "'")
findAndReplace(os.path.join(destination, 'plugin_settings.js'),
@@ -264,6 +266,12 @@ def buildWebApp(buildtype, version, mimetype, destination, zip_path, plugin,
"Boolean('XMPP_SERVER_USE_TLS')", xmppServerUseTls)
findAndReplace(os.path.join(destination, 'plugin_settings.js'),
"'DIRECTORY_BOT_JID'", "'" + directoryBotJid + "'")
+ findAndReplace(os.path.join(destination, 'plugin_settings.js'),
+ "'THIRD_PARTY_AUTH_REDIRECT_URL'",
+ thirdPartyAuthUrlJs)
+ findAndReplace(os.path.join(destination, 'manifest.json'),
+ "THIRD_PARTY_AUTH_REDIRECT_URL",
+ thirdPartyAuthUrlJson)
# Set the correct API keys.
# For overriding the client ID/secret via env vars, see google_api_keys.py.
« no previous file with comments | « remoting/webapp/appsv2.patch ('k') | remoting/webapp/client_plugin.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698