From fd9b836edbd339a86285378812645ba1a6968713 Mon Sep 17 00:00:00 2001
From: Christian Flamm <christian.flamm@mercateo.com>
Date: Thu, 22 Feb 2018 13:28:54 +0100
Subject: [PATCH] restructure token fetching for reusability

---
 afpre | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/afpre b/afpre
index 23a62a7..eb98fd7 100755
--- a/afpre
+++ b/afpre
@@ -182,17 +182,21 @@ awsenv() {
 	env | grep -i --color=never aws
 }
 
+fetchport() {
+	echo authenticating as ${NAME} for ${ACCOUNT}/${ROLE} against ${HOST}
+	JSON=\$(basic_auth https://${HOST}${_PATH}/${ACCOUNT}/${ROLE} ${X1XBN02R}) || error_msg "... failed!"
+	export AWS_ACCESS_KEY_ID=\$(json_value "\${JSON}" AccessKeyId)
+	export AWS_SECRET_ACCESS_KEY=\$(json_value "\${JSON}" SecretAccessKey)
+	export AWS_SESSION_TOKEN=\$(json_value "\${JSON}" Token)
+	export AWS_SECURITY_TOKEN=\$(json_value "\${JSON}" Token)
+	export AWS_VALID_SECONDS=\$((\$(secs_since_epoch \$(json_value "\${JSON}" Expiration))-\$(date +%s)))
+	SECONDS=0
+}
+
 PROMPT_COMMAND="{
         ((\\\$SECONDS >= \\\$(token_renew_interval) )) && {
                 echo token expired - need to renew... 
-                echo authenticating as ${NAME} for ${ACCOUNT}/${ROLE} against ${HOST}
-                JSON=\\\$(basic_auth https://${HOST}${_PATH}/${ACCOUNT}/${ROLE} ${X1XBN02R}) || error_msg \"... failed!\"
-                export AWS_ACCESS_KEY_ID=\\\$(json_value \"\\\${JSON}\" AccessKeyId)
-                export AWS_SECRET_ACCESS_KEY=\\\$(json_value \"\\\${JSON}\" SecretAccessKey)
-                export AWS_SESSION_TOKEN=\\\$(json_value \"\\\${JSON}\" Token)
-                export AWS_SECURITY_TOKEN=\\\$(json_value \"\\\${JSON}\" Token)
-                export AWS_VALID_SECONDS=\\\$((\\\$(secs_since_epoch \\\$(json_value \"\\\${JSON}\" Expiration))-\\\$(date +%s)))
-		SECONDS=0
+		fetchport
                 echo done.
         }
 }"