Skip to content

Commit d7e0310

Browse files
termontwoutertermontwouter
committed
feat: big architecture rewrite
1 parent 83a3b3f commit d7e0310

File tree

80 files changed

+1221
-831
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1221
-831
lines changed

‎packages/uma/.componentsignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"Authorization",
55
"Error",
66
"EventEmitter",
7+
"NodeJS.Dict",
78
"Permission",
89
"Principal",
910
"ResourceDescription",

‎packages/uma/config/credentials/verifiers/default.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"@context": [
3+
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma/^0.0.0/components/context.jsonld"
4+
],
5+
"@graph": [
6+
{
7+
"@id": "urn:uma:default:Verifier",
8+
"@type": "TypedVerifier",
9+
"verifiers": [
10+
{
11+
"TypedVerifier:_verifiers_key": "urn:solidlab:uma:claims:formats:webid",
12+
"TypedVerifier:_verifiers_value": {
13+
"@id": "urn:uma:default:UnsecureVerifier",
14+
"@type": "UnsecureVerifier"
15+
}
16+
},
17+
{
18+
"TypedVerifier:_verifiers_key": "http://openid.net/specs/openid-connect-core-1_0.html#IDToken",
19+
"TypedVerifier:_verifiers_value": {
20+
"@id": "urn:uma:default:SolidOidcVerifier",
21+
"@type": "SolidOidcVerifier"
22+
}
23+
}
24+
]
25+
}
26+
]
27+
}

‎packages/uma/config/default.json‎

Lines changed: 21 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,20 @@
33
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma/^0.0.0/components/context.jsonld"
44
],
55
"import": [
6-
"sai-uma:config/authz/public-ns.json",
7-
"sai-uma:config/discovery/default.json",
8-
"sai-uma:config/introspection/default.json",
9-
"sai-uma:config/keys/default.json",
10-
"sai-uma:config/resource/default.json",
11-
"sai-uma:config/ticket/default.json",
12-
"sai-uma:config/token/default.json",
6+
"sai-uma:config/credentials/verifiers/default.json",
7+
"sai-uma:config/dialog/negotiators/default.json",
8+
"sai-uma:config/policies/authorizers/public-ns.json",
9+
"sai-uma:config/resources/storage/default.json",
10+
"sai-uma:config/routes/discovery.json",
11+
"sai-uma:config/routes/introspection.json",
12+
"sai-uma:config/routes/keys.json",
13+
"sai-uma:config/routes/resources.json",
14+
"sai-uma:config/routes/tickets.json",
15+
"sai-uma:config/routes/tokens.json",
16+
"sai-uma:config/tickets/storage/default.json",
17+
"sai-uma:config/tickets/strategy/claim-elimination.json",
18+
"sai-uma:config/tokens/factory/default.json",
19+
"sai-uma:config/tokens/storage/default.json",
1320
"sai-uma:config/variables/default.json"
1421
],
1522
"@graph": [
@@ -34,27 +41,13 @@
3441
"@type": "HttpHandlerController",
3542
"label": "ControllerList",
3643
"routes": [
37-
{
38-
"@id": "urn:uma:default:UmaConfigRoute"
39-
},
40-
{
41-
"@id": "urn:uma:default:JwksRoute"
42-
},
43-
{
44-
"@id": "urn:uma:default:TokenRoute"
45-
},
46-
{
47-
"@id": "urn:uma:default:PermissionRegistrationRoute"
48-
},
49-
{
50-
"@id": "urn:uma:default:ResourceRegistrationRoute"
51-
},
52-
{
53-
"@id": "urn:uma:default:ResourceRegistrationOpsRoute"
54-
},
55-
{
56-
"@id": "urn:uma:default:IntrospectionRoute"
57-
}
44+
{ "@id": "urn:uma:default:UmaConfigRoute" },
45+
{ "@id": "urn:uma:default:JwksRoute" },
46+
{ "@id": "urn:uma:default:TokenRoute" },
47+
{ "@id": "urn:uma:default:PermissionRegistrationRoute" },
48+
{ "@id": "urn:uma:default:ResourceRegistrationRoute" },
49+
{ "@id": "urn:uma:default:ResourceRegistrationOpsRoute" },
50+
{ "@id": "urn:uma:default:IntrospectionRoute" }
5851
]
5952
}
6053
],

‎packages/uma/config/dialog/negotiators/default.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"@context": [
3+
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma/^0.0.0/components/context.jsonld"
4+
],
5+
"@graph": [
6+
{
7+
"@id": "urn:uma:default:Negotiator",
8+
"@type": "BaseNegotiator",
9+
"verifier": { "@id": "urn:uma:default:Verifier" },
10+
"ticketStore": { "@id": "urn:uma:default:TicketStore" },
11+
"ticketingStrategy": { "@id": "urn:uma:default:TicketingStrategy" },
12+
"tokenFactory": { "@id": "urn:uma:default:TokenFactory" }
13+
}
14+
]
15+
}

‎packages/uma/config/discovery/default.json‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎packages/uma/config/keys/default.json‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

packages/uma/config/authz/all.json renamed to packages/uma/config/policies/authorizers/all.json

File renamed without changes.

packages/uma/config/authz/public-ns.json renamed to packages/uma/config/policies/authorizers/public-ns.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@
77
"@id": "urn:uma:default:Authorizer",
88
"@type": "PublicNamespaceAuthorizer",
99
"authorizer": {
10-
"@type": "NoneAuthorizer"
10+
"@type": "WebIdAuthorizer",
11+
"webids": [
12+
"https://woslabbi.pod.knows.idlab.ugent.be/profile/card#me"
13+
],
14+
"authorizer": {
15+
"@type": "NoneAuthorizer"
16+
}
1117
}
1218
}
1319
]

‎packages/uma/config/resources/storage/default.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"@context": [
3+
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma/^0.0.0/components/context.jsonld"
4+
],
5+
"@graph": [
6+
{
7+
"@id": "urn:uma:default:ResourceRegistrationStore",
8+
"@type": "MemoryStore"
9+
}
10+
]
11+
}

‎packages/uma/config/routes/discovery.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"@context": [
3+
"https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma/^0.0.0/components/context.jsonld"
4+
],
5+
"@graph": [
6+
{
7+
"@id": "urn:uma:default:UmaConfigRoute",
8+
"@type": "HttpHandlerRoute",
9+
"operations": [
10+
{
11+
"@type": "HttpHandlerOperation",
12+
"method": "GET",
13+
"publish": true
14+
}
15+
],
16+
"handler": {
17+
"@type": "ConfigRequestHandler",
18+
"baseUrl": { "@id": "urn:uma:variables:baseUrl" }
19+
},
20+
"path": "/uma/.well-known/uma2-configuration"
21+
}
22+
]
23+
}

0 commit comments

Comments
 (0)