diff options
| author | jamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-03 18:55:36 +0000 |
|---|---|---|
| committer | jamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-03 18:55:36 +0000 |
| commit | fefa38c03e0512a01ec4c67ebed79ca279c8d407 (patch) | |
| tree | 7839e56e0fdca21f2f60e21bc4c6734bf07b6759 | |
| parent | cfb3abefba2bdc728f594839be3cb47745439f6d (diff) | |
| download | chromium_src-fefa38c03e0512a01ec4c67ebed79ca279c8d407.zip chromium_src-fefa38c03e0512a01ec4c67ebed79ca279c8d407.tar.gz chromium_src-fefa38c03e0512a01ec4c67ebed79ca279c8d407.tar.bz2 | |
Merge 169696
> Allow wildcard matching for redirect URL.
>
> BUG=163640
>
> Review URL: https://codereview.chromium.org/11421084
TBR=jamiewalch@google.com
Review URL: https://codereview.chromium.org/11411322
git-svn-id: svn://svn.chromium.org/chrome/branches/1312/src@170769 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | remoting/webapp/build-webapp.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/remoting/webapp/build-webapp.py b/remoting/webapp/build-webapp.py index 5ac8f1f..f676de8 100755 --- a/remoting/webapp/build-webapp.py +++ b/remoting/webapp/build-webapp.py @@ -174,16 +174,17 @@ def buildWebApp(buildtype, version, mimetype, destination, zip_path, plugin, mimetype) # Set the correct OAuth2 redirect URL. - baseUrl = ( - 'https://chromoting-oauth.talkgadget.google.com/' - 'talkgadget/oauth/chrome-remote-desktop') + scheme = 'https://' + urlSuffix = '.talkgadget.google.com/talkgadget/oauth/chrome-remote-desktop' + url = scheme + 'chromoting-oauth' + urlSuffix + urlPattern = scheme + '*' + urlSuffix if (buildtype == 'Official'): oauth2RedirectUrlJs = ( - "'" + baseUrl + "/rel/' + chrome.i18n.getMessage('@@extension_id')") - oauth2RedirectUrlJson = baseUrl + '/rel/*' + "'" + url + "/rel/' + chrome.i18n.getMessage('@@extension_id')") + oauth2RedirectUrlJson = urlPattern + '/rel/*' else: - oauth2RedirectUrlJs = "'" + baseUrl + "/dev'" - oauth2RedirectUrlJson = baseUrl + '/dev*' + oauth2RedirectUrlJs = "'" + url + "/dev'" + oauth2RedirectUrlJson = urlPattern + '/dev*' findAndReplace(os.path.join(destination, 'plugin_settings.js'), "'OAUTH2_REDIRECT_URL'", oauth2RedirectUrlJs) |