Merge pull request #156 from Cox-Automotive/develop

webbbarker · web-flow · commit b013fe1bd5fd · 2020-06-22T10:57:43.000-04:00
Merge develop to master
diff --git a/changelog.txt b/changelog.txt
@@ -1,9 +1,9 @@
-★ Release Notes: 2020-06-17 ★
+★ Release Notes: 2020-06-22 ★
 ≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡
 
 Thanks for upgrading to the latest version of the ALKS CLI!
 
-→ [BUGFIX] Corrects an issue where the ALKS sessions command would return expired keys
+→ [BUGFIX] Corrects an issue where IAM Keys would fail to generate
 
 → Have feedback? https://github.com/Cox-Automotive/ALKS-CLI/issues
 
diff --git a/lib/iam.js b/lib/iam.js
@@ -87,7 +87,7 @@ exports.getIAMKey = function(program, logger, alksAccount, alksRole, forceNewSes
                     if(!err){
                         utils.log(program, logger, 'storing key: ' + JSON.stringify(key));
                         keys.addKey(key.accessKey, key.secretKey, key.sessionToken,
-                                    key.alksAccount, key.alksRole, key.expires.toDate(), auth, true);
+                                    key.alksAccount, key.alksRole, key.expires, auth, true);
                     }
                     else if(err.message.indexOf('please check API URL') !== -1){
                         err = new Error(utils.getBadAccountMessage());
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "alks",
-  "version": "3.0.9",
+  "version": "3.0.10",
   "description": "CLI for working with ALKS",
   "main": "bin/alks",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ exports.getIAMKey = function(program, logger, alksAccount, alksRole, forceNewSes`
`87`	`87`	`if(!err){`
`88`	`88`	`utils.log(program, logger, 'storing key: ' + JSON.stringify(key));`
`89`	`89`	`keys.addKey(key.accessKey, key.secretKey, key.sessionToken,`
`90`		`- key.alksAccount, key.alksRole, key.expires.toDate(), auth, true);`
	`90`	`+ key.alksAccount, key.alksRole, key.expires, auth, true);`
`91`	`91`	`}`
`92`	`92`	`else if(err.message.indexOf('please check API URL') !== -1){`
`93`	`93`	`err = new Error(utils.getBadAccountMessage());`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "alks",`
`3`		`- "version": "3.0.9",`
	`3`	`+ "version": "3.0.10",`
`4`	`4`	`"description": "CLI for working with ALKS",`
`5`	`5`	`"main": "bin/alks",`
`6`	`6`	`"scripts": {`