Preview of SSO for browser

src/shared/modules/auth/common.js

@@ -30,10 +30,10 @@ export const getInitialisationParameters = () => {
 
 export const checkAndMergeSSOProviders = (
   discoveredSSOProviders,
-  isLocalhostOrigin
+  updateExistingProviders
 ) => {
   if (!discoveredSSOProviders || !discoveredSSOProviders.length) {
-    authLog('Invalid discovered SSO providers')
+    authLog('Invalid discovered SSO providers', 'warn')
     return
   }
 
@@ -48,12 +48,15 @@ export const checkAndMergeSSOProviders = (
   }
 
   discoveredSSOProviders.forEach(provider => {
-    if (!provider) return
+    if (!provider) {
+      authlog(`Found invalid discoved sso provider`)
+      return
+    }
     if (
       !mandatoryKeysForSSOProviders.every(key => provider.hasOwnProperty(key))
     ) {
-      authLog(
-        `Dropping invalid discovered SSO provider with id: "${provider.id}", missing key`
+      authlog(
+        `dropping invalid discovered sso provider with id: "${provider.id}", missing key`
       )
       return
     }
@@ -70,7 +73,7 @@ export const checkAndMergeSSOProviders = (
     if (
       currentSSOProviders.find(crntProvider => crntProvider.id === provider.id)
     ) {
-      if (isLocalhostOrigin) {
+      if (updateExistingProviders) {
         const idx = currentSSOProviders.findIndex(
           crntProvider => crntProvider.id === provider.id
         )
@@ -161,9 +164,17 @@ export const getCredentialsFromAuthResult = (result, idpId) => {
     parsedJWT[principal] || parsedJWT.email || parsedJWT.sub
   authLog(`Credentials assembly with username: ${credsPrincipal}`)
 
+  const configuredTokenType =
+    selectedSSOProvider.config?.['token_type_authentication']
   const tokenTypeAuthentication =
-    selectedSSOProvider.config?.['token_type_authentication'] ||
-    defaultTokenTypeAuthentication
+    configuredTokenType || defaultTokenTypeAuthentication
+
+  if (!configuredTokenType) {
+    authLog(
+      `token_type_authentication not configured, using default token type "${defaultTokenTypeAuthentication}".`
+    )
+  }
+
   authLog(
     `Credentials assembled with token type "${tokenTypeAuthentication}" as password. If connection still does not succeed, make sure neo4j.conf is set up correctly`
   )

src/shared/modules/auth/helpers.js

@@ -3,15 +3,17 @@ import { AUTH_LOGGING_PREFIX, AUTH_STORAGE_LOGS } from './constants'
 import { isAuthLoggingEnabled, isAuthDebuggingEnabled } from './settings'
 import { saveAs } from 'file-saver'
 
+const MAX_LOG_LINES = 200
 export const authLog = (msg, type = 'log') => {
   if (!isAuthLoggingEnabled) return
   if (!['log', 'error', 'warn'].includes(type)) return
-  const log = `${AUTH_LOGGING_PREFIX} [${new Date().toISOString()}] ${msg}`
+  const messageNoNewlines = msg.replace('\n', ' ')
+  const log = `${AUTH_LOGGING_PREFIX} [${new Date().toISOString()}] ${messageNoNewlines}`
   const logs = sessionStorage.getItem(AUTH_STORAGE_LOGS) || ''
   const logsLines = logs.split('\n')
 
   const truncatedOldLogs =
-    logsLines.length > 200 ? logsLines.slice(-199).join('\n') : logs
+    logsLines.length > MAX_LOG_LINES ? logsLines.slice(-199).join('\n') : logs
 
   sessionStorage.setItem(AUTH_STORAGE_LOGS, `${truncatedOldLogs}${log}\n`)
 }

src/shared/modules/auth/index.js

@@ -29,7 +29,7 @@ import {
 export const authRequestForSSO = idpId => {
   const selectedSSOProvider = getSSOProviderByIdpId(idpId)
   if (!selectedSSOProvider) {
-    const error = `Invalid OAuth2 endpoint: "${oauth2Endpoint}"`
+    const error = `Could not find any SSO provider with idpId: "${idpId}"`
     authLog(error)
     return error
   }