Merge branch 'develop' into feature/linksRender

Author: BennuFire

docs/modules/ROOT/pages/developer-guide/configuration.adoc

@@ -16,6 +16,7 @@ will look like this:
 ....
 {
     "ssoEnabled": false,
+    "ssoProviders": [],
     "ssoDiscoveryUrl": "https://example.com",
     "standalone": false,
     "standaloneProtocol": "neo4j",
@@ -37,6 +38,8 @@ will look like this:
 using SSO. This requires the app to be running in standalone mode, and a
 valid ssoDiscoveryUrl to be set.
 
+|ssoProviders |List |[] |When using multiple SSO providers on the database, you can configure the list of providers (by id) to be used on Neodash. If empty, all providers will be displayed.
+
 |ssoDiscoveryUrl |string |https://example.com |If ssoEnabled is true &
 standalone mode is enabled, the URL to retrieve SSO auth config from.
 

docs/modules/ROOT/pages/developer-guide/standalone-mode.adoc

@@ -39,6 +39,7 @@ variables to Docker:
 ....
 docker run  -it --rm -p 5005:5005 \
     -e ssoEnabled=false \
+    -e ssoProviders=[] \
     -e ssoDiscoveryUrl="https://example.com" \
     -e standalone=true \
     -e standaloneProtocol="neo4j" \

docs/modules/ROOT/pages/developer-guide/state-management.adoc

@@ -127,6 +127,7 @@ standalone mode.
     "standalone": false,
     "oldDashboard": null,
     "ssoEnabled": false,
+    "ssoProviders": [],
     "ssoDiscoveryUrl": "https://example.com",
     "standaloneProtocol": "neo4j",
     "standaloneHost": "localhost",

public/config.json

@@ -1,5 +1,6 @@
 {
   "ssoEnabled": false,
+  "ssoProviders": [],
   "ssoDiscoveryUrl": "https://example.com",
   "standalone": false,
   "standaloneProtocol": "neo4j",

scripts/config-entrypoint.sh

@@ -5,6 +5,7 @@ set -e
 echo " \
     { \
     \"ssoEnabled\": ${ssoEnabled:=false}, \
+    \"ssoProviders\": ${ssoProviders:=[]}, \
     \"ssoDiscoveryUrl\": \"${ssoDiscoveryUrl:='https://example.com'}\",  \
     \"standalone\": "${standalone:=false}", \
     \"standaloneProtocol\": \"${standaloneProtocol:='neo4j+s'}\", \

src/application/ApplicationActions.ts

@@ -178,6 +178,12 @@ export const setSSOEnabled = (enabled: boolean, discoveryUrl: string) => ({
   payload: { enabled, discoveryUrl },
 });
 
+export const SET_SSO_PROVIDERS = 'APPLICATION/SET_SSO_PROVIDERS';
+export const setSSOProviders = (providers: []) => ({
+  type: SET_SSO_PROVIDERS,
+  payload: { providers },
+});
+
 export const SET_WAIT_FOR_SSO = 'APPLICATION/SET_WAIT_FOR_SSO';
 export const setWaitForSSO = (wait: boolean) => ({
   type: SET_WAIT_FOR_SSO,

src/application/ApplicationReducer.ts

@@ -21,6 +21,7 @@ import {
   SET_SESSION_PARAMETERS,
   SET_SHARE_DETAILS_FROM_URL,
   SET_SSO_ENABLED,
+  SET_SSO_PROVIDERS,
   SET_STANDALONE_DASHBOARD_DATEBASE,
   SET_STANDALONE_ENABLED,
   SET_STANDALONE_MODE,
@@ -112,6 +113,11 @@ export const applicationReducer = (state = initialState, action: { type: any; pa
       state = update(state, { ssoEnabled: enabled, ssoDiscoveryUrl: discoveryUrl });
       return state;
     }
+    case SET_SSO_PROVIDERS: {
+      const { providers } = payload;
+      state = update(state, { ssoProviders: providers });
+      return state;
+    }
     case SET_WAIT_FOR_SSO: {
       const { wait } = payload;
       state = update(state, { waitForSSO: wait });

src/application/ApplicationSelectors.ts

@@ -64,6 +64,7 @@ export const applicationHasReportHelpModalOpen = (state: any) => {
 export const applicationGetSsoSettings = (state: any) => {
   return {
     ssoEnabled: state.application.ssoEnabled,
+    ssoProviders: state.application.ssoProviders,
     ssoDiscoveryUrl: state.application.ssoDiscoveryUrl,
     cachedSSODiscoveryUrl: state.application.cachedSSODiscoveryUrl,
   };

src/application/ApplicationThunks.ts

@@ -30,6 +30,7 @@ import {
   clearDesktopConnectionProperties,
   clearNotification,
   setSSOEnabled,
+  setSSOProviders,
   setStandaloneEnabled,
   setAboutModalOpen,
   setStandaloneMode,
@@ -340,6 +341,7 @@ export const onConfirmLoadSharedDashboardThunk = () => (dispatch: any, getState:
 export const loadApplicationConfigThunk = () => async (dispatch: any, getState: any) => {
   let config = {
     ssoEnabled: false,
+    ssoProviders: [],
     ssoDiscoveryUrl: 'http://example.com',
     standalone: false,
     standaloneProtocol: 'neo4j',
@@ -377,6 +379,7 @@ export const loadApplicationConfigThunk = () => async (dispatch: any, getState:
     }
     const state = getState();
     dispatch(setSSOEnabled(config.ssoEnabled, state.application.cachedSSODiscoveryUrl));
+    dispatch(setSSOProviders(config.ssoProviders));
 
     const { standalone } = config;
     dispatch(

src/component/sso/SSOLoginButton.tsx

@@ -4,14 +4,20 @@ import { getDiscoveryDataInfo } from './SSOUtils';
 import { ShieldCheckIconOutline } from '@neo4j-ndl/react/icons';
 import { Button, IconButton } from '@neo4j-ndl/react';
 
-export const SSOLoginButton = ({ discoveryAPIUrl, hostname, port, onSSOAttempt, onClick }) => {
+export const SSOLoginButton = ({ discoveryAPIUrl, hostname, port, onSSOAttempt, onClick, providers }) => {
   const [savedSSOProviders, setSSOProviders] = useState([]);
   const [discoveryUrlValidated, setDiscoveryUrlValidated] = useState(undefined);
+
+  const filterByProvidersList = (discoveredProviders, validProviders) => {
+    return validProviders == null || validProviders.length == 0
+      ? discoveredProviders
+      : discoveredProviders.filter((p) => validProviders.includes(p.id));
+  };
   const attemptManualSSOProviderRetrieval = () => {
     // Do an extra check to see if the hostname provides some SSO provider configuration.
     getDiscoveryDataInfo(`https://${hostname}:${port}`)
       .then((mergedSSOProviders) => {
-        setSSOProviders(mergedSSOProviders);
+        setSSOProviders(filterByProvidersList(mergedSSOProviders, providers));
         if (mergedSSOProviders.length == 0) {
           setDiscoveryUrlValidated(undefined);
         } else {
@@ -26,7 +32,7 @@ export const SSOLoginButton = ({ discoveryAPIUrl, hostname, port, onSSOAttempt,
     // First, try to get the SSO discovery URL from the config.json configuration file and see if it contains anything.
     getDiscoveryDataInfo(discoveryAPIUrl)
       .then((mergedSSOProviders) => {
-        setSSOProviders(mergedSSOProviders);
+        setSSOProviders(filterByProvidersList(mergedSSOProviders, providers));
         if (mergedSSOProviders.length == 0) {
           attemptManualSSOProviderRetrieval();
         } else {