Merge lp:~mardy/account-plugins/new-keys into lp:account-plugins

[Alberto Mardegan]

Do not reveal Google secret API key.

This was used to get a refresh token; however, since we are achieving the same
goal (long lived sessions) by means of the session cookies, this is no longer
necessary.
We might want to revert this patch if at some point we get confirmation that
Google doesn't mind us sharing the secret API key; but while in doubt, let's
keep it out of the source code.

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:72
http://s-jenkins:8080/job/online-accounts-account-plugins-ci/12/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/online-accounts-account-plugins-ci/./label=quantal/12/console

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Works as intended and looks fine.

review: Approve

=== modified file 'src/google.vala'
--- src/google.vala	2012-08-31 09:52:33 +0000
+++ src/google.vala	2012-10-09 10:39:23 +0000
@@ -21,31 +21,12 @@
  */
 
 public class GooglePlugin : Ap.OAuthPlugin {
-    private enum ParametersUser
-    {
-        ACCOUNT_PLUGIN,
-        CLIENT_APPLICATIONS
-    }
-
     public GooglePlugin (Ag.Account account) {
         Object (account: account);
     }
 
     construct
     {
-        var oauth_params = get_parameters(ParametersUser.ACCOUNT_PLUGIN);
-        set_oauth_parameters (oauth_params);
-
-        oauth_params = get_parameters(ParametersUser.CLIENT_APPLICATIONS);
-        set_account_oauth_parameters (oauth_params);
-
-        set_mechanism(Ap.OAuthMechanism.WEB_SERVER);
-
-        set_ignore_cookies (true);
-    }
-
-    private HashTable<string, GLib.Value?> get_parameters (ParametersUser user)
-    {
         var oauth_params = new HashTable<string, GLib.Value?> (str_hash, null);
         oauth_params.insert ("Host", "accounts.google.com");
         oauth_params.insert ("AuthPath", "o/oauth2/auth");
@@ -53,28 +34,8 @@
         oauth_params.insert ("RedirectUri",
                              "https://wiki.ubuntu.com/");
         oauth_params.insert ("ClientId", Config.GOOGLE_CLIENT_ID);
-        oauth_params.insert ("ClientSecret", Config.GOOGLE_CLIENT_SECRET);
+        oauth_params.insert ("ResponseType", "token");
 
-        /* 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 need to specify "access_type=offline" if we want Google to return
-         * us a refresh token.
-         */
-        if (user == ParametersUser.ACCOUNT_PLUGIN)
-        {
-            /* The "approval_prompt=force" string forces Google to ask for
-             * authentication. */
-            oauth_params.insert ("ResponseType",
-                                 "code&access_type=offline&approval_prompt=force");
-        }
-        else
-        {
-            oauth_params.insert ("ResponseType",
-                                 "code&access_type=offline");
-        }
         string[] scopes = {
             "https://docs.google.com/feeds/",
             "https://www.googleapis.com/auth/googletalk",
@@ -83,7 +44,9 @@
             "https://picasaweb.google.com/data/"
         };
         oauth_params.insert ("Scope", scopes);
-        return oauth_params;
+        set_oauth_parameters (oauth_params);
+
+        set_ignore_cookies (true);
     }
 }