diff options
| -rwxr-xr-x | google_apis/google_api_keys.py | 2 | ||||
| -rw-r--r-- | remoting/webapp/appsv2.patch | 2 | ||||
| -rwxr-xr-x | remoting/webapp/build-webapp.py | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/google_apis/google_api_keys.py b/google_apis/google_api_keys.py index a756cac..94170ea 100755 --- a/google_apis/google_api_keys.py +++ b/google_apis/google_api_keys.py @@ -91,3 +91,5 @@ if __name__ == "__main__": 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') diff --git a/remoting/webapp/appsv2.patch b/remoting/webapp/appsv2.patch index 9c47d7e..9deac20 100644 --- a/remoting/webapp/appsv2.patch +++ b/remoting/webapp/appsv2.patch @@ -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" + ] diff --git a/remoting/webapp/build-webapp.py b/remoting/webapp/build-webapp.py index 384aaf1..42e941c 100755 --- a/remoting/webapp/build-webapp.py +++ b/remoting/webapp/build-webapp.py @@ -279,6 +279,7 @@ 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'", @@ -286,6 +287,9 @@ def buildWebApp(buildtype, version, mimetype, destination, zip_path, plugin, 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': |