From 70725cf7e16726757eab6a4894cba43341ea3cf7 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Thu, 1 Oct 2015 13:54:02 -0400
Subject: [PATCH 1/2] add security token ui field

---
 awx/ui/client/src/forms/Credentials.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/awx/ui/client/src/forms/Credentials.js b/awx/ui/client/src/forms/Credentials.js
index 3c6f6b6de7..d0fd47cdf9 100644
--- a/awx/ui/client/src/forms/Credentials.js
+++ b/awx/ui/client/src/forms/Credentials.js
@@ -128,6 +128,17 @@ export default
                     //         '</dl>\n'
                     // }]
                 },
+                security_token: {
+                    label: 'Security Token',
+                    type: 'text',
+                    ngShow: "kind.value == 'aws'",
+                    autocomplete: false,
+                    apiField: 'security_token',
+                    awPopOver: "To learn more about AWS IAM sts security tokens, see <a href='http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp.html' target='_blank'>here</a>",
+                    dataTitle: 'Security Token',
+                    dataPlacement: 'right',
+                    dataContainer: "body"
+                },
                 access_key: {
                     label: 'Access Key',
                     type: 'text',

From 6be3b30f521592562a93f6177ba509f1975bd55b Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Thu, 1 Oct 2015 15:49:33 -0400
Subject: [PATCH 2/2] updates to sts token ui

---
 awx/ui/client/src/forms/Credentials.js | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/awx/ui/client/src/forms/Credentials.js b/awx/ui/client/src/forms/Credentials.js
index d0fd47cdf9..c1d385eb87 100644
--- a/awx/ui/client/src/forms/Credentials.js
+++ b/awx/ui/client/src/forms/Credentials.js
@@ -128,17 +128,6 @@ export default
                     //         '</dl>\n'
                     // }]
                 },
-                security_token: {
-                    label: 'Security Token',
-                    type: 'text',
-                    ngShow: "kind.value == 'aws'",
-                    autocomplete: false,
-                    apiField: 'security_token',
-                    awPopOver: "To learn more about AWS IAM sts security tokens, see <a href='http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp.html' target='_blank'>here</a>",
-                    dataTitle: 'Security Token',
-                    dataPlacement: 'right',
-                    dataContainer: "body"
-                },
                 access_key: {
                     label: 'Access Key',
                     type: 'text',
@@ -164,6 +153,18 @@ export default
                     hasShowInputButton: true,
                     apiField: 'passwowrd'
                 },
+                security_token: {
+                    label: 'STS Token',
+                    type: 'sensitive',
+                    ngShow: "kind.value == 'aws'",
+                    autocomplete: false,
+                    apiField: 'security_token',
+                    awPopOver: "<div>Security Token Service (STS) is a web service that enables you to request temporary, limited-privilege credentials for AWS Identity and Access Management (IAM) users.</div><div style='padding-top: 10px'>To learn more about the IAM STS Token, refer to the <a href='http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp.html' target='_blank'>Amazon documentation</a>.</div>",
+                    hasShowInputButton: true,
+                    dataTitle: 'STS Token',
+                    dataPlacement: 'right',
+                    dataContainer: "body"
+                },
                 "host": {
                     labelBind: 'hostLabel',
                     type: 'text',