Don't revoke tokens on logout.

remoting/webapp/oauth2.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview
  * OAuth2 class that handles retrieval/storage of an OAuth2 token.
  *
  * Uses a content script to trampoline the OAuth redirect page back into the
  * extension context.  This works around the lack of native support for
@@ skipping 13 matching lines @@
 
 
 /** @constructor */
 remoting.OAuth2 = function() {
 };
 
 // Constants representing keys used for storing persistent state.
 /** @private */
 remoting.OAuth2.prototype.KEY_REFRESH_TOKEN_ = 'oauth2-refresh-token';
 /** @private */
-remoting.OAuth2.prototype.KEY_REFRESH_TOKEN_REVOKABLE_ =
-    'oauth2-refresh-token-revokable';
-/** @private */
 remoting.OAuth2.prototype.KEY_ACCESS_TOKEN_ = 'oauth2-access-token';
 /** @private */
 remoting.OAuth2.prototype.KEY_XSRF_TOKEN_ = 'oauth2-xsrf-token';
 /** @private */
 remoting.OAuth2.prototype.KEY_EMAIL_ = 'remoting-email';
 
 // Constants for parameters used in retrieving the OAuth2 credentials.
 /** @private */
 remoting.OAuth2.prototype.SCOPE_ =
       'https://www.googleapis.com/auth/chromoting ' +
@@ skipping 24 matching lines @@
 
 /** @private
  *  @return {string} OAuth2 authentication URL.
  */
 remoting.OAuth2.prototype.getOAuth2AuthEndpoint_ = function() {
   return remoting.settings.OAUTH2_BASE_URL + '/auth';
 };
 
 /** @return {boolean} True if the app is already authenticated. */
 remoting.OAuth2.prototype.isAuthenticated = function() {
-  if (this.getRefreshToken_()) {
+  if (this.getRefreshToken()) {
     return true;
   }
   return false;
 };
 
 /**
  * Removes all storage, and effectively unauthenticates the user.
  *
  * @return {void} Nothing.
  */
 remoting.OAuth2.prototype.clear = function() {
   window.localStorage.removeItem(this.KEY_EMAIL_);
   this.clearAccessToken_();
   this.clearRefreshToken_();
 };
 
 /**
  * Sets the refresh token.
  *
- * This method also marks the token as revokable, so that this object will
- * revoke the token when it no longer needs it.
- *
  * @param {string} token The new refresh token.
  * @return {void} Nothing.
  * @private
  */
 remoting.OAuth2.prototype.setRefreshToken_ = function(token) {
   window.localStorage.setItem(this.KEY_REFRESH_TOKEN_, escape(token));
-  window.localStorage.setItem(this.KEY_REFRESH_TOKEN_REVOKABLE_, true);
   window.localStorage.removeItem(this.KEY_EMAIL_);
   this.clearAccessToken_();
 };
 
 /**
- * Gets the refresh token.
- *
- * This method also marks the refresh token as not revokable, so that this
- * object will not revoke the token when it no longer needs it. After this
- * object has exported the token, it cannot know whether it is still in use
- * when this object no longer needs it.
- *
  * @return {?string} The refresh token, if authenticated, or NULL.
  */
-remoting.OAuth2.prototype.exportRefreshToken = function() {
-  window.localStorage.removeItem(this.KEY_REFRESH_TOKEN_REVOKABLE_);
-  return this.getRefreshToken_();
-};
-
-/**
- * @return {?string} The refresh token, if authenticated, or NULL.
- * @private
- */
-remoting.OAuth2.prototype.getRefreshToken_ = function() {
+remoting.OAuth2.prototype.getRefreshToken = function() {
   var value = window.localStorage.getItem(this.KEY_REFRESH_TOKEN_);
   if (typeof value == 'string') {
     return unescape(value);
   }
   return null;
 };
 
 /**
  * Clears the refresh token.
  *
  * @return {void} Nothing.
  * @private
  */
 remoting.OAuth2.prototype.clearRefreshToken_ = function() {
-  if (window.localStorage.getItem(this.KEY_REFRESH_TOKEN_REVOKABLE_)) {
-    this.revokeToken_(this.getRefreshToken_());
-  }
   window.localStorage.removeItem(this.KEY_REFRESH_TOKEN_);
-  window.localStorage.removeItem(this.KEY_REFRESH_TOKEN_REVOKABLE_);
 };
 
 /**
  * @param {string} token The new access token.
  * @param {number} expiration Expiration time in milliseconds since epoch.
  * @return {void} Nothing.
  * @private
  */
 remoting.OAuth2.prototype.setAccessToken_ = function(token, expiration) {
   // Offset expiration by 120 seconds so that we can guarantee that the token
@@ skipping 167 matching lines @@
     console.error('Unable to exchange code for token: ', error);
   };
 
   remoting.OAuth2Api.exchangeCodeForTokens(
       this.onTokens_.bind(this, onDone), onError,
       this.getClientId_(), this.getClientSecret_(), code,
       this.getRedirectUri_());
 };
 
 /**
- * Revokes a refresh or an access token.
- *
- * @param {string?} token An access or refresh token.
- * @return {void} Nothing.
- * @private
- */
-remoting.OAuth2.prototype.revokeToken_ = function(token) {
-  if (!token || (token.length == 0)) {
-    return;
-  }
-
-  remoting.OAuth2Api.revokeToken(function() {}, function() {}, token);
-};
-
-/**
  * Call a function with an access token, refreshing it first if necessary.
  * The access token will remain valid for at least 2 minutes.
  *
  * @param {function(string):void} onOk Function to invoke with access token if
  *     an access token was successfully retrieved.
  * @param {function(remoting.Error):void} onError Function to invoke with an
  *     error code on failure.
  * @return {void} Nothing.
  */
 remoting.OAuth2.prototype.callWithToken = function(onOk, onError) {
-  var refreshToken = this.getRefreshToken_();
+  var refreshToken = this.getRefreshToken();
   if (refreshToken) {
     if (this.needsNewAccessToken_()) {
       remoting.OAuth2Api.refreshAccessToken(
           this.onAccessToken_.bind(this, onOk), onError,
           this.getClientId_(), this.getClientSecret_(),
           refreshToken);
     } else {
       onOk(this.getAccessTokenInternal_()['token']);
     }
   } else {
@@ skipping 34 matching lines @@
  * @return {?string} The email address, if it has been cached by a previous call
  *     to getEmail, otherwise null.
  */
 remoting.OAuth2.prototype.getCachedEmail = function() {
   var value = window.localStorage.getItem(this.KEY_EMAIL_);
   if (typeof value == 'string') {
     return value;
   }
   return null;
 };