[update] handle error when client crendentials are not provided

lib/client.js

@@ -27,21 +27,25 @@ class Client {
    * @param {string} path - endpoint to send request
    * @param {Object} [params] - querystrings
    */
-  fetchOAuth (path, params) {
+  fetch (path, params) {
     path = params ? `${path}?${qs.encode(params)}` : path
 
-    return Promise.resolve(this.getToken().then((token) => {
-      const opts = {
-        method: 'GET',
-        uri: path,
-        headers: {
-          'Authorization': `Bearer ${token}`
-        },
-        json: true
-      }
-
-      return request(opts)
-    }))
+    return new Promise((resolve, reject) => {
+      this.getToken()
+        .then((token) => {
+          const opts = {
+            method: 'GET',
+            uri: path,
+            headers: {
+              'Authorization': `Bearer ${token}`
+            },
+            json: true
+          }
+
+          resolve(request(opts))
+        })
+        .catch((err) => reject(new Error(err)))
+    })
   }
 
   getToken () {
@@ -119,7 +123,7 @@ class Client {
         .asCallback(callback)
     }
 
-    return Promise.resolve(this.fetchOAuth(url))
+    return Promise.resolve(this.fetch(url))
   }
 
   /**
@@ -132,11 +136,11 @@ class Client {
     /* istanbul ignore else  */
     if (callback) {
       return Promise
-        .resolve(this.fetchOAuth(this.endpoints.albums, { ids }))
+        .resolve(this.fetch(this.endpoints.albums, { ids }))
         .asCallback(callback)
     }
 
-    return Promise.resolve(this.fetchOAuth(this.endpoints.albums, { ids }))
+    return Promise.resolve(this.fetch(this.endpoints.albums, { ids }))
   }
 
   /**
@@ -169,11 +173,11 @@ class Client {
     /* istanbul ignore else  */
     if (callback) {
       return Promise
-        .resolve(this.fetchOAuth(url, params))
+        .resolve(this.fetch(url, params))
         .asCallback(callback)
     }
 
-    return Promise.resolve(this.fetchOAuth(url, params))
+    return Promise.resolve(this.fetch(url, params))
   }
 
   /**
@@ -186,11 +190,11 @@ class Client {
     /* istanbul ignore else  */
     if (callback) {
       return Promise
-        .resolve(this.fetchOAuth(this.endpoints.artists, { ids }))
+        .resolve(this.fetch(this.endpoints.artists, { ids }))
         .asCallback(callback)
     }
 
-    return Promise.resolve(this.fetchOAuth(this.endpoints.artists, { ids }))
+    return Promise.resolve(this.fetch(this.endpoints.artists, { ids }))
   }
 
   /**
@@ -203,11 +207,11 @@ class Client {
     /* istanbul ignore else  */
     if (callback) {
       return Promise
-        .resolve(this.fetchOAuth(url))
+        .resolve(this.fetch(url))
         .asCallback(callback)
     }
 
-    return Promise.resolve(this.fetchOAuth(url))
+    return Promise.resolve(this.fetch(url))
   }
 
   /**
@@ -220,11 +224,11 @@ class Client {
     /* istanbul ignore else  */
     if (callback) {
       return Promise
-        .resolve(this.fetchOAuth(this.endpoints.tracks, { ids }))
+        .resolve(this.fetch(this.endpoints.tracks, { ids }))
         .asCallback(callback)
     }
 
-    return Promise.resolve(this.fetchOAuth(this.endpoints.tracks, { ids }))
+    return Promise.resolve(this.fetch(this.endpoints.tracks, { ids }))
   }
 
   /**
@@ -247,11 +251,11 @@ class Client {
     /* istanbul ignore else  */
     if (callback) {
       return Promise
-        .resolve(this.fetchOAuth(url, params))
+        .resolve(this.fetch(url, params))
         .asCallback(callback)
     }
 
-    return Promise.resolve(this.fetchOAuth(url, params))
+    return Promise.resolve(this.fetch(url, params))
   }
 
   /**
@@ -271,11 +275,11 @@ class Client {
     /* istanbul ignore else  */
     if (callback) {
       return Promise
-        .resolve(this.fetchOAuth(url, opts))
+        .resolve(this.fetch(url, opts))
         .asCallback(callback)
     }
 
-    return Promise.resolve(this.fetchOAuth(url, opts))
+    return Promise.resolve(this.fetch(url, opts))
   }
 }