Change calls to return just the data unless overwritten by the settings. Closes #1

Author: RyanTheAllmighty

README.md

@@ -8,15 +8,12 @@ To get started simply require the package and optionally provide an optional obj
 
 ```
 var api = require('atlauncher-api')({
-    api_key: 'my-api-key,
-    force_run: false
+    api_key: 'my-api-key
 });
 ```
 
 The api_key argument is your API-KEY used for admin or PSP api calls.
 
-The force_run argument is a boolean (true/false) if we should ignore breaking api calls. For instance when you're about to reach your request limit and get IP banned the force option will allow you to bypass the exception which gets thrown halting execution.
-
 For instance for running public api calls such as getting a list of all packs you can use the following:
 
 ```
@@ -27,7 +24,7 @@ api.packs.full.all(function(err, res) {
         return console.error(err);
     }
 
-    console.log(res.data);
+    console.log(res);
 });
 ```
 

index.js

@@ -25,7 +25,7 @@ module.exports = function (obj) {
         base_url: 'https://api.atlauncher.com/',
         api_version: 'v1',
         api_key: false,
-        force_run: false
+        return_full: false
     };
 
     if (obj !== undefined) {
@@ -56,10 +56,8 @@ module.exports = function (obj) {
             if (e) {
                 return callback(e, res);
             } else {
-                res = 'Saved to ' + saveTo + '!';
+                return callback(err, 'Saved to ' + saveTo + '!');
             }
-
-            return callback(err, res);
         });
     };
 
@@ -91,16 +89,11 @@ module.exports = function (obj) {
         }
 
         request(options, function (err, req, body) {
-            if (!err && body.error && body.code == 401 && body.message == 'API key missing or invalid!') {
-                console.error('The API key provided was not valid!');
-            }
-
-            if (!err && body && body.code == 429 && !settings.force_run) {
-                // Exceeded API request limit, we must stop now
-                throw new Error(body.message);
+            if (body.error) {
+                return callback(new Error(body.message))
             }
 
-            return callback(err, body);
+            return callback(err, (settings.return_full ? body : body.data));
         });
     };
 

tests/admin.js

@@ -19,7 +19,8 @@
 'use strict';
 
 var atlauncher = require('../index')({
-        api_key: process.env.API_KEY
+        api_key: process.env.API_KEY,
+        return_full: true
     }),
     assert = require('assert');
 

tests/psp.js

@@ -19,7 +19,8 @@
 'use strict';
 
 var atlauncher = require('../index')({
-        api_key: process.env.PSP_API_KEY
+        api_key: process.env.PSP_API_KEY,
+        return_full: true
     }),
     assert = require('assert');
 

tests/public.js

@@ -19,7 +19,8 @@
 'use strict';
 
 var atlauncher = require('../index')({
-        api_key: process.env.API_KEY
+        api_key: process.env.API_KEY,
+        return_full: true
     }),
     assert = require('assert');