Move credential rendering to server

2 files changed, 13 insertions, 32 deletions

diff --git a/templates/assets/site.js b/templates/assets/site.js
index 485a4cd..ebf9f5f 100644
--- a/templates/assets/site.js
+++ b/templates/assets/site.js
@@ -29,9 +29,7 @@ function accountTableLinkClick(event) {
     event.preventDefault();
 
     var thisRow = event.target.parentElement.parentElement;
-    var template = event.target.getAttribute("data-template");
-    var account = thisRow.getAttribute("data-account-name");
-    var credentialEndpoint = thisRow.getAttribute("data-global-credential-endpoint");
+    var account = thisRow.dataset["accountName"];
     var oldText = event.target.text;
 
     var existingTr = document.getElementById("credentials-for-" + account);
@@ -41,12 +39,14 @@ function accountTableLinkClick(event) {
 
     event.target.text = "Loading...";
 
-    fetch(credentialEndpoint).then(getJSON).then(function(vals) {
-        vals["ShortName"] = account;
-
+    fetch(thisRow.dataset["globalCredentialEndpoint"], {
+        "headers": {
+            "Accept": event.target.dataset["contentType"]
+        }
+    }).then(r => r.text()).then(function(text) {
         var newTr = fillTemplate("credential_row_template", {
             "Account": account,
-            "Content": fillTemplate(template, vals)
+            "Content": text,
         });
 
         event.target.text = oldText;
@@ -69,8 +69,8 @@ function populateAccountRow(row) {
     var out = fillTemplate("account_row_template", row);
     document.querySelector("#account-table tr").insertAdjacentHTML("afterend", out);
 
-    document.querySelectorAll("#account-row-" + row["short_name"] + " a[data-template]").forEach(function(element) {
-        element.addEventListener("click", accountTableLinkClick);
+    document.querySelectorAll(".account-row a[data-content-type]").forEach(function(e) {
+        e.addEventListener("click", accountTableLinkClick);
     });
 }
 
diff --git a/templates/index.tpl b/templates/index.tpl
index da0b59e..c8c95d4 100644
--- a/templates/index.tpl
+++ b/templates/index.tpl
@@ -4,25 +4,6 @@
         <title>Select Account</title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
         <link rel="stylesheet" type="text/css" href="/assets/site.css" />
-        <script id="shell_template" type="text/template">
-            export AWS_CREDS_EXPIRATION="[[ .expiration ]]"
-            export AWS_ACCESS_KEY_ID="[[ .access_key ]]"
-            export AWS_SECRET_ACCESS_KEY="[[ .secret_key ]]"
-            export AWS_SESSION_TOKEN="[[ .session_token ]]"
-        </script>
-        <script id="powershell_template" type="text/template">
-            Set-Item -path env:AWS_CREDS_EXPIRATION -value '[[ .expiration ]]'
-            Set-Item -path env:AWS_ACCESS_KEY_ID -value '[[ .access_key ]]'
-            Set-Item -path env:AWS_SECRET_ACCESS_KEY -value '[[ .secret_key ]]'
-            Set-Item -path env:AWS_SESSION_TOKEN -value '[[ .session_token ]]'
-        </script>
-        <script id="aws_config_template" type="text/template">
-            [profile [[ .ShortName ]]]
-            aws_access_key_id=[[ .access_key ]]
-            aws_secret_access_key=[[ .secret_key ]]
-            aws_session_token=[[ .session_token ]]
-            expiration=[[ .expiration ]]
-        </script>
         <script id="credential_row_template" type="text/template">
             <tr id="credentials-for-[[ .Account ]]">
                 <td colspan="3">
@@ -32,14 +13,14 @@
             </tr>
         </script>
         <script id="account_row_template" type="text/template">
-            <tr id="account-row-[[ .short_name ]]" data-account-name="[[ .short_name ]]" data-global-credential-endpoint="[[ .global_credential_url ]]">
+            <tr id="account-row-[[ .short_name ]]" class="account-row" data-account-name="[[ .short_name ]]" data-global-credential-endpoint="[[ .global_credential_url ]]">
                 <td>[[ .name ]]</td>
                 <td>[[ .vendor ]]</td>
                 <td>
                     <a href="[[ .console_redirect_url ]]">Console</a> |
-                    <a data-template="aws_config_template" href="#/cli/[[ .short_name ]]">AWS CLI</a> |
-                    <a data-template="shell_template" href="#/sh/[[ .short_name ]]">Bash</a> |
-                    <a data-template="powershell_template" href="#/ps/[[ .short_name ]]">Powershell</a>
+                    <a data-content-type="application/vnd.broker.v2.credential.aws.ini" href="#/cli/[[ .short_name ]]">AWS CLI</a> |
+                    <a data-content-type="application/vnd.broker.v2.credential.aws.sh" href="#/sh/[[ .short_name ]]">Bash</a> |
+                    <a data-content-type="application/vnd.broker.v2.credential.aws.psl" href="#/ps/[[ .short_name ]]">Powershell</a>
                     <span class="admin">| <a>Edit</a></span>
                 </td>
             </tr>