From 44d223b6c96fe2f9269b123ea97b6fe878e4fb14 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Tue, 23 Jan 2018 14:07:10 -0500
Subject: [PATCH] add fields for team and organization saml attribute mappings

---
 awx/sso/conf.py                                 |  2 +-
 .../auth-form/sub-forms/auth-saml.form.js       | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/awx/sso/conf.py b/awx/sso/conf.py
index 2fdf412d82..d57223d9ef 100644
--- a/awx/sso/conf.py
+++ b/awx/sso/conf.py
@@ -1185,7 +1185,7 @@ register(
     field_class=fields.SAMLTeamAttrField,
     allow_null=True,
     default=None,
-    label=_('SAML Team Map'),
+    label=_('SAML Team Attribute Mapping'),
     help_text=_('Used to translate user team membership into Tower.'),
     category=_('SAML'),
     category_slug='saml',
diff --git a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-saml.form.js b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-saml.form.js
index c7c8cc289d..0a6903190b 100644
--- a/awx/ui/client/src/configuration/auth-form/sub-forms/auth-saml.form.js
+++ b/awx/ui/client/src/configuration/auth-form/sub-forms/auth-saml.form.js
@@ -71,15 +71,28 @@ export default ['i18n', function(i18n) {
                 codeMirror: true,
                 class: 'Form-textAreaLabel Form-formGroup--fullWidth'
             },
+            SOCIAL_AUTH_SAML_ORGANIZATION_ATTR: {
+                type: 'textarea',
+                reset: 'SOCIAL_AUTH_SAML_ORGANIZATION_ATTR',
+                rows: 6,
+                codeMirror: true,
+                class: 'Form-textAreaLabel Form-formGroup--fullWidth'
+            },
             SOCIAL_AUTH_SAML_TEAM_MAP: {
                 type: 'textarea',
                 reset: 'SOCIAL_AUTH_SAML_TEAM_MAP',
                 rows: 6,
                 codeMirror: true,
                 class: 'Form-textAreaLabel Form-formGroup--fullWidth'
-            }
+            },
+            SOCIAL_AUTH_SAML_TEAM_ATTR: {
+                type: 'textarea',
+                reset: 'SOCIAL_AUTH_SAML_TEAM_ATTR',
+                rows: 6,
+                codeMirror: true,
+                class: 'Form-textAreaLabel Form-formGroup--fullWidth'
+            },
         },
-
         buttons: {
             reset: {
                 ngShow: '!user_is_system_auditor',