@contember/engine-content-api 1.0.0-alpha.1 → 1.0.0-alpha.10

package/package.json

@@ -1,27 +1,28 @@
 {
   "name": "@contember/engine-content-api",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.10",
   "license": "Apache-2.0",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
   "scripts": {
-    "prepare": "gql-gen --config graphql.codegen.yml && mkdir -p dist && find ./tests/ -name '*.gql' -type f -exec cp --parents {} ./dist \\;",
+    "build-copy": "mkdir -p dist && find ./tests/ -name '*.gql' -type f -exec cp --parents {} ./dist \\;",
+    "generate": "gql-gen --config graphql.codegen.yml",
     "test": "uvu dist/tests/cases/ \\.js$"
   },
   "dependencies": {
-    "@contember/database": "^1.0.0-alpha.1",
-    "@contember/dic": "^1.0.0-alpha.1",
-    "@contember/engine-common": "^1.0.0-alpha.1",
-    "@contember/graphql-utils": "^1.0.0-alpha.1",
-    "@contember/schema": "^1.0.0-alpha.1",
-    "@contember/schema-utils": "^1.0.0-alpha.1",
+    "@contember/database": "^1.0.0-alpha.10",
+    "@contember/dic": "^1.0.0-alpha.10",
+    "@contember/engine-common": "^1.0.0-alpha.10",
+    "@contember/graphql-utils": "^1.0.0-alpha.10",
+    "@contember/schema": "^1.0.0-alpha.10",
+    "@contember/schema-utils": "^1.0.0-alpha.10",
     "@graphql-tools/schema": "^7.1.5",
     "graphql-tag": "^2.12.5"
   },
   "devDependencies": {
-    "@contember/database-tester": "^1.0.0-alpha.1",
-    "@contember/engine-api-tester": "^1.0.0-alpha.1",
-    "@contember/schema-definition": "^1.0.0-alpha.1",
+    "@contember/database-tester": "^1.0.0-alpha.10",
+    "@contember/engine-api-tester": "^1.0.0-alpha.10",
+    "@contember/schema-definition": "^1.0.0-alpha.10",
     "@graphql-codegen/cli": "^1.15.2",
     "@graphql-codegen/typescript": "^1.15.2",
     "@graphql-codegen/typescript-operations": "^1.15.2",

package/src/acl/VariableUtils.ts

@@ -1,17 +1,41 @@
 import { Acl } from '@contember/schema'
+import { getRoleVariables } from '@contember/schema-utils'
 
 type Memberships = readonly { role: string; variables: readonly { name: string; values: readonly string[] }[] }[]
 
-export const flattenVariables = (memberships: Memberships): Acl.VariablesMap => {
-	return memberships.reduce(
-		(acc, membership) => ({
-			...acc,
-			...membership.variables.reduce(
-				(acc, { name, values }) => ({ ...acc, [prefixVariable(membership.role, name)]: values }),
-				{},
-			),
-		}),
-		{},
+export const createAclVariables = (
+	aclSchema: Acl.Schema,
+	identity: {
+		identityId: string
+		personId: string | null
+		memberships: Memberships
+	},
+): Acl.VariablesMap => {
+
+	const variablesEntries = identity.memberships.flatMap(
+		membership => {
+			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]) => {
+				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] : []]
+						}
+				}
+			})
+		},
 	)
+
+	return Object.fromEntries(variablesEntries)
 }
+
 export const prefixVariable = (role: string, variableName: string) => `${role}__${variableName}`

package/src/introspection/content-schema.types.ts

@@ -141,10 +141,6 @@ export type _ValidatorArgument = {
 export type ResolverTypeWrapper<T> = Promise<T> | T
 
 
-export type ResolverWithResolve<TResult, TParent, TContext, TArgs> = {
-	resolve: ResolverFn<TResult, TParent, TContext, TArgs>
-}
-
 export type LegacyStitchingResolver<TResult, TParent, TContext, TArgs> = {
 	fragment: string
 	resolve: ResolverFn<TResult, TParent, TContext, TArgs>
@@ -157,7 +153,6 @@ export type NewStitchingResolver<TResult, TParent, TContext, TArgs> = {
 export type StitchingResolver<TResult, TParent, TContext, TArgs> = LegacyStitchingResolver<TResult, TParent, TContext, TArgs> | NewStitchingResolver<TResult, TParent, TContext, TArgs>
 export type Resolver<TResult, TParent = {}, TContext = {}, TArgs = {}> =
   | ResolverFn<TResult, TParent, TContext, TArgs>
-  | ResolverWithResolve<TResult, TParent, TContext, TArgs>
   | StitchingResolver<TResult, TParent, TContext, TArgs>
 
 export type ResolverFn<TResult, TParent, TContext, TArgs> = (

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

@@ -0,0 +1,73 @@
+import * as assert from 'uvu/assert'
+import { suite } from 'uvu'
+import { createAclVariables } from '../../../src'
+import { Acl } from '@contember/schema'
+import { testUuid } from '@contember/engine-api-tester'
+
+const createAclVariablesTest = suite('create acl variables')
+
+createAclVariablesTest('prefix from memberships', () => {
+	assert.equal(createAclVariables({
+		roles: {
+			author: {
+				stages: '*',
+				variables: {
+					authorID: { type: Acl.VariableType.entity, entityName: 'Author' },
+				},
+				entities: {
+				},
+			},
+		},
+	}, {
+		identityId: testUuid(1),
+		personId: null,
+		memberships: [{ role: 'author', variables: [{ name: 'authorID', values: [testUuid(2)] }] }],
+	}), {
+		author__authorID: [testUuid(2)],
+	})
+})
+
+
+createAclVariablesTest('undefined variable', () => {
+	assert.equal(createAclVariables({
+		roles: {
+			author: {
+				stages: '*',
+				variables: {
+					authorID: { type: Acl.VariableType.entity, entityName: 'Author' },
+				},
+				entities: {},
+			},
+		},
+	}, {
+		identityId: testUuid(1),
+		personId: null,
+		memberships: [{ role: 'author', variables: [] }],
+	}), {
+		author__authorID: [],
+	})
+})
+
+
+createAclVariablesTest('predefined', () => {
+	assert.equal(createAclVariables({
+		roles: {
+			author: {
+				stages: '*',
+				variables: {
+					authorIdentity: { type: Acl.VariableType.predefined, value: 'identityID' },
+				},
+				entities: {},
+			},
+		},
+	}, {
+		identityId: testUuid(1),
+		personId: null,
+		memberships: [{ role: 'author', variables: [] }],
+	}), {
+		author__authorIdentity: [testUuid(1)],
+	})
+})
+
+
+createAclVariablesTest.run()