@contember/engine-content-api 1.2.0-alpha.1 → 1.2.0-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-content-api",
-  "version": "1.2.0-alpha.1",
+  "version": "1.2.0-alpha.2",
   "license": "Apache-2.0",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -10,19 +10,19 @@
     "test": "vitest --no-threads"
   },
   "dependencies": {
-    "@contember/database": "^1.2.0-alpha.1",
-    "@contember/dic": "^1.2.0-alpha.1",
-    "@contember/engine-common": "^1.2.0-alpha.1",
-    "@contember/graphql-utils": "^1.2.0-alpha.1",
-    "@contember/schema": "^1.2.0-alpha.1",
-    "@contember/schema-utils": "^1.2.0-alpha.1",
+    "@contember/database": "^1.2.0-alpha.2",
+    "@contember/dic": "^1.2.0-alpha.2",
+    "@contember/engine-common": "^1.2.0-alpha.2",
+    "@contember/graphql-utils": "^1.2.0-alpha.2",
+    "@contember/schema": "^1.2.0-alpha.2",
+    "@contember/schema-utils": "^1.2.0-alpha.2",
     "@graphql-tools/schema": "^8.3.5",
     "graphql-tag": "^2.12.5"
   },
   "devDependencies": {
-    "@contember/database-tester": "^1.2.0-alpha.1",
-    "@contember/engine-api-tester": "^1.2.0-alpha.1",
-    "@contember/schema-definition": "^1.2.0-alpha.1",
+    "@contember/database-tester": "^1.2.0-alpha.2",
+    "@contember/engine-api-tester": "^1.2.0-alpha.2",
+    "@contember/schema-definition": "^1.2.0-alpha.2",
     "@graphql-codegen/cli": "^1.15.2",
     "@graphql-codegen/typescript": "^1.15.2",
     "@graphql-codegen/typescript-operations": "^1.15.2",

package/src/acl/VariableInjector.ts

@@ -23,16 +23,18 @@ export class VariableInjector {
 		})
 	}
 
-	private createCondition(variable: Acl.VariableValue | undefined): Input.Condition {
-		if (variable === undefined) {
+	private createCondition(variable: Acl.VariableMapEntry | undefined): Input.Condition {
+		if (variable === undefined || variable.value.length === 0) {
 			return { never: true }
 		}
-		if (Array.isArray(variable)) {
-			return { in: variable }
-		}
-		if (typeof variable === 'string' || typeof variable === 'number') {
-			return { eq: variable }
+
+		const { value, definition } = variable
+		if (definition.type === Acl.VariableType.condition) {
+			if (value.length === 1) {
+				return value[0] as Input.Condition
+			}
+			return { or: value as Input.Condition[] }
 		}
-		throw new Error('not implemented')
+		return { in: value as (string | number)[] }
 	}
 }

package/src/acl/VariableUtils.ts

@@ -17,20 +17,25 @@ export const createAclVariables = (
 			const roleVariables = getRoleVariables(membership.role, aclSchema)
 			const membershipVariablesMap = Object.fromEntries(membership.variables.map(it => [it.name, it.values]))
 
-			return Object.entries(roleVariables).map(([name, def]) => {
+			return Object.entries(roleVariables).map(([name, def]): [string, Acl.VariableMapEntry] => {
 				const prefixed = prefixVariable(membership.role, name)
-
-				switch (def.type) {
-					case Acl.VariableType.entity:
-						return [prefixed, membershipVariablesMap[name] ?? []]
-					case Acl.VariableType.predefined:
-						switch (def.value) {
-							case 'identityID':
-								return [prefixed, [identity.identityId]]
-							case 'personID':
-								return [prefixed, identity.personId ? [identity.personId] : []]
-						}
-				}
+				const value = (() => {
+					switch (def.type) {
+						case Acl.VariableType.entity:
+							return membershipVariablesMap[name] ?? []
+						case Acl.VariableType.predefined:
+							switch (def.value) {
+								case 'identityID':
+									return [identity.identityId]
+								case 'personID':
+									return identity.personId ? [identity.personId] : []
+							}
+							throw new Error(`Unknown predefined variable ${def.value}`)
+						case Acl.VariableType.condition:
+							return (membershipVariablesMap[name] ?? []).map(it => JSON.parse(it))
+					}
+				})()
+				return [prefixed, { value: value, definition: def }]
 			})
 		},
 	)

package/tests/cases/integration/graphQlRequests/delete/aclDelete.test.ts

@@ -1,7 +1,7 @@
 import { test } from 'vitest'
 import { execute, sqlDeferred, sqlTransaction } from '../../../../src/test'
 import { SchemaBuilder } from '@contember/schema-definition'
-import { Model } from '@contember/schema'
+import { Acl, Model } from '@contember/schema'
 import { GQL, SQL } from '../../../../src/tags'
 import { testUuid } from '../../../../src/testUuid'
 
@@ -32,7 +32,12 @@ test('delete post with acl', async () => {
 			},
 		},
 		variables: {
-			locale_variable: ['cs'],
+			locale_variable: {
+				definition: {
+					type: Acl.VariableType.condition,
+				},
+				value: [{ in: ['cs'] }],
+			},
 		},
 		executes: [
 			...sqlTransaction([

package/tests/cases/integration/graphQlRequests/insert/acl/setField.test.ts

@@ -1,7 +1,7 @@
 import { test } from 'vitest'
 import { execute, failedTransaction, sqlTransaction } from '../../../../../src/test'
 import { SchemaBuilder } from '@contember/schema-definition'
-import { Model } from '@contember/schema'
+import { Acl, Model } from '@contember/schema'
 import { GQL, SQL } from '../../../../../src/tags'
 import { testUuid } from '../../../../../src/testUuid'
 
@@ -34,7 +34,12 @@ test('set a name - allowed', async () => {
 			},
 		},
 		variables: {
-			name_variable: ['John', 'Jack'],
+			name_variable: {
+				definition: {
+					type: Acl.VariableType.condition,
+				},
+				value: [{ in: ['John', 'Jack'] }],
+			},
 		},
 		executes: [
 			...sqlTransaction([
@@ -89,7 +94,12 @@ test('set a name - denied', async () => {
 			},
 		},
 		variables: {
-			name_variable: ['John', 'Jack'],
+			name_variable: {
+				definition: {
+					type: Acl.VariableType.condition,
+				},
+				value: [{ in: ['John', 'Jack'] }],
+			},
 		},
 		executes: [
 			...failedTransaction([

package/tests/cases/integration/graphQlRequests/insert/aclInsert.test.ts

@@ -1,7 +1,7 @@
 import { test } from 'vitest'
 import { execute, sqlTransaction } from '../../../../src/test'
 import { SchemaBuilder } from '@contember/schema-definition'
-import { Model } from '@contember/schema'
+import { Acl, Model } from '@contember/schema'
 import { GQL, SQL } from '../../../../src/tags'
 import { testUuid } from '../../../../src/testUuid'
 
@@ -27,7 +27,12 @@ test('insert author (with acl)', async () => {
 			},
 		},
 		variables: {
-			name_variable: ['John', 'Jack'],
+			name_variable: {
+				definition: {
+					type: Acl.VariableType.condition,
+				},
+				value: [{ in: ['John', 'Jack'] }],
+			},
 		},
 		query: GQL`
         mutation {

package/tests/cases/integration/graphQlRequests/query/acl/fieldRestrictedByLocale.test.ts

@@ -45,7 +45,12 @@ test('querying id and title', async () => {
 		schema: schema,
 		permissions: permissions,
 		variables: {
-			localeVariable: ['cs'],
+			localeVariable: {
+				definition: {
+					type: Acl.VariableType.condition,
+				},
+				value: [{ in: ['cs'] }],
+			},
 		},
 		query: GQL`
         query {
@@ -121,7 +126,12 @@ test('querying with extra where', async () => {
 		schema: schema,
 		permissions: permissions,
 		variables: {
-			localeVariable: ['cs'],
+			localeVariable: {
+				definition: {
+					type: Acl.VariableType.condition,
+				},
+				value: [{ in: ['cs'] }],
+			},
 		},
 		query: GQL`
         query {
@@ -167,7 +177,12 @@ test('querying only id', async () => {
 		schema: schema,
 		permissions: permissions,
 		variables: {
-			localeVariable: ['cs'],
+			localeVariable: {
+				definition: {
+					type: Acl.VariableType.condition,
+				},
+				value: [{ in: ['cs'] }],
+			},
 		},
 		query: GQL`
         query {
@@ -239,7 +254,12 @@ test('querying on nested field', async () => {
 		schema: schema,
 		permissions: permissions,
 		variables: {
-			localeVariable: ['cs'],
+			localeVariable: {
+				definition: {
+					type: Acl.VariableType.condition,
+				},
+				value: [{ in: ['cs'] }],
+			},
 		},
 		query: GQL`
         query {

package/tests/cases/integration/graphQlRequests/query/acl/nestedPredicate.test.ts

@@ -58,7 +58,12 @@ test('querying post + author name', async () => {
 		schema: schema,
 		permissions: permissions,
 		variables: {
-			countryVariable: ['Czechia'],
+			countryVariable: {
+				definition: {
+					type: Acl.VariableType.condition,
+				},
+				value: [{ in: ['Czechia'] }],
+			},
 		},
 		query: GQL`
         query {

package/tests/cases/integration/graphQlRequests/update/acl/aclUpdate.test.ts

@@ -1,7 +1,7 @@
 import { test } from 'vitest'
 import { execute, failedTransaction, sqlTransaction } from '../../../../../src/test'
 import { SchemaBuilder } from '@contember/schema-definition'
-import { Model } from '@contember/schema'
+import { Acl, Model } from '@contember/schema'
 import { GQL, SQL } from '../../../../../src/tags'
 import { testUuid } from '../../../../../src/testUuid'
 
@@ -35,7 +35,12 @@ test('update name', async () => {
 			},
 		},
 		variables: {
-			name_variable: ['John', 'Jack'],
+			name_variable: {
+				definition: {
+					type: Acl.VariableType.condition,
+				},
+				value: [{ in: ['John', 'Jack'] }],
+			},
 		},
 		executes: [
 			...sqlTransaction([
@@ -98,7 +103,12 @@ test('update name - denied', async () => {
 			},
 		},
 		variables: {
-			name_variable: ['John', 'Jack'],
+			name_variable: {
+				definition: {
+					type: Acl.VariableType.condition,
+				},
+				value: [{ in: ['John', 'Jack'] }],
+			},
 		},
 		executes: [
 			...failedTransaction([
@@ -176,8 +186,18 @@ test('update m:n', async () => {
 			},
 		},
 		variables: {
-			post_name_variable: ['Lorem ipsum', 'Dolor sit'],
-			category_name_variable: ['foo', 'bar'],
+			post_name_variable: {
+				definition: {
+					type: Acl.VariableType.condition,
+				},
+				value: [{ in: ['Lorem ipsum', 'Dolor sit'] }],
+			},
+			category_name_variable: {
+				definition: {
+					type: Acl.VariableType.condition,
+				},
+				value: [{ in: ['foo', 'bar'] }],
+			},
 		},
 		query: GQL`mutation  {
           updatePost(by: {id: "${testUuid(1)}"}, data: {categories: [

package/tests/cases/unit/aclVariablesFactory.test.ts

@@ -5,13 +5,14 @@ import { testUuid } from '@contember/engine-api-tester'
 
 describe('create acl variables', () => {
 
+	const definition: Acl.EntityVariable = { type: Acl.VariableType.entity, entityName: 'Author' }
 	it('prefix from memberships', () => {
 		assert.deepStrictEqual(createAclVariables({
 			roles: {
 				author: {
 					stages: '*',
 					variables: {
-						authorID: { type: Acl.VariableType.entity, entityName: 'Author' },
+						authorID: definition,
 					},
 					entities: {
 					},
@@ -22,7 +23,7 @@ describe('create acl variables', () => {
 			personId: null,
 			memberships: [{ role: 'author', variables: [{ name: 'authorID', values: [testUuid(2)] }] }],
 		}), {
-			author__authorID: [testUuid(2)],
+			author__authorID: { definition, value: [testUuid(2)] },
 		})
 	})
 
@@ -33,7 +34,7 @@ describe('create acl variables', () => {
 				author: {
 					stages: '*',
 					variables: {
-						authorID: { type: Acl.VariableType.entity, entityName: 'Author' },
+						authorID: definition,
 					},
 					entities: {},
 				},
@@ -43,18 +44,19 @@ describe('create acl variables', () => {
 			personId: null,
 			memberships: [{ role: 'author', variables: [] }],
 		}), {
-			author__authorID: [],
+			author__authorID: { definition, value: [] },
 		})
 	})
 
 
 	it('predefined', () => {
+		const definition: Acl.PredefinedVariable = { type: Acl.VariableType.predefined, value: 'identityID' }
 		assert.deepStrictEqual(createAclVariables({
 			roles: {
 				author: {
 					stages: '*',
 					variables: {
-						authorIdentity: { type: Acl.VariableType.predefined, value: 'identityID' },
+						authorIdentity: definition,
 					},
 					entities: {},
 				},
@@ -64,7 +66,7 @@ describe('create acl variables', () => {
 			personId: null,
 			memberships: [{ role: 'author', variables: [] }],
 		}), {
-			author__authorIdentity: [testUuid(1)],
+			author__authorIdentity: { definition, value: [testUuid(1)] },
 		})
 	})
 })

package/tests/cases/unit/predicatesInjector.test.ts

@@ -44,10 +44,18 @@ const permissions: Acl.Permissions = {
 
 describe('Predicates injector', () => {
 
+	const variables: Acl.VariablesMap = {
+		localeVariable: {
+			definition: {
+				type: Acl.VariableType.condition,
+			},
+			value: [{ in: ['cs'] }],
+		},
+	}
 	it('injects predicate', () => {
 		const injector = new PredicatesInjector(
 			schema,
-			new PredicateFactory(permissions, new VariableInjector(schema, { localeVariable: ['cs'] })),
+			new PredicateFactory(permissions, new VariableInjector(schema, variables)),
 		)
 		const result = injector.inject(schema.entities['PostLocale'], {})
 
@@ -59,7 +67,7 @@ describe('Predicates injector', () => {
 	it('merges predicate with explicit where', () => {
 		const injector = new PredicatesInjector(
 			schema,
-			new PredicateFactory(permissions, new VariableInjector(schema, { localeVariable: ['cs'] })),
+			new PredicateFactory(permissions, new VariableInjector(schema, variables)),
 		)
 		const result = injector.inject(schema.entities['PostLocale'], { id: { in: [1, 2] } })
 
@@ -71,9 +79,7 @@ describe('Predicates injector', () => {
 							id: { in: [1, 2] },
 						},
 						{
-							locale: {
-								in: ['cs'],
-							},
+							locale: { in: ['cs'] },
 						},
 					],
 				},
@@ -87,7 +93,7 @@ describe('Predicates injector', () => {
 	it('injects predicate to where', () => {
 		const injector = new PredicatesInjector(
 			schema,
-			new PredicateFactory(permissions, new VariableInjector(schema, { localeVariable: ['cs'] })),
+			new PredicateFactory(permissions, new VariableInjector(schema, variables)),
 		)
 
 		const result = injector.inject(schema.entities['PostLocale'], { title: { eq: 'abc' } })

package/tests/cases/unit/variableInjector.test.ts

@@ -1,7 +1,7 @@
 import { VariableInjector } from '../../../src/acl'
 import { SchemaBuilder } from '@contember/schema-definition'
-import { Model } from '@contember/schema'
-import { describe, it, assert } from 'vitest'
+import { Acl, Model } from '@contember/schema'
+import { assert, describe, it } from 'vitest'
 
 describe('Variable injector', () => {
 
@@ -17,9 +17,21 @@ describe('Variable injector', () => {
 			)
 			.buildSchema()
 
+		const ids = ['91528a5c-839b-4114-9952-d661914a607f', '1e2f3937-a0b1-4105-8aae-6da8ac9fc146']
 		const injector = new VariableInjector(schema, {
-			site: [1, 2],
-			locale: 'cs',
+			site: {
+				definition: {
+					type: Acl.VariableType.entity,
+					entityName: 'Site',
+				},
+				value: ids,
+			},
+			locale: {
+				definition: {
+					type: Acl.VariableType.condition,
+				},
+				value: [{ eq: 'cs' }],
+			},
 		})
 		const result = injector.inject(schema.entities['PostLocale'], {
 			or: [
@@ -53,7 +65,7 @@ describe('Variable injector', () => {
 					and: [
 						{
 							post: {
-								site: { id: { in: [1, 2] } },
+								site: { id: { in: ids } },
 							},
 						},
 						{

package/tests/src/testGraphql.ts

@@ -13,7 +13,9 @@ export const executeGraphQlTest = async (test: Test) => {
 	const rawResponse = await graphql(test.schema, test.query, null, test.context, test.queryVariables)
 	const response = JSON.parse(JSON.stringify(rawResponse))
 	if ('errors' in rawResponse) {
-		console.error((rawResponse.errors as any)[0])
+		if (rawResponse.errors?.length === 1 && 'originalError' in (rawResponse.errors as any)[0]) {
+			throw (rawResponse.errors as any)[0].originalError
+		}
 		rawResponse.errors = (rawResponse.errors as any).map(({ message }: any) => ({ message }))
 	}
 	assert.deepStrictEqual(response, test.return)