Skip to content

Commit

Permalink
Move remoting identity API client id into src-internal.
Browse files Browse the repository at this point in the history
This CL removes the client id from the apps V2 patch. There is a separate (not public) CL that adds a new one.

Review URL: https://chromiumcodereview.appspot.com/22901007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@218132 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
jamiewalch@chromium.org committed Aug 17, 2013
1 parent 54612dc commit 6e026b6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
2 changes: 2 additions & 0 deletions google_apis/google_api_keys.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,5 @@ def GetClientSecret(client_name):
print 'GOOGLE_CLIENT_ID_REMOTING_HOST=%s' % GetClientID('REMOTING_HOST')
print 'GOOGLE_CLIENT_SECRET_REMOTING_HOST=%s' % GetClientSecret(
'REMOTING_HOST')
print 'GOOGLE_CLIENT_ID_REMOTING_IDENTITY_API=%s' %GetClientID(
'REMOTING_IDENTITY_API')
2 changes: 1 addition & 1 deletion remoting/webapp/appsv2.patch
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ index d1f8d1f..67bf660 100644
- { "path": "remoting_host_plugin.plugin", "public": false }
- ],
+ "oauth2": {
+ "client_id": "45833509441-oqgdhgddn085c7cq9djknefjo0tedtua.apps.googleusercontent.com",
+ "client_id": "REMOTING_IDENTITY_API_CLIENT_ID",
+ "scopes": [
+ "https://www.googleapis.com/auth/chromoting https://www.googleapis.com/auth/googletalk https://www.googleapis.com/auth/userinfo#email"
+ ]
Expand Down
4 changes: 4 additions & 0 deletions remoting/webapp/build-webapp.py
Original file line number Diff line number Diff line change
Expand Up @@ -279,13 +279,17 @@ def buildWebApp(buildtype, version, mimetype, destination, zip_path, plugin,
# For overriding the client ID/secret via env vars, see google_api_keys.py.
apiClientId = google_api_keys.GetClientID('REMOTING')
apiClientSecret = google_api_keys.GetClientSecret('REMOTING')
apiClientIdV2 = google_api_keys.GetClientID('REMOTING_IDENTITY_API')

findAndReplace(os.path.join(destination, 'plugin_settings.js'),
"'API_CLIENT_ID'",
"'" + apiClientId + "'")
findAndReplace(os.path.join(destination, 'plugin_settings.js'),
"'API_CLIENT_SECRET'",
"'" + apiClientSecret + "'")
findAndReplace(os.path.join(destination, 'manifest.json'),
'"REMOTING_IDENTITY_API_CLIENT_ID"',
'"' + apiClientIdV2 + '"')

# Use a consistent extension id for unofficial builds.
if buildtype != 'Official':
Expand Down

0 comments on commit 6e026b6

Please sign in to comment.