Comparing version 0.9.1 to 0.9.2
@@ -6,3 +6,4 @@ /*jslint node: true */ | ||
request = require('request'), | ||
moment = require('moment'); | ||
moment = require('moment'), | ||
Buffer = require('buffer').Buffer; | ||
@@ -66,3 +67,7 @@ var exports = module.exports = {}; | ||
else{ | ||
payload.password = auth.password; | ||
var base64BasicCredentials = Buffer.from(payload.userid + ':' + auth.password).toString('base64'); | ||
headers.Authorization = 'Basic ' + base64BasicCredentials; | ||
delete payload.token; | ||
delete payload.password; | ||
delete payload.userid; | ||
// console.error('\nWARNING: ALKS credential authentication is deprecated, please switch to two-factor authentication (alks developer login2fa).\n'); | ||
@@ -83,4 +88,8 @@ callback(); | ||
var endpoint = account.server + '/loginRoles/id/' + accountId + '/' + account.alksRole; | ||
var payload = _.extend({ | ||
account: account.alksAccount, | ||
role: account.alksRole | ||
}, account); | ||
injectAuth(null, headers, auth, options, function(err){ | ||
injectAuth(payload, headers, auth, options, function(err){ | ||
if(err) return callback(err); | ||
@@ -98,10 +107,13 @@ | ||
} | ||
else if(results.statusCode !== 200){ | ||
if(results.statusCode !== 200){ | ||
return callback(new Error(getMessageFromBadResponse(results))); | ||
} | ||
else if(results.body.statusMessage.toLowerCase() !== STATUS_SUCCESS){ | ||
var body = JSON.parse(results.body); | ||
if(body.statusMessage.toLowerCase() !== STATUS_SUCCESS){ | ||
return callback(new Error(results.body.statusMessage)); | ||
} | ||
var maxKeyDuration = Math.min(ALKS_MAX_DURATION, results.body.loginRole.maxKeyDuration); | ||
var maxKeyDuration = Math.min(ALKS_MAX_DURATION, body.loginRole.maxKeyDuration); | ||
var durations = []; | ||
@@ -108,0 +120,0 @@ for(var i=1; i<=maxKeyDuration; i++) durations.push(i); |
{ | ||
"name": "alks-node", | ||
"version": "0.9.1", | ||
"version": "0.9.2", | ||
"description": "Node client for ALKS", | ||
@@ -10,3 +10,3 @@ "main": "lib/alks-api.js", | ||
"engines": { | ||
"node": ">=0.10" | ||
"node": ">=6.0.0" | ||
}, | ||
@@ -13,0 +13,0 @@ "repository": { |
28592
566