Merge pull request #128 from Cox-Automotive/develop

Merge develop to master
Cox-Automotive · Dec 20, 2019 · 8f0a888 · 8f0a888
2 parents 17eae71 + 8f96195
commit 8f0a888
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 19 deletions.
diff --git a/bin/alks-developer-login2fa b/bin/alks-developer-login2fa
@@ -23,7 +23,7 @@ var logger = 'dev-login-2fa';
 utils.log(program, logger, 'loading developer');
 Developer.getDeveloper(function(err, data){
     console.error('Opening ALKS 2FA Page.. Be sure to login using Okta..');
-    opn(data.server.replace(/rest/, 'login/getToken.htm'));
+    opn(data.server.replace(/rest/, 'token-management'));
     console.error('Please copy your refresh token from ALKS and paste below..');
 
     Developer.getPasswordFromPrompt(function(err, refreshToken){

diff --git a/bin/alks-developer-logout2fa b/bin/alks-developer-logout2fa
@@ -22,9 +22,9 @@ if(Developer.removeToken()){
     console.error(clc.white('Token removed!'));
 }
 else{
-    console.error(clc.red.bold('Error removing toking!'));
+    console.error(clc.red.bold('Error removing token!'));
 }
 
 utils.log(program, logger, 'checking for updates');
 utils.checkForUpdate();
-Developer.trackActivity(logger);
+Developer.trackActivity(logger);
diff --git a/bin/alks-sessions-console b/bin/alks-sessions-console
@@ -18,6 +18,7 @@ var outputValues = utils.getOutputValues();
 program
     .version(config.version)
     .description('open an AWS console in your browser')
+    .option('-u, --url', 'just print the url')
     .option('-o, --openWith [appName]', 'open in a different app (optional)')
     .option('-a, --account [alksAccount]', 'alks account to use')
     .option('-r, --role [alksRole]', 'alks role to use')
@@ -62,14 +63,18 @@ var onComplete = function(err, key){
             utils.errorAndExit(err);
         }
 
-        var opts = !_.isEmpty(program.openWith) ? { app: program.openWith } : {};
-        opn(url, opts);
+        if (program.url) {
+            console.log(url);
+        } else {
+            var opts = !_.isEmpty(program.openWith) ? { app: program.openWith } : {};
+            opn(url, opts);
 
-        utils.log(program, logger, 'checking for updates');
-        utils.checkForUpdate(function(){
-            Developer.trackActivity(logger);
-            setTimeout(function(){ process.exit(0); }, 3000); // needed for if browser is still open
-        });
+            utils.log(program, logger, 'checking for updates');
+            utils.checkForUpdate(function(){
+                Developer.trackActivity(logger);
+                setTimeout(function(){ process.exit(0); }, 3000); // needed for if browser is still open
+            });
+        }
     });
 };
 
@@ -84,4 +89,4 @@ if(useDefaultAcct){
 }
 else{
     execute();
-}
+}
diff --git a/changelog.txt b/changelog.txt
@@ -1,9 +1,11 @@
-★ Release Notes: 2019-03-29 ★
+★ Release Notes: 2019-12-19 ★
 ≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡≡
 
 Thanks for upgrading to the latest version of the ALKS CLI!
 
-→ Adds support for per-role max session durations coming soon to ALKS
+→ Updates the ALKS refresh token URL (developer login2fa)
+→ Adds support for exporting the AWS Console URL (session console -u)
+→ Fixes a bug with netrc on Linux
 
 → Have feedback? https://github.com/Cox-Automotive/ALKS-CLI/issues
 

diff --git a/lib/developer.js b/lib/developer.js
@@ -186,7 +186,7 @@ exports.storeToken = function(token, callback){
     }
     else{
         netrc.update(SERVICETKN, {
-            token: token
+            password: token
         });
 
         chmod(utils.getFilePathInHome('.netrc'), utils.getOwnerRWOnlyPermission());
@@ -223,8 +223,8 @@ exports.getToken = function(cb){
     }
     else{
         var auth = netrc(SERVICETKN);
-        if(!_.isEmpty(auth.token)){
-            cb(auth.token);
+        if(!_.isEmpty(auth.password)){
+            cb(auth.password);
         }
         else{
             cb(null);
@@ -544,4 +544,4 @@ exports.trackActivity = function(activity){
     else{
         onComplete();
     }
-};
+};
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "alks",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "description": "CLI for working with ALKS",
   "main": "bin/alks",
   "scripts": {
@@ -41,7 +41,7 @@
     "chmod": "^0.2.1",
     "cli-color": "^1.1.0",
     "cli-table3": "^0.5.0",
-    "clortho": "https://github.com/Cox-Automotive/clortho/archive/1.2.3.tar.gz",
+    "clortho": "Cox-Automotive/clortho#1.2.3",
     "commander": "^2.9.0",
     "crypto": "0.0.3",
     "fuzzy": "^0.1.1",