Merge lp:~mardy/account-plugins/google-auth into lp:account-plugins

[Alberto Mardegan]

Fix Google authentication, which was broken with the lasted QUrl query
handling in Qt5.

Fix Google authentication, which was broken with the lasted QUrl query
handling in Qt5.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:114
http://jenkins.qa.ubuntu.com/job/account-plugins-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-plugins-saucy-amd64-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/account-plugins-ci/8/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Works great

review: Approve

=== modified file 'data/providers/google.provider.in.in'
--- data/providers/google.provider.in.in	2013-02-25 06:19:48 +0000
+++ data/providers/google.provider.in.in	2013-06-06 13:18:55 +0000
@@ -13,12 +13,12 @@
       <group name="oauth2">
         <group name="web_server">
           <setting name="Host">accounts.google.com</setting>
-          <setting name="AuthPath">o/oauth2/auth</setting>
+          <!-- HACK: access_type is non standard, but Google requires it in
+               order to return a refresh token -->
+          <setting name="AuthPath">o/oauth2/auth?access_type=offline</setting>
           <setting name="TokenPath">o/oauth2/token</setting>
           <setting name="RedirectUri">https://wiki.ubuntu.com/</setting>
-          <!-- HACK: access_type is non standard, but Google requires it in
-               order to return a refresh token -->
-          <setting name="ResponseType">code&amp;access_type=offline</setting>
+          <setting name="ResponseType">code</setting>
           <setting name="Scope" type="as">['https://docs.google.com/feeds/','https://www.googleapis.com/auth/googletalk','https://www.googleapis.com/auth/userinfo.email','https://www.googleapis.com/auth/userinfo.profile','https://picasaweb.google.com/data/']</setting>
           <setting name="ClientId">@GOOGLE_CLIENT_ID@</setting>
           <setting name="ClientSecret">@GOOGLE_CLIENT_SECRET@</setting>
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-06-06 00:56:08 +0000
+++ debian/changelog	2013-06-06 13:18:55 +0000
@@ -1,3 +1,10 @@
+account-plugins (0.11daily13.06.06-0ubuntu2) UNRELEASED; urgency=low
+
+  * Fix Google authentication, which was broken with the lasted QUrl query
+    handling in Qt5.
+
+ -- Alberto Mardegan <[e-mail]>  Thu, 06 Jun 2013 16:15:17 +0300
+
 account-plugins (0.11daily13.06.06-0ubuntu1) saucy; urgency=low
 
   [ Jeremy Bicha ]
 
=== modified file 'src/google.vala'
--- src/google.vala	2013-02-22 15:17:49 +0000
+++ src/google.vala	2013-06-06 13:18:55 +0000
@@ -31,15 +31,15 @@
         /* Note the evil trick here: Google uses a couple of non-standard OAuth
          * parameters: "access_type" and "approval_prompt"; the signon OAuth
          * plugin doesn't (yet?) give us a way to provide extra parameters, so
-         * we fool it by appending them to the value of the "ResponseType".
+         * we fool it by appending them to the value of the "AuthPath".
          *
          * We need to specify "access_type=offline" if we want Google to return
          * us a refresh token.
          * The "approval_prompt=force" string forces Google to ask for
          * authentication.
          */
-        oauth_params.insert ("ResponseType",
-                             "code&access_type=offline&approval_prompt=force");
+        oauth_params.insert ("AuthPath",
+                             "o/oauth2/auth?access_type=offline&approval_prompt=force");
         set_oauth_parameters (oauth_params);
 
         set_ignore_cookies (true);