Skip to content

Commit 5093189

Browse files
committed
refactor: Use Components.js override for JWKS handler
1 parent 3fc44d4 commit 5093189

5 files changed

Lines changed: 25 additions & 62 deletions

File tree

packages/css/config/default.json

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"css:config/app/init/initialize-intro.json",
88
"css:config/app/main/default.json",
99
"css:config/app/variables/default.json",
10-
"uma-css:config/http/handler/default.json",
10+
"css:config/http/handler/default.json",
1111
"css:config/http/middleware/default.json",
1212
"css:config/http/notifications/all.json",
1313
"css:config/http/server-factory/http.json",
@@ -57,6 +57,25 @@
5757
"podCreator": { "@id": "urn:solid-server:default:PodCreator" },
5858
"configFilePath": { "@id": "urn:solid-server:default:variable:seedConfig" }
5959
}
60+
},
61+
{
62+
"comment": "Add JWKS handler to list of base handlers so the server exposes its public key.",
63+
"@id": "urn:solid-server:override:BaseHttpHandler",
64+
"@type": "Override",
65+
"overrideInstance": { "@id": "urn:solid-server:default:BaseHttpHandler" },
66+
"overrideSteps": [{
67+
"@type": "OverrideListInsertAt",
68+
"overrideParameter": { "@id": "WaterfallHandler:_handlers" },
69+
"overrideTarget": 0,
70+
"overrideValue": {
71+
"@id": "urn:solid-server:default:JwksHandler",
72+
"@type": "JwksHandler",
73+
"path": "/.well-known/jwks.json",
74+
"generator": {
75+
"@id": "urn:solid-server:default:JwkGenerator"
76+
}
77+
}
78+
}]
6079
}
6180
]
6281
}

packages/css/config/http/handler/default.json

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

packages/css/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"@solidlab/derived-resources-component": "^1.0.2",
7272
"@solidlab/uma": "workspace:^",
7373
"@types/n3": "^1.16.4",
74-
"componentsjs": "^5.4.2",
74+
"componentsjs": "^5.5.1",
7575
"fetch-retry": "^6.0.0",
7676
"http-message-signatures": "^1.0.4",
7777
"jose": "^5.2.2",

packages/uma/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"@solid/community-server": "^7.0.4",
6666
"@solidlab/ucp": "workspace:^",
6767
"@types/n3": "^1.16.4",
68-
"componentsjs": "^5.4.2",
68+
"componentsjs": "^5.5.1",
6969
"get-jwks": "^9.0.1",
7070
"http-message-signatures": "^1.0.4",
7171
"jose": "^5.2.2",

yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4293,7 +4293,7 @@ __metadata:
42934293
"@solidlab/derived-resources-component": "npm:^1.0.2"
42944294
"@solidlab/uma": "workspace:^"
42954295
"@types/n3": "npm:^1.16.4"
4296-
componentsjs: "npm:^5.4.2"
4296+
componentsjs: "npm:^5.5.1"
42974297
fetch-retry: "npm:^6.0.0"
42984298
http-message-signatures: "npm:^1.0.4"
42994299
jose: "npm:^5.2.2"
@@ -4310,7 +4310,7 @@ __metadata:
43104310
"@solid/community-server": "npm:^7.0.4"
43114311
"@solidlab/ucp": "workspace:^"
43124312
"@types/n3": "npm:^1.16.4"
4313-
componentsjs: "npm:^5.4.2"
4313+
componentsjs: "npm:^5.5.1"
43144314
get-jwks: "npm:^9.0.1"
43154315
http-message-signatures: "npm:^1.0.4"
43164316
jose: "npm:^5.2.2"
@@ -6022,7 +6022,7 @@ __metadata:
60226022
languageName: node
60236023
linkType: hard
60246024

6025-
"componentsjs@npm:^5.0.1, componentsjs@npm:^5.3.2, componentsjs@npm:^5.4.2":
6025+
"componentsjs@npm:^5.0.1, componentsjs@npm:^5.3.2, componentsjs@npm:^5.4.2, componentsjs@npm:^5.5.1":
60266026
version: 5.5.1
60276027
resolution: "componentsjs@npm:5.5.1"
60286028
dependencies:

0 commit comments

Comments
 (0)