From 097eb6429e8df1025ce12032f4f2b3c7e6e0cf97 Mon Sep 17 00:00:00 2001 From: Kristian Aurlien Date: Wed, 20 Jan 2021 12:40:42 +0100 Subject: [PATCH 1/6] Set name and version for cognite --- package-lock.json | 4 ++-- package.json | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index c35a5dc3..e0f2904e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { - "name": "neo4j-graphql-js", - "version": "2.19.0", + "name": "@cognite/neo4j-graphql-js", + "version": "2.19.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index eb0d8479..49fd39a9 100755 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "neo4j-graphql-js", + "name": "@cognite/neo4j-graphql-js", "version": "2.19.1", "description": "A GraphQL to Cypher query execution layer for Neo4j. ", "main": "./dist/index.js", @@ -36,7 +36,7 @@ "license": "Apache-2.0", "repository": { "type": "git", - "url": "git+https://github.com/neo4j-graphql/neo4j-graphql-js" + "url": "git+https://github.com/neo4j-graphql/neo4j-graphql-js.git" }, "devDependencies": { "@apollo/federation": "^0.20.7", @@ -94,5 +94,13 @@ "prettier --write", "git add" ] + }, + "bugs": { + "url": "https://github.com/neo4j-graphql/neo4j-graphql-js/issues" + }, + "homepage": "https://github.com/neo4j-graphql/neo4j-graphql-js#readme", + "directories": { + "example": "example", + "test": "test" } } From dc56855c7b74c135f6ec4dc8a9f7b40e2f3b598f Mon Sep 17 00:00:00 2001 From: Kristian Aurlien Date: Wed, 20 Jan 2021 12:48:54 +0100 Subject: [PATCH 2/6] Allow sample secret --- example/apollo-server/authScopes.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/example/apollo-server/authScopes.js b/example/apollo-server/authScopes.js index 4f1d244b..63c36fbf 100644 --- a/example/apollo-server/authScopes.js +++ b/example/apollo-server/authScopes.js @@ -3,13 +3,13 @@ import { ApolloServer } from 'apollo-server'; import neo4j from 'neo4j-driver'; // JWT -// eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyLCJzY29wZXMiOlsicmVhZDp1c2VyIiwiY3JlYXRlOnVzZXIiXX0.jCidMhYKk_0s8aQpXojYwZYz00eIG9lD_DbeXRKj4vA +// eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyLCJzY29wZXMiOlsicmVhZDp1c2VyIiwiY3JlYXRlOnVzZXIiXX0.jCidMhYKk_0s8aQpXojYwZYz00eIG9lD_DbeXRKj4vA pragma: allowlist secret // scopes // "scopes": ["read:user", "create:user"] // JWT_SECRET -// oqldBPU1yMXcrTwcha1a9PGi9RHlPVzQ +// oqldBPU1yMXcrTwcha1a9PGi9RHlPVzQ pragma: allowlist secret const typeDefs = ` type User { From 837baf26efd86550938602fad87fb279c84170ed Mon Sep 17 00:00:00 2001 From: Kristian Aurlien Date: Wed, 20 Jan 2021 12:52:01 +0100 Subject: [PATCH 3/6] remove example secrets --- example/apollo-server/authScopes.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/example/apollo-server/authScopes.js b/example/apollo-server/authScopes.js index 63c36fbf..672e8f48 100644 --- a/example/apollo-server/authScopes.js +++ b/example/apollo-server/authScopes.js @@ -3,13 +3,11 @@ import { ApolloServer } from 'apollo-server'; import neo4j from 'neo4j-driver'; // JWT -// eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyLCJzY29wZXMiOlsicmVhZDp1c2VyIiwiY3JlYXRlOnVzZXIiXX0.jCidMhYKk_0s8aQpXojYwZYz00eIG9lD_DbeXRKj4vA pragma: allowlist secret // scopes // "scopes": ["read:user", "create:user"] // JWT_SECRET -// oqldBPU1yMXcrTwcha1a9PGi9RHlPVzQ pragma: allowlist secret const typeDefs = ` type User { From 7d829df6af925848e804cedce400f3c8de861761 Mon Sep 17 00:00:00 2001 From: Kristian Aurlien Date: Wed, 20 Jan 2021 12:55:55 +0100 Subject: [PATCH 4/6] enable session config in searchSchema --- src/index.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index 099fae19..759df65d 100644 --- a/src/index.js +++ b/src/index.js @@ -341,8 +341,13 @@ export const assertSchema = ({ }); }; -export const searchSchema = async ({ driver, schema, debug = false }) => { - const session = driver.session(); +export const searchSchema = async ({ + driver, + schema, + debug = false, + sessionParams = {} +}) => { + const session = driver.session(sessionParams); // drop all search indexes, given they cannot be updated via a second CALL to createNodeIndex const dropStatement = ` CALL db.indexes() YIELD name, provider WHERE provider = "fulltext-1.0" From 65e03dec4b605c98b9c8a6ce179101a8efed8e2d Mon Sep 17 00:00:00 2001 From: Kristian Aurlien Date: Wed, 20 Jan 2021 13:00:57 +0100 Subject: [PATCH 5/6] enable session config in assertSchema --- src/index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/index.js b/src/index.js index 759df65d..e5882104 100644 --- a/src/index.js +++ b/src/index.js @@ -318,11 +318,12 @@ export const assertSchema = ({ driver, schema, dropExisting = true, - debug = false + debug = false, + sessionParams = {} }) => { const statement = schemaAssert({ schema, dropExisting }); const executeQuery = driver => { - const session = driver.session(); + const session = driver.session(sessionParams); return session .writeTransaction(tx => tx.run(statement).then(result => { From ac7b6d2b9ef8cc36b0d7f2523afbab6bd4147bb4 Mon Sep 17 00:00:00 2001 From: Kristian Aurlien Date: Wed, 20 Jan 2021 13:21:48 +0100 Subject: [PATCH 6/6] Bump patch version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 49fd39a9..7c055140 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@cognite/neo4j-graphql-js", - "version": "2.19.1", + "version": "2.19.3", "description": "A GraphQL to Cypher query execution layer for Neo4j. ", "main": "./dist/index.js", "scripts": {