From 32ca775b7582ba02c32f59c3064cd894ebb58571 Mon Sep 17 00:00:00 2001 From: Alex Paxton Date: Tue, 7 Nov 2017 23:14:28 -0800 Subject: [PATCH] Render username, provider, and scheme in Purgatory to assist user Signed-off-by: Jared Scheib --- ui/src/auth/Purgatory.js | 22 ++++++++++++++++++++-- ui/src/style/pages/auth-page.scss | 6 +++++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/ui/src/auth/Purgatory.js b/ui/src/auth/Purgatory.js index e2345afca8..14774a9feb 100644 --- a/ui/src/auth/Purgatory.js +++ b/ui/src/auth/Purgatory.js @@ -13,7 +13,7 @@ const viewerCopy = (

) -const Purgatory = ({currentOrganization, role}) => +const Purgatory = ({name, provider, scheme, currentOrganization, role}) =>
@@ -25,6 +25,16 @@ const Purgatory = ({currentOrganization, role}) => {role === MEMBER_ROLE ? memberCopy : viewerCopy}

Contact your Administrator for assistance.

+
+
+            
+              username: {name}
+              
+ provider: {provider} +
+ scheme: {scheme} +
+

@@ -37,6 +47,9 @@ const Purgatory = ({currentOrganization, role}) => const {shape, string} = PropTypes Purgatory.propTypes = { + name: string.isRequired, + provider: string.isRequired, + scheme: string.isRequired, currentOrganization: shape({ id: string.isRequired, name: string.isRequired, @@ -44,7 +57,12 @@ Purgatory.propTypes = { role: string.isRequired, } -const mapStateToProps = ({auth: {me: {currentOrganization, role}}}) => ({ +const mapStateToProps = ({ + auth: {me: {name, provider, scheme, currentOrganization, role}}, +}) => ({ + name, + provider, + scheme, currentOrganization, role, }) diff --git a/ui/src/style/pages/auth-page.scss b/ui/src/style/pages/auth-page.scss index 52634399fb..e34d97f537 100644 --- a/ui/src/style/pages/auth-page.scss +++ b/ui/src/style/pages/auth-page.scss @@ -92,7 +92,7 @@ min-width: 400px; background-color: $g3-castle; border-radius: 4px; - height: 200px; + min-height: 200px; padding: 30px; display: flex; flex-direction: column; @@ -105,4 +105,8 @@ > p { text-align: center; } + + hr { + width: 100%; + } }