Revert "Handle token expiration in SSO (#611)" (#815)

This reverts commit 001cee1.

Author: nielsdejong

package.json

@@ -72,7 +72,6 @@
     "mui-color": "^2.0.0-beta.2",
     "mui-nested-menu": "^3.2.1",
     "neo4j-client-sso": "^1.2.2",
-    "neo4j-driver": "^5.12.0",
     "openai": "^3.3.0",
     "postcss": "^8.4.21",
     "postcss-loader": "^7.2.4",

src/application/ApplicationActions.ts

@@ -2,8 +2,6 @@
  * This file contains all state-changing actions relevant for the main application.
  */
 
-import { SSOProviderOriginal } from 'neo4j-client-sso';
-
 export const CLEAR_NOTIFICATION = 'APPLICATION/CLEAR_NOTIFICATION';
 export const clearNotification = () => ({
   type: CLEAR_NOTIFICATION,
@@ -58,11 +56,10 @@ export const setConnectionProperties = (
   port: string,
   database: string,
   username: string,
-  password: string,
-  ssoProviders?: SSOProviderOriginal[]
+  password: string
 ) => ({
   type: SET_CONNECTION_PROPERTIES,
-  payload: { protocol, url, port, database, username, password, ssoProviders },
+  payload: { protocol, url, port, database, username, password },
 });
 
 export const SET_BASIC_CONNECTION_PROPERTIES = 'APPLICATION/SET_BASIC_CONNECTION_PROPERTIES';

src/application/ApplicationReducer.ts

@@ -64,7 +64,6 @@ const initialState = {
     database: '',
     username: 'neo4j',
     password: '',
-    ssoProviders: [],
   },
   shareDetails: undefined,
   desktopConnection: null,
@@ -247,7 +246,7 @@ export const applicationReducer = (state = initialState, action: { type: any; pa
       return state;
     }
     case SET_CONNECTION_PROPERTIES: {
-      const { protocol, url, port, database, username, password, ssoProviders } = payload;
+      const { protocol, url, port, database, username, password } = payload;
       state = update(state, {
         connection: {
           protocol: protocol,
@@ -256,7 +255,6 @@ export const applicationReducer = (state = initialState, action: { type: any; pa
           database: database,
           username: username,
           password: password,
-          ssoProviders,
         },
       });
       return state;

src/application/ApplicationThunks.ts

@@ -1,3 +1,4 @@
+import { createDriver } from 'use-neo4j';
 import { initializeSSO } from '../component/sso/SSOUtils';
 import { DEFAULT_SCREEN, Screens } from '../config/ApplicationConfig';
 import { setDashboard } from '../dashboard/DashboardActions';
@@ -43,9 +44,6 @@ import {
 } from './ApplicationActions';
 import { setLoggingMode, setLoggingDatabase, setLogErrorNotification } from './logging/LoggingActions';
 import { version } from '../modal/AboutModal';
-import neo4j, { auth, authTokenManagers } from 'neo4j-driver';
-import type { Neo4jScheme } from 'use-neo4j/dist/neo4j-config.interface';
-import { SSOProviderOriginal, handleRefreshingToken } from 'neo4j-client-sso';
 import { applicationIsStandalone } from './ApplicationSelectors';
 import { applicationGetLoggingSettings } from './logging/LoggingSelectors';
 import { createLogThunk } from './logging/LoggingThunk';
@@ -56,47 +54,6 @@ import { createUUID } from '../utils/uuid';
  * Several actions/other thunks may be dispatched from here.
  */
 
-export const createDriver = (
-  scheme: Neo4jScheme,
-  host: string,
-  port: string | number,
-  username?: string,
-  password?: string,
-  config?: { userAgent?: string },
-  ssoProviders: SSOProviderOriginal[] = []
-) => {
-  if (ssoProviders.length > 0) {
-    const authTokenMgr = authTokenManagers.bearer({
-      tokenProvider: async () => {
-        const credentials = await handleRefreshingToken(ssoProviders);
-        const token = auth.bearer(credentials.password);
-        // Get the expiration from the JWT's payload, which is a JSON string encoded
-        // using base64. You could also use a JWT parsing lib
-        const [, payloadBase64] = credentials.password.split('.');
-        const payload: unknown = JSON.parse(window.atob(payloadBase64 ?? ''));
-        let expiration: Date;
-        if (typeof payload === 'object' && payload !== null && 'exp' in payload) {
-          expiration = new Date(Number(payload.exp) * 1000);
-        } else {
-          expiration = new Date();
-        }
-
-        return {
-          expiration,
-          token,
-        };
-      },
-    });
-    return neo4j.driver(`${scheme}://${host}:${port}`, authTokenMgr, config);
-  }
-
-  if (!username || !password) {
-    return neo4j.driver(`${scheme}://${host}:${port}`);
-  }
-
-  return neo4j.driver(`${scheme}://${host}:${port}`, neo4j.auth.basic(username, password), config);
-};
-
 /**
  * Establish a connection to Neo4j with the specified credentials. Open/close the relevant windows when connection is made (un)successfully.
  * @param protocol - the neo4j protocol (e.g. bolt, bolt+s, neo4j+s, ...)
@@ -105,24 +62,14 @@ export const createDriver = (
  * @param database - the Neo4j database to connect to.
  * @param username - Neo4j username.
  * @param password - Neo4j password.
- * @param SSOProviders - List of available SSO providers
  */
 export const createConnectionThunk =
-  (protocol, url, port, database, username, password, SSOProviders = []) =>
-  (dispatch: any, getState: any) => {
+  (protocol, url, port, database, username, password) => (dispatch: any, getState: any) => {
     const loggingState = getState();
     const loggingSettings = applicationGetLoggingSettings(loggingState);
     const neodashMode = applicationIsStandalone(loggingState) ? 'Standalone' : 'Editor';
     try {
-      const driver = createDriver(
-        protocol,
-        url,
-        port,
-        username,
-        password,
-        { userAgent: `neodash/v${version}` },
-        SSOProviders
-      );
+      const driver = createDriver(protocol, url, port, username, password, { userAgent: `neodash/v${version}` });
       // eslint-disable-next-line no-console
       console.log('Attempting to connect...');
       const validateConnection = (records) => {
@@ -561,7 +508,7 @@ export const loadApplicationConfigThunk = () => async (dispatch: any, getState:
       dispatch(setAboutModalOpen(false));
       dispatch(setConnected(false));
       dispatch(setWelcomeScreenOpen(false));
-      const success = await initializeSSO(state.application.cachedSSODiscoveryUrl, (credentials, ssoProviders) => {
+      const success = await initializeSSO(state.application.cachedSSODiscoveryUrl, (credentials) => {
         if (standalone) {
           // Redirected from SSO and running in viewer mode, merge retrieved config with hardcoded credentials.
           dispatch(
@@ -571,8 +518,7 @@ export const loadApplicationConfigThunk = () => async (dispatch: any, getState:
               config.standalonePort,
               config.standaloneDatabase,
               credentials.username,
-              credentials.password,
-              ssoProviders
+              credentials.password
             )
           );
           dispatch(
@@ -582,8 +528,7 @@ export const loadApplicationConfigThunk = () => async (dispatch: any, getState:
               config.standalonePort,
               config.standaloneDatabase,
               credentials.username,
-              credentials.password,
-              ssoProviders
+              credentials.password
             )
           );
         } else {
@@ -595,8 +540,7 @@ export const loadApplicationConfigThunk = () => async (dispatch: any, getState:
               state.application.connection.port,
               state.application.connection.database,
               credentials.username,
-              credentials.password,
-              ssoProviders
+              credentials.password
             )
           );
           dispatch(setConnected(true));

src/component/sso/SSOUtils.ts

@@ -118,7 +118,7 @@ export const initializeSSO = async (cachedSSODiscoveryUrl, _setCredentials) => {
       // Successful credentials retrieval.
       // Log in at the Neo4j dbms now using the Neo4j (js) driver.
       //
-      _setCredentials(credentials, mergedSSOProviders);
+      _setCredentials(credentials);
 
       // Exemplifying retrieval of stored URL paramenters
       _retrieveAdditionalURLParameters();

src/dashboard/Dashboard.tsx

@@ -3,15 +3,14 @@ import NeoPage from '../page/Page';
 import NeoDashboardHeader from './header/DashboardHeader';
 import NeoDashboardTitle from './header/DashboardTitle';
 import NeoDashboardHeaderPageList from './header/DashboardHeaderPageList';
-import { Neo4jProvider } from 'use-neo4j';
+import { createDriver, Neo4jProvider } from 'use-neo4j';
 import { applicationGetConnection, applicationGetStandaloneSettings } from '../application/ApplicationSelectors';
 import { connect } from 'react-redux';
 import NeoDashboardConnectionUpdateHandler from '../component/misc/DashboardConnectionUpdateHandler';
 import { forceRefreshPage } from '../page/PageActions';
 import { getPageNumber } from '../settings/SettingsSelectors';
 import { createNotificationThunk } from '../page/PageThunks';
 import { version } from '../modal/AboutModal';
-import { createDriver } from '../application/ApplicationThunks';
 import NeoDashboardSidebar from './sidebar/DashboardSidebar';
 
 const Dashboard = ({
@@ -33,10 +32,8 @@ const Dashboard = ({
       connection.port,
       connection.username,
       connection.password,
-      { userAgent: `neodash/v${version}` },
-      connection.ssoProviders
+      { userAgent: `neodash/v${version}` }
     );
-    // @ts-ignore wrong driver version
     setDriver(newDriver);
   }
   const content = (

yarn.lock

@@ -10435,15 +10435,6 @@ neo4j-client-sso@^1.2.2:
     jwt-decode "^3.1.2"
     lodash.pick "^4.4.0"
 
-[email protected]:
-  version "5.12.0"
-  resolved "https://registry.yarnpkg.com/neo4j-driver-bolt-connection/-/neo4j-driver-bolt-connection-5.12.0.tgz#aff161367d287579d7bdd3ee4179eed324398210"
-  integrity sha512-dlYbFsfT0HopGItitG5uDK4nAkcqSPNtRqMz318qy//7fb/7OXVLGYikj57Ve1toJiJD8IIVErt/dVuEUHVxGA==
-  dependencies:
-    buffer "^6.0.3"
-    neo4j-driver-core "5.12.0"
-    string_decoder "^1.3.0"
-
 neo4j-driver-bolt-connection@^4.4.10:
   version "4.4.10"
   resolved "https://registry.yarnpkg.com/neo4j-driver-bolt-connection/-/neo4j-driver-bolt-connection-4.4.10.tgz#a8b5b7f82b1d6f9a71a43eafcb0e21512ea24908"
@@ -10453,11 +10444,6 @@ neo4j-driver-bolt-connection@^4.4.10:
     neo4j-driver-core "^4.4.10"
     string_decoder "^1.3.0"
 
-[email protected]:
-  version "5.12.0"
-  resolved "https://registry.yarnpkg.com/neo4j-driver-core/-/neo4j-driver-core-5.12.0.tgz#1f8616da7e945921574811368a68f5d2501bfd35"
-  integrity sha512-xBRi5oezysDUvtvBiIgBchzumkDZxvR9ol9sUtA9PBgVENeSmPH3CncitY8S979CFELS6wH7kydcjPLB4QMOzA==
-
 neo4j-driver-core@^4.4.10:
   version "4.4.10"
   resolved "https://registry.yarnpkg.com/neo4j-driver-core/-/neo4j-driver-core-4.4.10.tgz#6f4c1ccc1199f864b149bdcef5e50e45ff95c29e"
@@ -10473,15 +10459,6 @@ neo4j-driver@^4.4.5:
     neo4j-driver-core "^4.4.10"
     rxjs "^6.6.3"
 
-neo4j-driver@^5.12.0:
-  version "5.12.0"
-  resolved "https://registry.yarnpkg.com/neo4j-driver/-/neo4j-driver-5.12.0.tgz#1b2d7db1672ad224f0146542efee306a0a156a11"
-  integrity sha512-T2Vz63XDkL9TomM16dBusuXbo7d9SIGw2g3VR/rmrWTdbl1V1LYFx/u1P7AwBsFuX08oncKHfZwHGsWrCvdMyA==
-  dependencies:
-    neo4j-driver-bolt-connection "5.12.0"
-    neo4j-driver-core "5.12.0"
-    rxjs "^7.8.1"
-
 next-tick@1, next-tick@^1.0.0, next-tick@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
@@ -12311,13 +12288,6 @@ rxjs@^7.5.1, rxjs@^7.5.5, rxjs@^7.8.0:
   dependencies:
     tslib "^2.1.0"
 
-rxjs@^7.8.1:
-  version "7.8.1"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
-  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
-  dependencies:
-    tslib "^2.1.0"
-
 sade@^1.7.3:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/sade/-/sade-1.8.1.tgz#0a78e81d658d394887be57d2a409bf703a3b2701"