gdata-js - npm Package Compare versions

Comparing version 2.0.1 to 3.0.0

gdata.js

@@ -0,4 +1,6 @@
+var EventEmitter = require('events').EventEmitter;
+var https = require('https');
+var parse = require('url').parse;
 var querystring = require('querystring');
-var https = require('https');
-var EventEmitter = require('events').EventEmitter;
+var request = require('request');
 
@@ -9,140 +11,209 @@ var URL = require('url');
 
-module.exports = function(client_id, client_secret, redirect_uri) {
-    var clientID = client_id;
-    var clientSecret = client_secret;
-    var redirectURI = redirect_uri;
-    var token;
+function doPost(body, callback) {
+  var options = {
+    host: 'accounts.google.com',
+    port: 443,
+    path: '/o/oauth2/token',
+    method: 'POST',
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+  };
 
-    var client = new EventEmitter();
-    client.getAccessToken = function(options, req, res, callback) {
-        if(req.query.error) {
-            callback(req.query.error);
-        } else if(!req.query.code) {
-            options.client_id = clientID;
-            options.redirect_uri = options.redirect_uri || redirectURI;
-            options.response_type = 'code';
-            var height = 750;
-            var width = 980;
-            resp = "<script type='text/javascript'>" +
-                      "var left= (screen.width / 2) - (" + width + " / 2);" +
-                      "var top = (screen.height / 2) - (" + height + " / 2);" +
-                      "window.open('" + oauthBase + '/auth?' + querystring.stringify(options) + "', 'auth', 'menubar=no,toolbar=no,status=no,width=" + width + ",height=" + height + ",toolbar=no,left=' + left + 'top=' + top);" +
-                    "</script>";
-            res.end(resp + '<a target=_new href=\'' + oauthBase + '/auth?' + querystring.stringify(options) + '\'>Authenticate</a>');
-        } else {
-             doPost({grant_type:'authorization_code',
-                      code:req.query.code,
-                      client_id:clientID,
-                      client_secret:clientSecret,
-                      redirect_uri:redirectURI}, function(err, tkn) {
-                          if(!err && tkn && !tkn.error)
-                              token = tkn;
-                          callback(err, tkn);
-                      });
-        }
-    }
+  var httpsReq = https.request(options, function (httpsRes) {
+    if (httpsRes.statusCode === 200) {
+      httpsRes.on('data', function (data) {
+        callback(null, JSON.parse(data.toString()));
+      });
+    } else {
+      httpsRes.on('data', function (data) {
+        console.error("refreshing token -- statusCode !== 200, yoikes! data:",
+          data.toString());
 
-    client.setToken = function(tkn) {
-        token = tkn;
+        callback(data.toString());
+      });
     }
+  });
 
-    client.getFeed = function(url, params, callback) {
-        if(!callback && typeof params === 'function') {
-            callback = params;
-            params = {};
+  httpsReq.write(querystring.stringify(body));
+
+  httpsReq.on('error', function (e) {
+    callback(e, null);
+  });
+
+  httpsReq.end();
+}
+
+module.exports = function (client_id, client_secret, redirect_uri) {
+  var clientID = client_id;
+  var clientSecret = client_secret;
+  var redirectURI = redirect_uri;
+  var token;
+
+  var client = new EventEmitter();
+
+  client.getAccessToken = function (options, req, res, callback) {
+    if (req.query.error) {
+      callback(req.query.error);
+    } else if (!req.query.code) {
+      options.client_id = clientID;
+      options.redirect_uri = options.redirect_uri || redirectURI;
+      options.response_type = 'code';
+
+      var height = 750;
+      var width = 980;
+
+      var resp = "<script type='text/javascript'>" +
+        "var left= (screen.width / 2) - (" + width + " / 2);" +
+        "var top = (screen.height / 2) - (" + height + " / 2);" +
+        "window.open('" + oauthBase + '/auth?' +
+        querystring.stringify(options) + "', 'auth', 'menubar=no,toolbar=no," +
+        "status=no,width=" + width + ",height=" + height +
+        ",toolbar=no,left=' + left + 'top=' + top);" +
+        "</script>";
+
+      res.end(resp + '<a target=_new href=\'' + oauthBase + '/auth?' +
+        querystring.stringify(options) + '\'>Authenticate</a>');
+    } else {
+      doPost({
+        grant_type: 'authorization_code',
+        code: req.query.code,
+        client_id: clientID,
+        client_secret: clientSecret,
+        redirect_uri: redirectURI
+      }, function (err, tkn) {
+        if (!err && tkn && !tkn.error) {
+          token = tkn;
         }
-        params.oauth_token = token.access_token;
-        params.alt = 'json';
-        var reqUrl = url + '?' + querystring.stringify(params);
-        doRequest(url, params, function(err, body) {
-            callback(err, body);
-        });
-    };
 
+        callback(err, tkn);
+      });
+    }
+  };
 
-    function doRequest(url, params, callback) {
-        var path = URL.parse(url).pathname + '?' + querystring.stringify(params);
-        var options = {
-            host: 'www.google.com',
-            port: 443,
-            path: path,
-            method: 'GET'
-        };
+  client.setToken = function (tkn) {
+    token = tkn;
+  };
 
-        var httpsReq = https.request(options, function(httpsRes) {
-            if(httpsRes.statusCode === 401) {
-                refreshToken(function(err, result) {
-                    if(!err && result && !result.error && result.access_token) {
-                        token.access_token = result.access_token;
-                        token.refresh_token = result.refresh_token || token.refresh_token;
-                        client.emit('tokenRefresh');
-                        client.getFeed(url, params, callback);
-                    }
-                });
-            } else {
-                var data = '';
-                httpsRes.on('data', function(moreData) {
-                    data += moreData;
-                });
-                httpsRes.on('end', function() {
-                    try {
-                        callback(null, JSON.parse(data.toString()));
-                    } catch(err) {
-                        callback(err, null);
-                    }
-                })
-            }
-        });
-        httpsReq.on('error', function(e) {
-            callback(e, null);
-        });
-        httpsReq.end();
+  client.getToken = function() {
+    return token;
+  }
+
+  client.getFeed = function (url, params, callback) {
+    if (!callback && typeof params === 'function') {
+      callback = params;
+      params = {};
     }
 
-    function refreshToken(callback) {
-        doPost({client_id:clientID,
-                client_secret:clientSecret,
-                refresh_token:token.refresh_token,
-                grant_type:'refresh_token'
-               }, function(err, result) {
-                   if(err || !result || !result.access_token) {
-                       console.error('err', err);
-                       console.error('result', result);
-                   }
-                   callback(err, result);
-               });
+    params.oauth_token = token.access_token;
+
+    // Don't request profile photos as JSON
+    if (!/photos\/media/.test(url)) {
+      params.alt = 'json';
     }
 
-    //for debugging
-    client._refreshToken = refreshToken;
+    doRequest(url, params, function (err, body) {
+      callback(err, body);
+    });
+  };
 
-    return client;
-}
+  client.post = function(options, callback) {
+    if (!options.qs) options.qs = {};
+    if (!options.qs.access_token) options.qs.access_token = token.access_token;
+    request.post(options, function(err, resp, body) {
+      if (err) return callback(err, body);
+      if (resp.statusCode === 401) {
+        return refreshToken(function(err, result) {
+          if(!err && result && !result.error && result.access_token) {
+            token.access_token = result.access_token;
+            token.refresh_token = result.refresh_token || token.refresh_token;
+            client.emit('tokenRefresh');
+            options.qs.access_token = token.access_token;
+            client.post(options, callback);
+          }
+        });
+      }
+      return callback(null, body);
+    })
+  }
 
+  function doRequest(url, params, callback) {
+    var parsedUrl = parse(url);
+    var path = parsedUrl.pathname + '?' + querystring.stringify(params);
 
-function doPost(body, callback) {
     var options = {
-        host: 'accounts.google.com',
-        port: 443,
-        path: '/o/oauth2/token',
-        method: 'POST',
-        headers: {'Content-Type':'application/x-www-form-urlencoded'}
+      host: parsedUrl.host || 'www.google.com',
+      port: 443,
+      path: path,
+      method: 'GET'
     };
-    var httpsReq = https.request(options, function(httpsRes) {
-        if(httpsRes.statusCode === 200) {
-            httpsRes.on('data', function(data) {
-                callback(null, JSON.parse(data.toString()));
-            });
-        } else {
-            httpsRes.on('data', function(data) {
-                console.error("refreshing token -- statusCode !== 200, yoikes! data:", data.toString());
-                callback(data.toString());
-            });
-        }
+
+    var httpsReq = https.request(options, function (httpsRes) {
+      if (httpsRes.statusCode === 401 || httpsRes.statusCode === 403) {
+        refreshToken(function (err, result) {
+          if (err) {
+            return callback(err);
+          }
+
+          if (result && result.error) {
+            return callback(result.error);
+          }
+
+          if (!err && result && !result.error && result.access_token) {
+            token.access_token = result.access_token;
+            token.refresh_token = result.refresh_token || token.refresh_token;
+
+            client.emit('tokenRefresh');
+
+            client.getFeed(url, params, callback);
+          }
+        });
+      } else {
+        var data = '';
+
+        httpsRes.on('data', function (moreData) {
+          data += moreData;
+        });
+
+        httpsRes.on('end', function () {
+          // Don't try to parse profile pictures as JSON
+          if (httpsRes.headers['content-type'] &&
+            httpsRes.headers['content-type'].indexOf('image') === 0) {
+            return callback(null, data);
+          }
+
+          try {
+            callback(null, JSON.parse(data.toString()));
+          } catch (err) {
+            callback(err + ": " + data.toString(), null);
+          }
+        });
+      }
     });
-    httpsReq.write(querystring.stringify(body));
-    httpsReq.on('error', function(e) {
-        callback(e, null);
+
+    httpsReq.on('error', function (e) {
+      callback(e, null);
     });
+
     httpsReq.end();
-}
+  }
+
+  function refreshToken(callback) {
+    doPost({
+      client_id: clientID,
+      client_secret: clientSecret,
+      refresh_token: token.refresh_token,
+      grant_type: 'refresh_token'
+    }, function (err, result) {
+      if (err || !result || !result.access_token) {
+        console.error('gdata-js refreshToken err', err);
+        console.error('gdata-js refreshToken result', result);
+      }
+
+      callback(err, result);
+    });
+  }
+
+  // for debugging
+  client._refreshToken = refreshToken;
+
+  return client;
+};

package.json

 {
     "name": "gdata-js",
     "description": "Simple OAuth 2.0 GData API client",
-    "version": "2.0.1",
+    "version": "3.0.0",
     "author": "Simon Murtha-Smith <[e-mail]>",
     "keywords": ["google", "gdata"],
     "main" : "gdata.js",
-    "dependencies": {},
+    "dependencies": {
+      "request":"2.12.0"
+    },
     "repository" : {"type": "git" , "url": "http://github.com/smurthas/gdata-js.git" },
-    "engines": { "node": ">=0.6.0 <0.7.0" }
+    "engines": { "node": ">=0.8.0 <0.9.0" }
 }

test.js

@@ -18,4 +18,6 @@ var request = require('request');
     connect = require('connect'),
-    app = express.createServer(connect.bodyParser());
+    app = express();
 
+app.use(connect.bodyParser());
+
 var token;
@@ -45,5 +47,5 @@
         for(var i in feed.feed.entry) {
-            res.write(JSON.stringify(feed.feed.entry[i]['title']));
-            res.write(JSON.stringify(feed.feed.entry[i]['gd$email']));
-            res.write('\n\n')
+            res.write(JSON.stringify(feed.feed.entry[i].title));
+            res.write(JSON.stringify(feed.feed.entry[i].gd$email));
+            res.write('\n\n');
         }
@@ -50,0 +52,0 @@ res.end();

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

9164

increased by9.11%

Lines of code

238

increased by25.93%

Worsened metrics

Dependency count

1

increased byInfinity%

Dependency changes

• + Addedrequest@2.12.0

• + Addedrequest@2.12.0(transitive)