Merge branch 'master' of github.com:googlesamples/apps-script-oauth2 into locking

Author: Eric Koleda

README.md

@@ -24,6 +24,11 @@ code editor:
 Alternatively, you can copy and paste the files in the [`/dist`](dist) directory
 directly into your script project.
 
+If you are [setting explicit scopes](https://developers.google.com/apps-script/concepts/scopes#setting_explicit_scopes)
+in your manifest file, ensure that the following scope is included:
+
+* `https://www.googleapis.com/auth/script.external_request`
+
 ## Redirect URI
 
 Before you can start authenticating against an OAuth2 provider, you usually need
@@ -169,11 +174,11 @@ function makeRequest() {
 }
 ```
 
-## Compatiblity
+## Compatibility
 
 This library was designed to work with any OAuth2 provider, but because of small
 differences in how they implement the standard it may be that some APIs
-aren't compatible. If you find an API that it does't work with, open an issue or
+aren't compatible. If you find an API that it doesn't work with, open an issue or
 fix the problem yourself and make a pull request against the source code.
 
 ## Other features
@@ -260,3 +265,12 @@ registered with the OAuth provider is updated to use the format
 `https://script.google.com/macros/d/{SCRIPT ID}/usercallback`.
 * Version 22 - Renamed `Service.getToken_()` to `Service.getToken()`, since
 there OAuth providers that return important information in the token response.
+
+## Troubleshooting
+
+### You do not have permission to call fetch
+
+You are [setting explicit scopes](https://developers.google.com/apps-script/concepts/scopes#setting_explicit_scopes)
+in your manifest file but have forgotten to add the 
+`https://www.googleapis.com/auth/script.external_request` scope used by this library
+(and eventually the `UrlFetchApp` request you are making to an API).

dist/OAuth2.gs

@@ -21,10 +21,6 @@
  * any required setup.
  */
 
-// Load the Underscore.js library. This library was added using the script
-// ID "1I21uLOwDKdyF3_W_hvh6WXiIKWJWno8yG9lB8lf1VBnZFQ6jAAhyNTRG".
-
-
 /**
  * The supported formats for the returned OAuth2 token.
  * @enum {string}
@@ -264,7 +260,7 @@ Service_.prototype.setCache = function(cache) {
  */
 Service_.prototype.setScope = function(scope, opt_separator) {
  var separator = opt_separator || ' ';
- this.params_.scope = _.isArray(scope) ? scope.join(separator) : scope;
+ this.params_.scope = Array.isArray(scope) ? scope.join(separator) : scope;
  return this;
 };
 
@@ -766,24 +762,12 @@ function buildUrl_(url, params) {
 function validate_(params) {
  Object.keys(params).forEach(function(name) {
  var value = params[name];
- if (isEmpty_(value)) {
+ if (!value) {
  throw Utilities.formatString('%s is required.', name);
  }
  });
 }
 
-/**
- * Returns true if the given value is empty, false otherwise. An empty value is one of
- * null, undefined, a zero-length string, a zero-length array or an object with no keys.
- * @param {?} value The value to test.
- * @returns {boolean} True if the value is empty, false otherwise.
- * @private
- */
-function isEmpty_(value) {
- return value === null || value === undefined ||
- ((_.isObject(value) || _.isString(value)) && _.isEmpty(value));
-}
-
 /**
  * Gets the time in seconds, rounded down to the nearest second.
  * @param {Date} date The Date object to convert.