diff options
| author | Alberto Mardegan <mardy@users.sourceforge.net> | 2015-09-23 15:38:16 +0200 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2015-09-23 15:39:25 +0200 |
| commit | e23e8c92911d177e2cdf184560163ad6e600794b (patch) | |
| tree | 712b128567b3f9969ea640faf9dfbd68a28b54e9 | |
| parent | f1081b2e9c3b67029f7c058940a91f3ec01a937b (diff) | |
| download | evolution-data-server-e23e8c92911d177e2cdf184560163ad6e600794b.tar.gz | |
Bug 755412 - [UOA] Update OAuth flow according to Google documentation
While the existing parameters continue to work, Google is no longer
granting us a refresh token (which could be used to short-cut the
authentication and avoid loading a web view).
By following the latest documentation at
https://developers.google.com/identity/protocols/OAuth2InstalledApp
we change the application type to "Installed application" (this gives us
an additional pair of keys) and set the callback URI to
https://localhost/.
3 files changed, 9 insertions, 9 deletions
diff --git a/modules/ubuntu-online-accounts/google-calendar.service.in.in b/modules/ubuntu-online-accounts/google-calendar.service.in.in index 6f6f89b3c..5cafdadc4 100644 --- a/modules/ubuntu-online-accounts/google-calendar.service.in.in +++ b/modules/ubuntu-online-accounts/google-calendar.service.in.in @@ -14,9 +14,9 @@ <group name="web_server"> <setting name="Host">accounts.google.com</setting> <setting name="TokenPath">o/oauth2/token</setting> - <setting name="RedirectUri">https://live.gnome.org/Evolution</setting> - <setting name="ClientId">796629365126.apps.googleusercontent.com</setting> - <setting name="ClientSecret">3NbR94RM-DTnA81BWjiJe4TP</setting> + <setting name="RedirectUri">https://localhost/</setting> + <setting name="ClientId">796629365126-a2o58ak3l6nuk9bto6sr5aoku0vh5enc.apps.googleusercontent.com</setting> + <setting name="ClientSecret">YVigZ5Po5p83_CrwQk-p5SwP</setting> <setting type="as" name="Scope">['https://www.googleapis.com/auth/userinfo.email','https://mail.google.com/','https://www.google.com/m8/feeds/','https://www.googleapis.com/auth/calendar']</setting> </group> </group> diff --git a/modules/ubuntu-online-accounts/google-contacts.service.in.in b/modules/ubuntu-online-accounts/google-contacts.service.in.in index 8a77bd73e..958638cef 100644 --- a/modules/ubuntu-online-accounts/google-contacts.service.in.in +++ b/modules/ubuntu-online-accounts/google-contacts.service.in.in @@ -14,9 +14,9 @@ <group name="web_server"> <setting name="Host">accounts.google.com</setting> <setting name="TokenPath">o/oauth2/token</setting> - <setting name="RedirectUri">https://live.gnome.org/Evolution</setting> - <setting name="ClientId">796629365126.apps.googleusercontent.com</setting> - <setting name="ClientSecret">3NbR94RM-DTnA81BWjiJe4TP</setting> + <setting name="RedirectUri">https://localhost/</setting> + <setting name="ClientId">796629365126-a2o58ak3l6nuk9bto6sr5aoku0vh5enc.apps.googleusercontent.com</setting> + <setting name="ClientSecret">YVigZ5Po5p83_CrwQk-p5SwP</setting> <setting type="as" name="Scope">['https://www.googleapis.com/auth/userinfo.email','https://mail.google.com/','https://www.google.com/m8/feeds/','https://www.googleapis.com/auth/calendar']</setting> </group> </group> diff --git a/modules/ubuntu-online-accounts/google-gmail.service.in.in b/modules/ubuntu-online-accounts/google-gmail.service.in.in index 443d63f6e..ed5ad8a49 100644 --- a/modules/ubuntu-online-accounts/google-gmail.service.in.in +++ b/modules/ubuntu-online-accounts/google-gmail.service.in.in @@ -14,9 +14,9 @@ <group name="web_server"> <setting name="Host">accounts.google.com</setting> <setting name="TokenPath">o/oauth2/token</setting> - <setting name="RedirectUri">https://live.gnome.org/Evolution</setting> - <setting name="ClientId">796629365126.apps.googleusercontent.com</setting> - <setting name="ClientSecret">3NbR94RM-DTnA81BWjiJe4TP</setting> + <setting name="RedirectUri">https://localhost/</setting> + <setting name="ClientId">796629365126-a2o58ak3l6nuk9bto6sr5aoku0vh5enc.apps.googleusercontent.com</setting> + <setting name="ClientSecret">YVigZ5Po5p83_CrwQk-p5SwP</setting> <setting type="as" name="Scope">['https://www.googleapis.com/auth/userinfo.email','https://mail.google.com/','https://www.google.com/m8/feeds/','https://www.googleapis.com/auth/calendar']</setting> </group> </group> |