Release version 24

Author: Eric Koleda

dist/OAuth2.gs

@@ -454,11 +454,12 @@ Service_.prototype.reset = function() {
   validate_({
     'Property store': this.propertyStore_
   });
-  var key = this.getPropertyKey_(this.serviceName_);
+  var key = this.getPropertyKey_();
   this.propertyStore_.deleteProperty(key);
   if (this.cache_) {
     this.cache_.remove(key);
   }
+  this.token_ = null;
 };
 
 /**
@@ -585,12 +586,13 @@ Service_.prototype.saveToken_ = function(token) {
   validate_({
     'Property store': this.propertyStore_
   });
-  var key = this.getPropertyKey_(this.serviceName_);
+  var key = this.getPropertyKey_();
   var value = JSON.stringify(token);
   this.propertyStore_.setProperty(key, value);
   if (this.cache_) {
     this.cache_.put(key, value, 21600);
   }
+  this.token_ = token;
 };
 
 /**
@@ -601,22 +603,34 @@ Service_.prototype.getToken = function() {
   validate_({
     'Property store': this.propertyStore_
   });
-  var key = this.getPropertyKey_(this.serviceName_);
-  var token;
-  if (this.cache_) {
-    token = this.cache_.get(key);
+
+  // Check in-memory cache.
+  if (this.token_) {
+    return this.token_;
   }
-  if (!token) {
-    token = this.propertyStore_.getProperty(key);
+
+  var key = this.getPropertyKey_();
+  var token;
+
+  // Check CacheService cache.
+  if (this.cache_ && (token = this.cache_.get(key))) {
+    token = JSON.parse(token);
+    this.token_ = token;
+    return token;
   }
-  if (token) {
+
+  // Check PropertiesService store.
+  if ((token = this.propertyStore_.getProperty(key))) {
     if (this.cache_) {
       this.cache_.put(key, token, 21600);
     }
-    return JSON.parse(token);
-  } else {
-    return null;
+    token = JSON.parse(token);
+    this.token_ = token;
+    return token;
   }
+
+  // Not found.
+  return null;
 };
 
 /**
@@ -625,8 +639,8 @@ Service_.prototype.getToken = function() {
  * @return {string} The property key.
  * @private
  */
-Service_.prototype.getPropertyKey_ = function(serviceName) {
-  return 'oauth2.' + serviceName;
+Service_.prototype.getPropertyKey_ = function() {
+  return 'oauth2.' + this.serviceName_;
 };
 
 /**

package.json

@@ -1,6 +1,6 @@
 {
   "name": "apps-script-oauth2",
-  "version": "1.23.0",
+  "version": "1.24.0",
   "description": "OAuth2 for Apps Script is a library for Google Apps Script that provides the ability to create and authorize OAuth2 tokens as well as refresh them when they expire.",
   "repository": {
     "type": "git",