From b051b109e58315e2c9558cac9bca4003907a469e Mon Sep 17 00:00:00 2001
From: Erik Michelson <github@erik.michelson.eu>
Date: Thu, 4 Jun 2020 23:38:21 +0200
Subject: [PATCH] Show login-buttons and boxes only if providers are configured
 (#122)

* Hide "Sign-in via ..." box if no provider is enabled

* Show sign-in buttons only if auth-providers exist

* Rebase fixes

* Replaced ternary operators with ShowIf

* Added ShowIf on two other code positions
---
 .../layout/navigation/sign-in-button.tsx      | 23 +++---
 .../intro/cover-buttons/cover-buttons.tsx     | 12 ++--
 src/components/landing/pages/login/login.tsx  | 70 ++++++++++---------
 3 files changed, 58 insertions(+), 47 deletions(-)

diff --git a/src/components/landing/layout/navigation/sign-in-button.tsx b/src/components/landing/layout/navigation/sign-in-button.tsx
index d808142ed..cdf189350 100644
--- a/src/components/landing/layout/navigation/sign-in-button.tsx
+++ b/src/components/landing/layout/navigation/sign-in-button.tsx
@@ -2,7 +2,10 @@ import React from 'react'
 import { Button } from 'react-bootstrap'
 import { ButtonProps } from 'react-bootstrap/Button'
 import { Trans, useTranslation } from 'react-i18next'
+import { useSelector } from 'react-redux'
 import { LinkContainer } from 'react-router-bootstrap'
+import { ApplicationState } from '../../../../redux'
+import { ShowIf } from '../../../common/show-if'
 
 type SignInButtonProps = {
   className?: string
@@ -10,15 +13,17 @@ type SignInButtonProps = {
 
 export const SignInButton: React.FC<SignInButtonProps> = ({ variant, ...props }) => {
   const { t } = useTranslation()
-
+  const authProviders = useSelector((state: ApplicationState) => state.backendConfig.authProviders)
   return (
-    <LinkContainer to="/login" title={t('login.signIn')}>
-      <Button
-        variant={variant || 'success'}
-        {...props}
-      >
-        <Trans i18nKey="login.signIn"/>
-      </Button>
-    </LinkContainer>
+    <ShowIf condition={Object.values(authProviders).includes(true)}>
+      <LinkContainer to="/login" title={t('login.signIn')}>
+        <Button
+          variant={variant || 'success'}
+          {...props}
+        >
+          <Trans i18nKey="login.signIn"/>
+        </Button>
+      </LinkContainer>
+    </ShowIf>
   )
 }
diff --git a/src/components/landing/pages/intro/cover-buttons/cover-buttons.tsx b/src/components/landing/pages/intro/cover-buttons/cover-buttons.tsx
index 483f89ef8..59470444d 100644
--- a/src/components/landing/pages/intro/cover-buttons/cover-buttons.tsx
+++ b/src/components/landing/pages/intro/cover-buttons/cover-buttons.tsx
@@ -4,12 +4,14 @@ import { Trans, useTranslation } from 'react-i18next'
 import { useSelector } from 'react-redux'
 import { Link } from 'react-router-dom'
 import { ApplicationState } from '../../../../../redux'
+import { ShowIf } from '../../../../common/show-if'
 import { SignInButton } from '../../../layout/navigation/sign-in-button'
 import './cover-buttons.scss'
 
 export const CoverButtons: React.FC = () => {
   useTranslation()
   const user = useSelector((state: ApplicationState) => state.user)
+  const authProviders = useSelector((state: ApplicationState) => state.backendConfig.authProviders)
 
   if (user) {
     return null
@@ -22,11 +24,11 @@ export const CoverButtons: React.FC = () => {
         variant="success"
         size="lg"
       />
-
-      <span className="m-2">
-        <Trans i18nKey="common.or"/>
-      </span>
-
+      <ShowIf condition={Object.values(authProviders).includes(true)}>
+        <span className="m-2">
+          <Trans i18nKey="common.or"/>
+        </span>
+      </ShowIf>
       <Link to="/features">
         <Button
           className="cover-button"
diff --git a/src/components/landing/pages/login/login.tsx b/src/components/landing/pages/login/login.tsx
index fbe2ccad8..046c791be 100644
--- a/src/components/landing/pages/login/login.tsx
+++ b/src/components/landing/pages/login/login.tsx
@@ -4,6 +4,7 @@ import { Trans, useTranslation } from 'react-i18next'
 import { useSelector } from 'react-redux'
 import { Redirect } from 'react-router'
 import { ApplicationState } from '../../../../redux'
+import { ShowIf } from '../../../common/show-if'
 import { ViaEMail } from './auth/via-email'
 import { ViaLdap } from './auth/via-ldap'
 import { OneClickType, ViaOneClick } from './auth/via-one-click'
@@ -18,6 +19,9 @@ export const Login: React.FC = () => {
   const ldapForm = authProviders.ldap ? <ViaLdap/> : null
   const openIdForm = authProviders.openid ? <ViaOpenId/> : null
 
+  const oneClickProviders = [authProviders.dropbox, authProviders.facebook, authProviders.github, authProviders.gitlab,
+    authProviders.google, authProviders.oauth2, authProviders.saml, authProviders.twitter]
+
   const oneClickCustomName: (type: OneClickType) => string | undefined = (type) => {
     switch (type) {
       case OneClickType.SAML:
@@ -39,39 +43,39 @@ export const Login: React.FC = () => {
   return (
     <div className="my-3">
       <Row className="h-100 flex justify-content-center">
-        {
-          authProviders.email || authProviders.ldap || authProviders.openid
-            ? <Col xs={12} sm={10} lg={4}>
-              {emailForm}
-              {ldapForm}
-              {openIdForm}
-            </Col>
-            : null
-        }
-        <Col xs={12} sm={10} lg={4}>
-          <Card className="bg-dark mb-4">
-            <Card.Body>
-              <Card.Title>
-                <Trans i18nKey="login.signInVia" values={{ service: '' }}/>
-              </Card.Title>
-              {
-                Object.values(OneClickType)
-                  .filter((value) => authProviders[value])
-                  .map((value) => (
-                    <div
-                      className="p-2 d-flex flex-column social-button-container"
-                      key={value}
-                    >
-                      <ViaOneClick
-                        oneClickType={value}
-                        optionalName={oneClickCustomName(value)}
-                      />
-                    </div>
-                  ))
-              }
-            </Card.Body>
-          </Card>
-        </Col>
+        <ShowIf condition={authProviders.email || authProviders.ldap || authProviders.openid}>
+          <Col xs={12} sm={10} lg={4}>
+            {emailForm}
+            {ldapForm}
+            {openIdForm}
+          </Col>
+        </ShowIf>
+        <ShowIf condition={oneClickProviders.includes(true)}>
+          <Col xs={12} sm={10} lg={4}>
+            <Card className="bg-dark mb-4">
+              <Card.Body>
+                <Card.Title>
+                  <Trans i18nKey="login.signInVia" values={{ service: '' }}/>
+                </Card.Title>
+                {
+                  Object.values(OneClickType)
+                    .filter((value) => authProviders[value])
+                    .map((value) => (
+                      <div
+                        className="p-2 d-flex flex-column social-button-container"
+                        key={value}
+                      >
+                        <ViaOneClick
+                          oneClickType={value}
+                          optionalName={oneClickCustomName(value)}
+                        />
+                      </div>
+                    ))
+                }
+              </Card.Body>
+            </Card>
+          </Col>
+        </ShowIf>
       </Row>
     </div>
   )