assumes gte4.0 supports multidb, assume lt4 does not

Author: daveajrussell

src/shared/modules/connections/connectionsDuck.test.ts

@@ -507,7 +507,6 @@ describe('handleForcePasswordChangeEpic', () => {
   const mockSessionClose = jest.fn()
 
   const mockDriver = {
-    supportsMultiDb: () => true,
     session: jest.fn().mockReturnValue({
       close: mockSessionClose
     }),
@@ -709,7 +708,7 @@ describe('handleForcePasswordChangeEpic', () => {
               query: 'CALL dbms.security.changePassword($password)'
             }),
             expect.anything(),
-            { database: 'system' }
+            undefined
           )
 
           expect(currentAction).toEqual(
@@ -739,45 +738,6 @@ describe('handleForcePasswordChangeEpic', () => {
     return p
   })
 
-  test('handleForcePasswordChangeEpic does not execute against system database when unavailable', () => {
-    // Given
-    ;(bolt.directConnect as jest.Mock).mockClear()
-    ;(bolt.directConnect as jest.Mock).mockResolvedValue({
-      supportsMultiDb: () => false,
-      close: () => true
-    })
-
-    const p = new Promise<void>((resolve, reject) => {
-      bus.take($$responseChannel, currentAction => {
-        // Then
-        const actions = store.getActions()
-
-        try {
-          expect(actions).toEqual([action, currentAction])
-
-          expect(executePasswordResetQuerySpy).toHaveBeenCalledWith(
-            expect.anything(),
-            expect.anything(),
-            expect.anything(),
-            undefined
-          )
-
-          resolve()
-        } catch (e) {
-          reject(e)
-        }
-      })
-    })
-
-    // When
-    epicMiddleware.replaceEpic(connections.handleForcePasswordChangeEpic)
-    store.clearActions()
-    store.dispatch(action)
-
-    // Return
-    return p
-  })
-
   test('handleForcePasswordChangeEpic resolves with an error if dbms function call fails', () => {
     // Given
     ;(buildTxFunctionByMode as jest.Mock)

src/shared/modules/connections/connectionsDuck.ts

@@ -958,10 +958,8 @@ export const handleForcePasswordChangeEpic = (some$: any) =>
             )
             .then(async driver => {
               try {
-                const supportsMultiDb = await driver.supportsMultiDb()
-
                 const res = await forceResetPasswordQueryHelper
-                  .executeAlterCurrentUserQuery(driver, action, supportsMultiDb)
+                  .executeAlterCurrentUserQuery(driver, action)
                   .then((res: any) => {
                     resolve({
                       type: action.$$responseChannel,
@@ -981,11 +979,7 @@ export const handleForcePasswordChangeEpic = (some$: any) =>
                     /(Invalid input 'A': expected <init>)/.test(res.message)
                   ) {
                     await forceResetPasswordQueryHelper
-                      .executeCallChangePasswordQuery(
-                        driver,
-                        action,
-                        supportsMultiDb
-                      )
+                      .executeCallChangePasswordQuery(driver, action)
                       .then((res: any) => {
                         resolve({
                           type: action.$$responseChannel,

src/shared/modules/connections/forceResetPasswordQueryHelper.ts

@@ -43,8 +43,7 @@ export default {
    */
   executeAlterCurrentUserQuery: function (
     driver: Driver,
-    action: Connection & { newPassword: string },
-    supportsMultiDb: boolean
+    action: Connection & { newPassword: string }
   ): Promise<void> {
     const payload = {
       query: 'ALTER CURRENT USER SET PASSWORD FROM $oldPw TO $newPw',
@@ -58,7 +57,7 @@ export default {
       driver,
       payload,
       userActionTxMetadata.txMetadata,
-      supportsMultiDb ? { database: SYSTEM_DB } : undefined
+      { database: SYSTEM_DB }
     )
   },
   /**
@@ -67,8 +66,7 @@ export default {
    */
   executeCallChangePasswordQuery: function (
     driver: Driver,
-    action: { newPassword: string },
-    supportsMultiDb: boolean
+    action: { newPassword: string }
   ): Promise<void> {
     const payload = {
       query: 'CALL dbms.security.changePassword($password)',
@@ -79,7 +77,7 @@ export default {
       driver,
       payload,
       userActionTxMetadata.txMetadata,
-      supportsMultiDb ? { database: SYSTEM_DB } : undefined
+      undefined
     )
   }
 }