-
Notifications
You must be signed in to change notification settings - Fork 151
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4233 from a-alle/fix/4223
Fix authorization variable prefix
- Loading branch information
Showing
10 changed files
with
595 additions
and
57 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "@neo4j/graphql": patch | ||
| --- | ||
|
|
||
| Improve authorization variable prefix on create operations |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
232 changes: 232 additions & 0 deletions
232
packages/graphql/tests/integration/issues/4223.int.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,232 @@ | ||
| /* | ||
| * Copyright (c) "Neo4j" | ||
| * Neo4j Sweden AB [http://neo4j.com] | ||
| * | ||
| * This file is part of Neo4j. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| import type { Driver } from "neo4j-driver"; | ||
| import Neo4j from "../neo4j"; | ||
| import { Neo4jGraphQL } from "../../../src/classes"; | ||
| import { graphql } from "graphql"; | ||
| import { UniqueType } from "../../utils/graphql-types"; | ||
| import gql from "graphql-tag"; | ||
|
|
||
| describe("https://github.com/neo4j/graphql/issues/4223", () => { | ||
| let driver: Driver; | ||
| let neo4j: Neo4j; | ||
|
|
||
| const User = new UniqueType("User"); | ||
| const Tenant = new UniqueType("Tenant"); | ||
| const Settings = new UniqueType("Settings"); | ||
| const OpeningDay = new UniqueType("OpeningDay"); | ||
| const OpeningHoursInterval = new UniqueType("OpeningHoursInterval"); | ||
| const MyWorkspace = new UniqueType("MyWorkspace"); | ||
|
|
||
| const typeDefs = gql` | ||
| type JWT @jwt { | ||
| id: String | ||
| roles: [String] | ||
| } | ||
| type ${User.name} @authorization(validate: [{ where: { node: { userId: "$jwt.id" } }, operations: [READ] }]) { | ||
| userId: String! @unique | ||
| adminAccess: [${Tenant.name}!]! @relationship(type: "ADMIN_IN", direction: OUT) | ||
| } | ||
| type ${Tenant.name} @authorization(validate: [{ where: { node: { admins: { userId: "$jwt.id" } } } }]) { | ||
| id: ID! @id | ||
| settings: ${Settings.name}! @relationship(type: "VEHICLECARD_OWNER", direction: IN) | ||
| admins: [${User.name}!]! @relationship(type: "ADMIN_IN", direction: IN) | ||
| } | ||
| type ${Settings.name} @authorization(validate: [{ where: { node: { tenant: { admins: { userId: "$jwt.id" } } } } }]) { | ||
| id: ID! @id | ||
| openingDays: [${OpeningDay.name}!]! @relationship(type: "VALID_GARAGES", direction: OUT) | ||
| myWorkspace: ${MyWorkspace.name}! @relationship(type: "HAS_WORKSPACE_SETTINGS", direction: OUT) | ||
| tenant: ${Tenant.name}! @relationship(type: "VEHICLECARD_OWNER", direction: OUT) | ||
| } | ||
| type ${OpeningDay.name} | ||
| @authorization( | ||
| validate: [{ where: { node: { settings: { tenant: { admins: { userId: "$jwt.id" } } } } } }] | ||
| ) { | ||
| id: ID! @id | ||
| settings: ${Settings.name} @relationship(type: "VALID_GARAGES", direction: IN) | ||
| open: [${OpeningHoursInterval.name}!]! @relationship(type: "HAS_OPEN_INTERVALS", direction: OUT) | ||
| } | ||
| type ${OpeningHoursInterval.name} | ||
| @authorization( | ||
| validate: [ | ||
| { where: { node: { openingDay: { settings: { tenant: { admins: { userId: "$jwt.id" } } } } } } } | ||
| ] | ||
| ) { | ||
| name: String | ||
| openingDay: ${OpeningDay.name}! @relationship(type: "HAS_OPEN_INTERVALS", direction: IN) | ||
| } | ||
| type ${MyWorkspace.name} | ||
| @authorization( | ||
| validate: [ | ||
| { | ||
| where: { | ||
| node: { | ||
| settings: { tenant: { admins: { userId: "$jwt.id" } } } | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| ) { | ||
| settings: ${Settings.name}! | ||
| @relationship(type: "HAS_WORKSPACE_SETTINGS", direction: IN) | ||
| workspace: String | ||
| updatedBy: String | ||
| @populatedBy( | ||
| callback: "getUserIDFromContext" | ||
| operations: [CREATE, UPDATE] | ||
| ) | ||
| } | ||
| `; | ||
|
|
||
| const ADD_TENANT = ` | ||
| mutation addTenant($input: [${Tenant.name}CreateInput!]!) { | ||
| ${Tenant.operations.create}(input: $input) { | ||
| ${Tenant.plural} { | ||
| id | ||
| admins { | ||
| userId | ||
| } | ||
| settings { | ||
| openingDays { | ||
| open { | ||
| name | ||
| } | ||
| } | ||
| myWorkspace { | ||
| workspace | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| `; | ||
|
|
||
| let tenantVariables: Record<string, any>; | ||
| let myUserId: string; | ||
|
|
||
| beforeAll(async () => { | ||
| neo4j = new Neo4j(); | ||
| driver = await neo4j.getDriver(); | ||
| }); | ||
|
|
||
| beforeEach(() => { | ||
| myUserId = Math.random().toString(36).slice(2, 7); | ||
| tenantVariables = { | ||
| input: { | ||
| admins: { | ||
| create: [ | ||
| { | ||
| node: { userId: myUserId }, | ||
| }, | ||
| ], | ||
| }, | ||
| settings: { | ||
| create: { | ||
| node: { | ||
| openingDays: { | ||
| create: { | ||
| node: { | ||
| open: { | ||
| create: { | ||
| node: { | ||
| name: "lambo", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| myWorkspace: { | ||
| create: { | ||
| node: { | ||
| workspace: "myWorkspace", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }; | ||
| }); | ||
|
|
||
| afterEach(async () => { | ||
| const session = driver.session(); | ||
| await session.run(` match (n) detach delete n`); | ||
| await session.close(); | ||
| }); | ||
|
|
||
| afterAll(async () => { | ||
| await driver.close(); | ||
| }); | ||
| test("create tenant with nested openingDays and openHoursInterval - subscriptions disabled", async () => { | ||
| const neo4jGraphql = new Neo4jGraphQL({ | ||
| typeDefs, | ||
| driver, | ||
| features: { | ||
| populatedBy: { | ||
| callbacks: { | ||
| getUserIDFromContext: () => "hi", | ||
| }, | ||
| }, | ||
| }, | ||
| }); | ||
| const schema = await neo4jGraphql.getSchema(); | ||
|
|
||
| const addTenantResponse = await graphql({ | ||
| schema, | ||
| source: ADD_TENANT, | ||
| variableValues: tenantVariables, | ||
| contextValue: neo4j.getContextValues({ jwt: { id: myUserId } }), | ||
| }); | ||
|
|
||
| expect(addTenantResponse.errors).toBeUndefined(); | ||
| }); | ||
|
|
||
| test("create tenant with nested openingDays and openHoursInterval - subscriptions enabled", async () => { | ||
| const neo4jGraphql = new Neo4jGraphQL({ | ||
| typeDefs, | ||
| driver, | ||
| features: { | ||
| subscriptions: true, | ||
| populatedBy: { | ||
| callbacks: { | ||
| getUserIDFromContext: () => "hi", | ||
| }, | ||
| }, | ||
| }, | ||
| }); | ||
| const schema = await neo4jGraphql.getSchema(); | ||
|
|
||
| const addTenantResponse = await graphql({ | ||
| schema, | ||
| source: ADD_TENANT, | ||
| variableValues: tenantVariables, | ||
| contextValue: neo4j.getContextValues({ jwt: { id: myUserId } }), | ||
| }); | ||
|
|
||
| expect(addTenantResponse.errors).toBeUndefined(); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.