commit 9ced30ed29758c800eac061d0a04cdd9294e0616
author Oluwatobi Bashir-Bello <nbashirbello@google.com> Mon Jul 14 15:15:49 2014 -0400
committer Oluwatobi Bashir-Bello <nbashirbello@google.com> Mon Jul 14 15:15:49 2014 -0400
tree 6ee83f0c107ade7917740cd24dd442bd42da2966
parent e6acc56b8af70afdde8a1b49fd00002937ddf887

Don't persist the access token to the credentials file in Google Login API.

Change-Id: I0e5ba4884ed836f1ac4be0db4f4af843e6edf19f

login/src/com/google/gct/login/GoogleLoginPrefs.java

diff --git a/login/src/com/google/gct/login/GoogleLoginPrefs.java b/login/src/com/google/gct/login/GoogleLoginPrefs.java
index 8795238..308aa6e 100644
--- a/login/src/com/google/gct/login/GoogleLoginPrefs.java
+++ b/login/src/com/google/gct/login/GoogleLoginPrefs.java
@@ -42,9 +42,6 @@
   private static String preferencesPath = PREFERENCES_PATH;
 
   private static final String OAUTH_DATA_EMAIL_KEY = "credentials_email";
-  private static final String OAUTH_DATA_ACCESS_TOKEN_KEY = "credentials_access_token";
-  private static final String OAUTH_DATA_ACCESS_TOKEN_EXPIRY_TIME_KEY =
-    "credentials_access_token_expiry_time";
   private static final String OAUTH_DATA_REFRESH_TOKEN_KEY = "credentials_refresh_token";
   private static final String ICON_ONLY_KEY = "icon_only";
   private static final String LOGOUT_ON_EXIT_KEY = "logout_on_exit";
@@ -61,11 +58,7 @@
   public static void saveOAuthData(OAuthData credentials) {
     Preferences prefs = getPrefs();
     String userEmail = credentials.getStoredEmail();
-    prefs.put(getCustomUserKey(OAUTH_DATA_ACCESS_TOKEN_KEY, userEmail), credentials.getAccessToken());
     prefs.put(getCustomUserKey(OAUTH_DATA_REFRESH_TOKEN_KEY, userEmail), credentials.getRefreshToken());
-    prefs.put(
-      getCustomUserKey(OAUTH_DATA_ACCESS_TOKEN_EXPIRY_TIME_KEY, userEmail),
-      Long.toString(credentials.getAccessTokenExpiryTime()));
 
     // we save the scopes so that if the user updates the plugin and the
     // scopes change, we can force the plugin to log out.
@@ -89,7 +82,6 @@
   public static OAuthData loadOAuthData() {
     Preferences prefs = getPrefs();
 
-    String accessToken = prefs.get(getCustomUserKey(OAUTH_DATA_ACCESS_TOKEN_KEY), null);
     String refreshToken = prefs.get(getCustomUserKey(OAUTH_DATA_REFRESH_TOKEN_KEY), null);
     String storedEmail = prefs.get(getCustomUserKey(OAUTH_DATA_EMAIL_KEY), null);
     String storedScopesString = prefs.get(getCustomUserKey(OAUTH_SCOPES_KEY), "");
@@ -99,13 +91,7 @@
     for (String scope : storedScopesString.split(DELIMITER)) {
       storedScopes.add(scope);
     }
-    long accessTokenExpiryTime = 0;
-    String accessTokenExpiryTimeString = prefs.get(getCustomUserKey(OAUTH_DATA_ACCESS_TOKEN_EXPIRY_TIME_KEY), null);
-    if (accessTokenExpiryTimeString != null) {
-      accessTokenExpiryTime = Long.parseLong(accessTokenExpiryTimeString);
-    }
-    return new OAuthData(
-      accessToken, refreshToken, storedEmail, storedScopes, accessTokenExpiryTime);
+    return new OAuthData(null, refreshToken, storedEmail, storedScopes, 0);
   }
 
   /**
@@ -118,11 +104,9 @@
     }
 
     Preferences prefs = getPrefs();
-    prefs.remove(getCustomUserKey(OAUTH_DATA_ACCESS_TOKEN_KEY));
     prefs.remove(getCustomUserKey(OAUTH_DATA_REFRESH_TOKEN_KEY));
     prefs.remove(getCustomUserKey(OAUTH_DATA_EMAIL_KEY));
     prefs.remove(getCustomUserKey(OAUTH_SCOPES_KEY));
-    prefs.remove(getCustomUserKey(OAUTH_DATA_ACCESS_TOKEN_EXPIRY_TIME_KEY));
     removeUser(prefs, activeUser.getEmail());
     flushPrefs(prefs);
   }