getToken --> getAccessToken

index.js

@@ -9,10 +9,7 @@ var NPR = API({
   password: process.env.NPR_PASSWORD
 });
 
-NPR.authenticate(function(err, token) {
-
-  if(err)
-    return console.error(err);
+NPR.authenticate(function(token) {
 
   if(! token)
     return console.error('invalid token');

lib/api.js

@@ -1,7 +1,8 @@
 /************************ DEPENDENCIES *****************************/
 var util = require('util'),
     OAuth = require('oauth'),
-    bunyan = require('bunyan');
+    bunyan = require('bunyan'),
+    request = require('request');
 
 var proto = API.prototype;
 exports = module.exports = API;
@@ -33,23 +34,24 @@ proto.token_endpoint = 'authorization/v2/token';
 /***************************** AUTH *******************************/
 proto.authenticate = function(cb) {
 
-  this.getToken()
-    .then(function(args) {
-      cb.apply(this, args);
-    })
+  this.getAccessToken()
+    .then(cb)
     .catch(function(err) {
       this.log.error(err);
-      cb(err);
+      cb();
     }.bind(this));
 
 };
 
-proto.getToken = function() {
+proto.getAccessToken = function() {
 
   var self = this;
 
   return new Promise(function(resolve, reject) {
 
+    if(self.access_token)
+      return resolve(self.access_token);
+
     if(! self.client_id)
       return reject('OAuth Client ID not supplied');
 
@@ -83,7 +85,7 @@ proto.getToken = function() {
       self.log.debug('refresh token', self.refresh_token);
       self.log.debug('results', results);
 
-      return resolve([err, access_token, refresh_token, results]);
+      return resolve(access_token);
 
     };
 
@@ -99,3 +101,8 @@ proto.getToken = function() {
 
 };
 
+/*********************** RECOMMENDATIONS **************************/
+
+
+
+

package.json

@@ -34,6 +34,7 @@
   "dependencies": {
     "bunyan": "^1.4.0",
     "dotenv": "^1.2.0",
-    "oauth": "^0.9.13"
+    "oauth": "^0.9.13",
+    "request": "^2.60.0"
   }
 }

test/api.js

@@ -13,10 +13,7 @@ describe('NPR API', function() {
         password: process.env.NPR_PASSWORD
       });
 
-      NPR.authenticate(function(err, token) {
-
-        if(err)
-          done(err);
+      NPR.authenticate(function(token) {
 
         if(! token)
           return done('invalid token');