shuttlerockapi - npm Package Compare versions

Comparing version 1.1.0 to 1.1.1

dist/index.js

@@ -35,2 +35,5 @@ 'use strict';
  * @param settings.accountName
+ * @param settings.email account email if no token supplied
+ * @param settings.password account password if no token supplied
+ * @param settings.token
  * @return {Promise}
@@ -43,4 +46,5 @@ */
 
-  if (!settings.accountName || !settings.email || !settings.password) {
-    return _bluebird2['default'].reject(new Error('You are missing some required settings!\n      Please enter accountName, email and password'));
+  var noEmailPassword = !settings.email || !settings.password;
+  if (!settings.accountName || !settings.token && noEmailPassword) {
+    return _bluebird2['default'].reject(new Error('You are missing some required settings!\n      Please enter accountName, and either an email and password, or an api token'));
   }
@@ -50,2 +54,9 @@
 
+  if (noEmailPassword) {
+    srSettings.token = settings.token;
+    srSettings.tokenHeader = getTokenHeader(settings.token);
+
+    return _bluebird2['default'].resolve(srSettings);
+  }
+
   return (0, _servicesCommandsPost2['default'])('/v2/token', {
@@ -56,9 +67,14 @@ email: settings.email,
     srSettings.token = res.token;
-    srSettings.tokenHeader = 'token ' + res.token;
+    srSettings.tokenHeader = getTokenHeader(res.token);
     srSettings.restricted = res.restrict_api_access;
+    return srSettings;
   });
 };
 
+var getTokenHeader = function getTokenHeader(token) {
+  return 'token ' + token;
+};
+
 exports.init = init;
 exports.entries = entries;
 exports.boards = boards;

lib/index.js

@@ -11,2 +11,5 @@ import * as entries from './entries/'
  * @param settings.accountName
+ * @param settings.email account email if no token supplied
+ * @param settings.password account password if no token supplied
+ * @param settings.token
  * @return {Promise}
@@ -19,5 +22,6 @@ */
 
-  if (!settings.accountName || !settings.email || !settings.password) {
+  let noEmailPassword = (!settings.email || !settings.password)
+  if (!settings.accountName || (!settings.token && noEmailPassword)) {
     return Promise.reject(new Error(`You are missing some required settings!
-      Please enter accountName, email and password`))
+      Please enter accountName, and either an email and password, or an api token`))
   }
@@ -27,2 +31,9 @@
 
+  if (noEmailPassword) {
+    srSettings.token = settings.token
+    srSettings.tokenHeader = getTokenHeader(settings.token)
+
+    return Promise.resolve(srSettings)
+  }
+
   return post('/v2/token', {
@@ -34,7 +45,10 @@ email: settings.email,
       srSettings.token = res.token
-      srSettings.tokenHeader = `token ${res.token}`
+      srSettings.tokenHeader = getTokenHeader(res.token)
       srSettings.restricted = res.restrict_api_access
+      return srSettings
     })
 }
 
+const getTokenHeader = token => `token ${token}`
+
 export {
@@ -41,0 +55,0 @@ init,

package.json

 {
   "name": "shuttlerockapi",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "A wrapper for the shuttlerock api",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

No alert changes

Improved metrics

Total package byte prevSize

13718

increased by8.13%

Lines of code

356

increased by7.23%

No dependency changes