@contember/engine-tenant-api 2.1.0-alpha.13 → 2.1.0-alpha.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/development/src/model/authorization/MembershipMatcher.cjs +6 -0
- package/dist/development/src/model/authorization/MembershipMatcher.cjs.map +1 -1
- package/dist/development/src/model/authorization/MembershipMatcher.js +6 -0
- package/dist/development/src/model/authorization/MembershipMatcher.js.map +1 -1
- package/dist/development/src/model/service/MembershipValidator.cjs +1 -1
- package/dist/development/src/model/service/MembershipValidator.cjs.map +1 -1
- package/dist/development/src/model/service/MembershipValidator.js +1 -1
- package/dist/development/src/model/service/MembershipValidator.js.map +1 -1
- package/dist/production/src/model/authorization/MembershipMatcher.cjs +6 -0
- package/dist/production/src/model/authorization/MembershipMatcher.cjs.map +1 -1
- package/dist/production/src/model/authorization/MembershipMatcher.js +6 -0
- package/dist/production/src/model/authorization/MembershipMatcher.js.map +1 -1
- package/dist/production/src/model/service/MembershipValidator.cjs +1 -1
- package/dist/production/src/model/service/MembershipValidator.cjs.map +1 -1
- package/dist/production/src/model/service/MembershipValidator.js +1 -1
- package/dist/production/src/model/service/MembershipValidator.js.map +1 -1
- package/dist/tests/tsconfig.tsbuildinfo +1 -1
- package/dist/types/model/authorization/MembershipMatcher.d.ts.map +1 -1
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +12 -12
- package/src/model/authorization/MembershipMatcher.ts +6 -0
- package/src/model/service/MembershipValidator.ts +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@contember/engine-tenant-api",
|
|
3
|
-
"version": "2.1.0-alpha.
|
|
3
|
+
"version": "2.1.0-alpha.14",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"main": "./dist/production/index.js",
|
|
6
6
|
"typings": "./dist/types/index.d.ts",
|
|
@@ -26,16 +26,16 @@
|
|
|
26
26
|
"generate": "gql-gen --config graphql.codegen.yml"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@contember/authorization": "2.1.0-alpha.
|
|
30
|
-
"@contember/config-loader": "2.1.0-alpha.
|
|
31
|
-
"@contember/database": "2.1.0-alpha.
|
|
32
|
-
"@contember/database-migrations": "2.1.0-alpha.
|
|
33
|
-
"@contember/dic": "2.1.0-alpha.
|
|
34
|
-
"@contember/graphql-utils": "2.1.0-alpha.
|
|
35
|
-
"@contember/logger": "2.1.0-alpha.
|
|
36
|
-
"@contember/schema": "2.1.0-alpha.
|
|
37
|
-
"@contember/schema-utils": "2.1.0-alpha.
|
|
38
|
-
"@contember/typesafe": "2.1.0-alpha.
|
|
29
|
+
"@contember/authorization": "2.1.0-alpha.14",
|
|
30
|
+
"@contember/config-loader": "2.1.0-alpha.14",
|
|
31
|
+
"@contember/database": "2.1.0-alpha.14",
|
|
32
|
+
"@contember/database-migrations": "2.1.0-alpha.14",
|
|
33
|
+
"@contember/dic": "2.1.0-alpha.14",
|
|
34
|
+
"@contember/graphql-utils": "2.1.0-alpha.14",
|
|
35
|
+
"@contember/logger": "2.1.0-alpha.14",
|
|
36
|
+
"@contember/schema": "2.1.0-alpha.14",
|
|
37
|
+
"@contember/schema-utils": "2.1.0-alpha.14",
|
|
38
|
+
"@contember/typesafe": "2.1.0-alpha.14",
|
|
39
39
|
"@graphql-tools/utils": "^10.5.5",
|
|
40
40
|
"graphql-tag": "^2.12.6",
|
|
41
41
|
"jose": "^5.8.0",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"otpauth": "^9.3.4"
|
|
46
46
|
},
|
|
47
47
|
"devDependencies": {
|
|
48
|
-
"@contember/database-tester": "2.1.0-alpha.
|
|
48
|
+
"@contember/database-tester": "2.1.0-alpha.14",
|
|
49
49
|
"@graphql-tools/schema": "^10.0.7",
|
|
50
50
|
"@types/mustache": "^4.2.5",
|
|
51
51
|
"@types/node": "^20.17.22",
|
|
@@ -12,6 +12,12 @@ export class MembershipMatcher {
|
|
|
12
12
|
|
|
13
13
|
matches(membership: Acl.Membership): boolean {
|
|
14
14
|
return this.memberships.some(invokerMembership => {
|
|
15
|
+
if (invokerMembership.matchRule === true) {
|
|
16
|
+
return true
|
|
17
|
+
}
|
|
18
|
+
if (!invokerMembership.matchRule) {
|
|
19
|
+
return false
|
|
20
|
+
}
|
|
15
21
|
const matchRule = invokerMembership.matchRule[membership.role]
|
|
16
22
|
if (!matchRule) {
|
|
17
23
|
return false
|
|
@@ -13,7 +13,7 @@ export class MembershipValidator {
|
|
|
13
13
|
if (!schema) {
|
|
14
14
|
throw new Error()
|
|
15
15
|
}
|
|
16
|
-
return this.resolver.resolve(schema.acl, memberships, MembershipResolver.UnknownIdentity).errors
|
|
16
|
+
return this.resolver.resolve(schema.acl, memberships, MembershipResolver.UnknownIdentity, false).errors
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
19
|
|