Started streaming 1 records after 5 ms and completed after 10 ms.
diff --git a/src/browser/modules/Stream/CypherFrame/__snapshots__/AsciiView.test.tsx.snap b/src/browser/modules/Stream/CypherFrame/__snapshots__/AsciiView.test.tsx.snap
index 69cbaa7ad8e..ec5111e4766 100644
--- a/src/browser/modules/Stream/CypherFrame/__snapshots__/AsciiView.test.tsx.snap
+++ b/src/browser/modules/Stream/CypherFrame/__snapshots__/AsciiView.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`AsciiViews AsciiStatusbar displays statusBarMessage if no rows 1`] = `
class="sc-jeraig dxzVkG"
>
Completed after 10 ms.
diff --git a/src/browser/modules/Stream/CypherFrame/__snapshots__/CodeView.test.tsx.snap b/src/browser/modules/Stream/CypherFrame/__snapshots__/CodeView.test.tsx.snap
index 02aa51077eb..b0e94bbd504 100644
--- a/src/browser/modules/Stream/CypherFrame/__snapshots__/CodeView.test.tsx.snap
+++ b/src/browser/modules/Stream/CypherFrame/__snapshots__/CodeView.test.tsx.snap
@@ -14,7 +14,7 @@ exports[`CodeViews CodeStatusbar displays statusBarMessage 1`] = `
class="sc-jcFjpl cdUBmZ"
>
Started streaming 1 records after 5 ms and completed after 10 ms.
diff --git a/src/shared/modules/connections/connectionsDuck.ts b/src/shared/modules/connections/connectionsDuck.ts
index 866f7aa9841..be1e8bcc228 100644
--- a/src/shared/modules/connections/connectionsDuck.ts
+++ b/src/shared/modules/connections/connectionsDuck.ts
@@ -101,6 +101,7 @@ export type Connection = {
restApi?: string
SSOError?: string
SSOProviders?: SSOProvider[]
+ attemptSSOLogin?: boolean
}
export const initialState: ConnectionReduxState = {
@@ -352,14 +353,6 @@ export const onLostConnection = (dispatch: any) => (e: any) => {
dispatch({ type: LOST_CONNECTION, error: e })
}
-export const connectionLossFilter = (action: any) => {
- const notLostCodes = [
- 'Neo.ClientError.Security.Unauthorized',
- 'Neo.ClientError.Security.AuthenticationRateLimit'
- ]
- return notLostCodes.indexOf(action.error.code) < 0
-}
-
export const setRetainCredentials = (shouldRetain: any) => {
return {
type: UPDATE_RETAIN_CREDENTIALS,
@@ -408,7 +401,8 @@ export const connectEpic = (action$: any, store: any) =>
try {
await bolt.backgroundWorkerlessRoutedRead(
supportsMultiDb ? 'SHOW DATABASES' : 'call db.indexes()',
- { useDb: supportsMultiDb ? 'SYSTEM' : undefined }
+ { useDb: supportsMultiDb ? 'SYSTEM' : undefined },
+ store
)
} catch (error) {
const e: any = error
@@ -529,6 +523,9 @@ export const startupConnectEpic = (action$: any, store: any) => {
onLostConnection(store.dispatch)
)
store.dispatch(setActiveConnection(discovery.CONNECTION_ID))
+ authLog(
+ 'Neo4j Browser successfully connected to Neo4j Server with stored credentials'
+ )
return { type: STARTUP_CONNECTION_SUCCESS }
} catch {}
}
@@ -548,6 +545,12 @@ export const startupConnectEpic = (action$: any, store: any) => {
if (shouldTryAutoconnecting(connUpdatedWithDiscovery)) {
// Try connecting
+
+ if (discovered.attemptSSOLogin) {
+ authLog(
+ 'Attempting to establish SSO connection to Neo4j with assembled credentials.'
+ )
+ }
return new Promise(resolve => {
// Try to connect with stored creds
bolt
@@ -558,12 +561,15 @@ export const startupConnectEpic = (action$: any, store: any) => {
)
.then(() => {
store.dispatch(setActiveConnection(discovery.CONNECTION_ID))
+ if (discovered.attemptSSOLogin) {
+ authLog('SSO Connection to Neo4j successfully established.')
+ }
resolve({ type: STARTUP_CONNECTION_SUCCESS })
})
.catch(() => {
if (discovered.attemptSSOLogin) {
authLog(
- 'client side SSO flow completed but Neo4j Browser failed to connect to neo4j. Server side logs (security.log or debug.log) may contain more information.'
+ 'SSO Connection to Neo4j failed, although the client side SSO flow succeeded. Server side logs (security.log or debug.log) may contain more information.'
)
}
store.dispatch(setActiveConnection(null))
@@ -667,12 +673,12 @@ export const disconnectSuccessEpic = (action$: any, store: any) => {
export const connectionLostEpic = (action$: any, store: any) =>
action$
.ofType(LOST_CONNECTION)
- .filter(connectionLossFilter)
// Only retry in web env and if we're supposed to be connected
.filter(() => inWebEnv(store.getState()) && isConnected(store.getState()))
.throttleTime(5000)
.do(() => store.dispatch(updateConnectionState(PENDING_STATE)))
.mergeMap((action: any) => {
+ authLog('Detected loss of connectitivity, attempting to recover')
return (
Rx.Observable.of(1)
.mergeMap(() => {
@@ -737,6 +743,7 @@ export const connectionLostEpic = (action$: any, store: any) =>
onLostConnection(store.dispatch)
)
.then(() => {
+ authLog('Connection recovered successfully.')
store.dispatch(updateConnectionState(CONNECTED_STATE))
resolve({ type: 'Success' })
})
@@ -745,7 +752,45 @@ export const connectionLostEpic = (action$: any, store: any) =>
.catch(e => {
// Don't retry if auth failed
if (e.code === UnauthorizedDriverError) {
- resolve({ type: e.code })
+ // except in rare cases where the auth token has expired
+ // but we didn't catch the auth token expired exception.
+ // if we signed in with SSO, try to refresh the token here as well
+ if (connection?.attemptSSOLogin) {
+ authLog(
+ 'Client was unauthorized, could be due to access token expiry, starting refresh attempt'
+ )
+ const SSOProviders = getActiveConnectionData(
+ store.getState()
+ )?.SSOProviders
+ if (SSOProviders) {
+ handleRefreshingToken(SSOProviders)
+ .then(credentials => {
+ store.dispatch(
+ discovery.updateDiscoveryConnection(credentials)
+ )
+ connection = getActiveConnectionData(
+ store.getState()
+ )
+ authLog(
+ 'Successfully refreshed token, attempting to reconnect'
+ )
+ return reject(new Error('Try again with new token'))
+ })
+ .catch(e => {
+ // sso-lib throws errors with simple strings
+ authLog(
+ 'Token refresh attempt failed: ' + String(e)
+ )
+ // if refreshing the token failed, don't retry connectivity recover
+ return resolve({ type: UnauthorizedDriverError })
+ })
+ }
+ } else {
+ authLog(
+ 'Client was unauthorized, stopping reconnection attempts'
+ )
+ resolve({ type: e.code })
+ }
} else {
setTimeout(
() => reject(new Error('Couldnt reconnect.')),
@@ -759,6 +804,7 @@ export const connectionLostEpic = (action$: any, store: any) =>
.catch(() => {
bolt.closeConnection()
store.dispatch(setActiveConnection(null))
+ authLog('Failed to recover connectivity.')
return Rx.Observable.of(null)
})
// It can be resolved for a number of reasons:
diff --git a/src/shared/modules/currentUser/currentUserDuck.ts b/src/shared/modules/currentUser/currentUserDuck.ts
index 859156fb733..7ff79fecff3 100644
--- a/src/shared/modules/currentUser/currentUserDuck.ts
+++ b/src/shared/modules/currentUser/currentUserDuck.ts
@@ -103,7 +103,8 @@ export const getCurrentUserEpic = (some$: any, store: any) =>
getShowCurrentUserProcedure(
hasMultidb ? FIRST_MULTI_DB_SUPPORT : FIRST_NO_MULTI_DB_SUPPORT
),
- { useDb: hasMultidb ? SYSTEM_DB : undefined }
+ { useDb: hasMultidb ? SYSTEM_DB : undefined },
+ store
)
return resolve(res)
diff --git a/src/shared/modules/dbMeta/dbMetaEpics.ts b/src/shared/modules/dbMeta/dbMetaEpics.ts
index f17688d1369..3bfeaf7472f 100644
--- a/src/shared/modules/dbMeta/dbMetaEpics.ts
+++ b/src/shared/modules/dbMeta/dbMetaEpics.ts
@@ -74,7 +74,6 @@ import {
LOST_CONNECTION,
SILENT_DISCONNECT,
UPDATE_CONNECTION_STATE,
- connectionLossFilter,
getActiveConnectionData,
getLastUseDb,
getUseDb,
@@ -97,6 +96,13 @@ import {
isSystemOrCompositeDb,
getCurrentDatabase
} from 'shared/utils/selectors'
+import { isBoltConnectionErrorCode } from 'services/bolt/boltConnectionErrors'
+
+function handleConnectionError(store: any, e: any) {
+ if (!e.code || isBoltConnectionErrorCode(e.code)) {
+ onLostConnection(store.dispatch)(e)
+ }
+}
async function databaseList(store: any) {
try {
@@ -105,9 +111,13 @@ async function databaseList(store: any) {
return
}
- const res = await bolt.backgroundWorkerlessRoutedRead('SHOW DATABASES', {
- useDb: SYSTEM_DB
- })
+ const res = await bolt.backgroundWorkerlessRoutedRead(
+ 'SHOW DATABASES',
+ {
+ useDb: SYSTEM_DB
+ },
+ store
+ )
if (!res) return
@@ -135,9 +145,13 @@ async function getLabelsAndTypes(store: any) {
// Not system db, try and fetch meta data
try {
- const res = await bolt.backgroundWorkerlessRoutedRead(metaTypesQuery, {
- useDb: db?.name
- })
+ const res = await bolt.backgroundWorkerlessRoutedRead(
+ metaTypesQuery,
+ {
+ useDb: db?.name
+ },
+ store
+ )
if (res && res.records && res.records.length !== 0) {
const [rawLabels, rawRelTypes, rawProperties] = res.records.map(
(r: Record) => r.get(0).data
@@ -173,9 +187,13 @@ async function getNodeAndRelationshipCounts(
// Not system db, try and fetch meta data
try {
- const res = await bolt.backgroundWorkerlessRoutedRead(metaCountQuery, {
- useDb: db?.name
- })
+ const res = await bolt.backgroundWorkerlessRoutedRead(
+ metaCountQuery,
+ {
+ useDb: db?.name
+ },
+ store
+ )
if (res && res.records && res.records.length !== 0) {
const [rawNodeCount, rawRelationshipCount] = res.records.map(
(r: Record) => r.get(0).data
@@ -210,11 +228,13 @@ async function getFunctionsAndProcedures(store: any) {
const useDb = supportsMultiDb(store.getState()) ? SYSTEM_DB : undefined
const procedurePromise = bolt.backgroundWorkerlessRoutedRead(
getListProcedureQuery(version),
- { useDb }
+ { useDb },
+ store
)
const functionPromise = bolt.backgroundWorkerlessRoutedRead(
getListFunctionQuery(version),
- { useDb }
+ { useDb },
+ store
)
const [procedures, functions] = await Promise.all([
procedurePromise,
@@ -227,7 +247,7 @@ async function getFunctionsAndProcedures(store: any) {
functions: functions.records.map(f => f.toObject())
})
)
- } catch (e) {}
+ } catch {}
}
async function clusterRole(store: any) {
@@ -251,7 +271,9 @@ async function clusterRole(store: any) {
const role = res.records[0].get(0)
store.dispatch(update({ role }))
- } catch {}
+ } catch (e) {
+ handleConnectionError(store, e)
+ }
}
async function fetchServerInfo(store: any) {
@@ -259,7 +281,8 @@ async function fetchServerInfo(store: any) {
const serverInfo = await bolt.backgroundWorkerlessRoutedRead(
serverInfoQuery,
// We use the bolt method for multi db support, since don't have the version in redux yet
- { useDb: (await bolt.hasMultiDbSupport()) ? SYSTEM_DB : undefined }
+ { useDb: (await bolt.hasMultiDbSupport()) ? SYSTEM_DB : undefined },
+ store
)
store.dispatch(updateServerInfo(serverInfo))
} catch {}
@@ -278,7 +301,8 @@ async function fetchTrialStatus(store: any) {
const trialStatus = await bolt.backgroundWorkerlessRoutedRead(
trialStatusQuery,
// System database is available from v4
- { useDb: SYSTEM_DB }
+ { useDb: SYSTEM_DB },
+ store
)
store.dispatch(updateTrialStatus(trialStatus))
} catch {}
@@ -286,7 +310,8 @@ async function fetchTrialStatus(store: any) {
try {
const oldTrialStatus = await bolt.backgroundWorkerlessRoutedRead(
oldTrialStatusQuery,
- { useDb: SYSTEM_DB }
+ { useDb: SYSTEM_DB },
+ store
)
store.dispatch(updateTrialStatusOld(oldTrialStatus))
} catch {}
@@ -397,7 +422,6 @@ export const dbMetaEpic = (some$: any, store: any) =>
.takeUntil(
some$
.ofType(LOST_CONNECTION)
- .filter(connectionLossFilter)
.merge(some$.ofType(DISCONNECTION_SUCCESS))
.merge(some$.ofType(SILENT_DISCONNECT))
)
@@ -453,7 +477,8 @@ export const serverConfigEpic = (some$: any, store: any) =>
? 'dbms.clientConfig()'
: 'dbms.listConfig()'
}`,
- { useDb }
+ { useDb },
+ store
)
.then((r: any) => {
// This is not set yet
@@ -469,9 +494,13 @@ export const serverConfigEpic = (some$: any, store: any) =>
store.dispatch(setClientConfig(false))
bolt
- .backgroundWorkerlessRoutedRead(`CALL dbms.listConfig()`, {
- useDb
- })
+ .backgroundWorkerlessRoutedRead(
+ `CALL dbms.listConfig()`,
+ {
+ useDb
+ },
+ store
+ )
.then(resolve)
.catch(reject)
} else {
diff --git a/src/shared/services/bolt/bolt.ts b/src/shared/services/bolt/bolt.ts
index 8a0bcfe3bac..71f692b1bd2 100644
--- a/src/shared/services/bolt/bolt.ts
+++ b/src/shared/services/bolt/bolt.ts
@@ -31,11 +31,15 @@ import {
import { addTypesAsField, setupBoltWorker } from './setup-bolt-worker'
import { cancelTransaction as globalCancelTransaction } from './transactions'
import { NATIVE } from 'services/bolt/boltHelpers'
-import { Connection } from 'shared/modules/connections/connectionsDuck'
+import {
+ Connection,
+ onLostConnection
+} from 'shared/modules/connections/connectionsDuck'
import BoltWorkerModule from 'shared/services/bolt/boltWorker'
import { backgroundTxMetadata } from './txMetadata'
import { getGlobalDrivers } from './globalDrivers'
import { BoltConnectionError } from 'services/exceptions'
+import { isBoltConnectionErrorCode } from './boltConnectionErrors'
let connectionProperties: {} | null = null
let _useDb: string | null = null
@@ -182,7 +186,8 @@ function directTransaction(
async function backgroundWorkerlessRoutedRead(
input: string,
- { useDb }: { useDb?: string }
+ { useDb }: { useDb?: string },
+ store: any
): Promise {
const session = getGlobalDrivers()
?.getRoutedDriver()
@@ -197,6 +202,12 @@ async function backgroundWorkerlessRoutedRead(
.executeRead(tx => tx.run(input), {
metadata: backgroundTxMetadata.txMetadata
})
+ .catch(e => {
+ if (!e.code || isBoltConnectionErrorCode(e.code)) {
+ onLostConnection(store.dispatch)(e)
+ }
+ throw e
+ })
.finally(() => session.close())
}