Skip to content

Commit 5d1359b

Browse files
committed
Move auth type constants to work in ww
1 parent 2acd6dd commit 5d1359b

File tree

7 files changed

+10
-12
lines changed

7 files changed

+10
-12
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
}
2222
],
2323
"scripts": {
24-
"build": "NODE_ENV=\"production\" webpack --config ./build_scripts/webpack.config.js",
24+
"build": "NODE_ENV=\"production\" webpack --config ./build_scripts/webpack.config.js --progress",
2525
"dev": "jest --watch",
2626
"e2e": "cypress run",
2727
"e2e-local": "CYPRESS_E2E_TEST_ENV=\"local\" cypress run",

src/browser/components/DesktopIntegration/helpers.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1919
*/
2020

21-
import { NATIVE, KERBEROS } from 'shared/modules/connections/connectionsDuck'
22-
23-
export { NATIVE, KERBEROS }
21+
import { NATIVE, KERBEROS } from 'services/bolt/boltHelpers'
2422

2523
export const getActiveGraph = (context = {}) => {
2624
if (!context) return null

src/browser/components/DesktopIntegration/helpers.test.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,9 @@ import {
2424
eventToHandler,
2525
didChangeActiveGraph,
2626
getActiveCredentials,
27-
buildConnectionCredentialsObject,
28-
KERBEROS,
29-
NATIVE
27+
buildConnectionCredentialsObject
3028
} from './helpers'
29+
import { KERBEROS, NATIVE } from 'services/bolt/boltHelpers'
3130

3231
test('getActiveGraph handles non objects and non-active projects', () => {
3332
// Given

src/shared/modules/connections/connectionsDuck.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,6 @@ export const DISCONNECTED_STATE = 0
6060
export const CONNECTED_STATE = 1
6161
export const PENDING_STATE = 2
6262

63-
export const KERBEROS = 'KERBEROS'
64-
export const NATIVE = 'NATIVE'
65-
6663
const initialState = {
6764
allConnectionIds: [],
6865
connectionsById: {},

src/shared/services/bolt/bolt.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ import {
3232
POST_CANCEL_TRANSACTION_MESSAGE,
3333
BOLT_CONNECTION_ERROR_MESSAGE
3434
} from './boltWorkerMessages'
35+
import { NATIVE } from 'services/bolt/boltHelpers'
36+
3537
/* eslint-disable import/no-webpack-loader-syntax */
3638
import BoltWorkerModule from 'worker-loader?inline!./boltWorker.js'
3739
/* eslint-enable import/no-webpack-loader-syntax */
38-
import { NATIVE } from 'shared/modules/connections/connectionsDuck'
3940

4041
let connectionProperties = null
4142
let boltWorkPool = new WorkPool(() => new BoltWorkerModule(), 10)

src/shared/services/bolt/boltConnection.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import { v1 as neo4j } from 'neo4j-driver'
2222
import { v4 } from 'uuid'
2323
import { BoltConnectionError, createErrorObject } from '../exceptions'
2424
import { generateBoltHost } from 'services/utils'
25-
import { KERBEROS } from 'shared/modules/connections/connectionsDuck'
25+
import { KERBEROS } from 'services/bolt/boltHelpers'
2626

2727
export const DIRECT_CONNECTION = 'DIRECT_CONNECTION'
2828
export const ROUTED_WRITE_CONNECTION = 'ROUTED_WRITE_CONNECTION'

src/shared/services/bolt/boltHelpers.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
/* global location */
2222
import { getUrlInfo } from 'services/utils'
2323

24+
export const KERBEROS = 'KERBEROS'
25+
export const NATIVE = 'NATIVE'
26+
2427
export const getEncryptionMode = options => {
2528
if (options && typeof options['encrypted'] !== 'undefined') {
2629
return options.encrypted

0 commit comments

Comments
 (0)