1.28.0

Author: Eric Koleda

dist/OAuth2.gs

@@ -463,7 +463,7 @@ Service_.prototype.hasAccess = function() {
   return this.lockable_(function() {
     var token = this.getToken();
     if (!token || this.isExpired_(token)) {
-      if (token && token.refresh_token) {
+      if (token && this.canRefresh_(token)) {
         try {
           this.refresh();
         } catch (e) {
@@ -678,6 +678,24 @@ Service_.prototype.isExpired_ = function(token) {
   }
 };
 
+/**
+ * Determines if a retrieved token can be refreshed.
+ * @param {Object} token The token to inspect.
+ * @return {boolean} True if it can be refreshed, false otherwise.
+ * @private
+ */
+Service_.prototype.canRefresh_ = function(token) {
+  if (!token.refresh_token) return false;
+  var expiresIn = token.refresh_token_expires_in;
+  if (!expiresIn) {
+    return true;
+  } else {
+    var expiresTime = token.granted_time + Number(expiresIn);
+    var now = getTimeInSeconds_(new Date());
+    return expiresTime - now > Service_.EXPIRATION_BUFFER_SECONDS_;
+  }
+};
+
 /**
  * Uses the service account flow to exchange a signed JSON Web Token (JWT) for
  * an access token.

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "apps-script-oauth2",
-  "version": "1.27.0",
+  "version": "1.28.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",