refactor: Use Components.js override for UMA authentication

Author: joachimvh

packages/css/config/default.json

@@ -18,7 +18,7 @@
     "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
-    "uma-css:config/ldp/authentication/uma.json",
+    "css:config/ldp/authentication/dpop-bearer.json",
     "uma-css:config/ldp/authorization/uma.json",
     "uma-css:config/ldp/handler/uma.json",
     "css:config/ldp/metadata-parser/default.json",
@@ -90,6 +90,22 @@
           "@id": "urn:solid-server:default:AccountStorage"
         }
       }
+    },
+    {
+      "comment": "Replace the DPoP authentication with UMA authentication.",
+      "@id": "urn:solid-server:override:AccessTokenExtractor",
+      "@type": "Override",
+      "overrideInstance": {
+        "@id": "urn:solid-server:default:AccessTokenExtractor"
+      },
+      "overrideParameters": {
+        "comment": "Extracts information from UMA access tokens.",
+        "@type": "UmaTokenExtractor",
+        "client": { "@id": "urn:solid-server:default:UmaClient" },
+        "targetExtractor": { "@id": "urn:solid-server:default:TargetExtractor" },
+        "ownerUtil": { "@id": "urn:solid-server:default:OwnerUtil" },
+        "introspect": false
+      }
     }
   ]
 }

packages/css/config/ldp/authentication/uma.json

@@ -67,7 +67,7 @@
     "demo:start": "yarn run community-solid-server -m . -c ./config/demo.json -f ./tmp -a http://localhost:4000/ -l debug"
   },
   "dependencies": {
-    "@solid/community-server": "^7.0.4",
+    "@solid/community-server": "^7.1.6",
     "@solidlab/derived-resources-component": "^1.0.2",
     "@solidlab/uma": "workspace:^",
     "@types/n3": "^1.16.4",

packages/css/package.json

@@ -62,7 +62,7 @@
   "dependencies": {
     "@httpland/authorization-parser": "^1.1.0",
     "@solid/access-token-verifier": "^1.2.0",
-    "@solid/community-server": "^7.0.4",
+    "@solid/community-server": "^7.1.6",
     "@solidlab/ucp": "workspace:^",
     "@types/n3": "^1.16.4",
     "componentsjs": "^5.5.1",

packages/uma/package.json

@@ -3610,6 +3610,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@isaacs/ttlcache@npm:^1.4.1":
+  version: 1.4.1
+  resolution: "@isaacs/ttlcache@npm:1.4.1"
+  checksum: 10c0/6921de516917b02673a58e543c2b06fd04237cbf6d089ca22d6e98defa4b1e9a48258cb071d6b581284bb497bea687320788830541511297eecbe6e93a665bbf
+  languageName: node
+  linkType: hard
+
 "@istanbuljs/load-nyc-config@npm:^1.0.0":
   version: 1.1.0
   resolution: "@istanbuljs/load-nyc-config@npm:1.1.0"
@@ -4180,12 +4187,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@solid/community-server@npm:^7.0.3, @solid/community-server@npm:^7.0.4":
-  version: 7.0.4
-  resolution: "@solid/community-server@npm:7.0.4"
+"@solid/community-server@npm:^7.0.3, @solid/community-server@npm:^7.1.6":
+  version: 7.1.7
+  resolution: "@solid/community-server@npm:7.1.7"
   dependencies:
     "@comunica/context-entries": "npm:^2.8.2"
     "@comunica/query-sparql": "npm:^2.9.0"
+    "@isaacs/ttlcache": "npm:^1.4.1"
     "@rdfjs/types": "npm:^1.1.0"
     "@solid/access-control-policy": "npm:^0.1.3"
     "@solid/access-token-verifier": "npm:^2.1.0"
@@ -4214,8 +4222,8 @@ __metadata:
     arrayify-stream: "npm:^2.0.1"
     async-lock: "npm:^1.4.0"
     bcryptjs: "npm:^2.4.3"
-    componentsjs: "npm:^5.4.2"
-    cookie: "npm:^0.5.0"
+    componentsjs: "npm:^5.5.1"
+    cookie: "npm:^0.7.0"
     cors: "npm:^2.8.5"
     cross-fetch: "npm:^4.0.0"
     ejs: "npm:^3.1.9"
@@ -4232,7 +4240,7 @@ __metadata:
     marked: "npm:^9.1.0"
     mime-types: "npm:^2.1.35"
     n3: "npm:^1.17.1"
-    nodemailer: "npm:^6.9.6"
+    nodemailer: "npm:^6.9.9"
     oidc-provider: "npm:^8.4.0"
     proper-lockfile: "npm:^4.1.2"
     pump: "npm:^3.0.0"
@@ -4254,7 +4262,7 @@ __metadata:
     yup: "npm:^1.3.2"
   bin:
     community-solid-server: bin/server.js
-  checksum: 10c0/40c6f2b0a77bbf56fadc9f75bcc1d10f97bbc04f37e26fe916363a4b21d53360a878e389031f2ddd2d0763b5d123dce8c4f7760b7d3497ec64bd70650d8c32da
+  checksum: 10c0/a9a28d268e49561508c3e24f2c337736d4ea0da9378e42e727553e292383de2d2bf0d95e422befe45527091d23a4091f2512f5dbafe494bb0c74f0ec62f92b41
   languageName: node
   linkType: hard
 
@@ -4289,7 +4297,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@solidlab/uma-css@workspace:packages/css"
   dependencies:
-    "@solid/community-server": "npm:^7.0.4"
+    "@solid/community-server": "npm:^7.1.6"
     "@solidlab/derived-resources-component": "npm:^1.0.2"
     "@solidlab/uma": "workspace:^"
     "@types/n3": "npm:^1.16.4"
@@ -4307,7 +4315,7 @@ __metadata:
   dependencies:
     "@httpland/authorization-parser": "npm:^1.1.0"
     "@solid/access-token-verifier": "npm:^1.2.0"
-    "@solid/community-server": "npm:^7.0.4"
+    "@solid/community-server": "npm:^7.1.6"
     "@solidlab/ucp": "workspace:^"
     "@types/n3": "npm:^1.16.4"
     componentsjs: "npm:^5.5.1"
@@ -6022,7 +6030,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"componentsjs@npm:^5.0.1, componentsjs@npm:^5.3.2, componentsjs@npm:^5.4.2, componentsjs@npm:^5.5.1":
+"componentsjs@npm:^5.0.1, componentsjs@npm:^5.3.2, componentsjs@npm:^5.5.1":
   version: 5.5.1
   resolution: "componentsjs@npm:5.5.1"
   dependencies:
@@ -6133,10 +6141,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cookie@npm:^0.5.0":
-  version: 0.5.0
-  resolution: "cookie@npm:0.5.0"
-  checksum: 10c0/c01ca3ef8d7b8187bae434434582288681273b5a9ed27521d4d7f9f7928fe0c920df0decd9f9d3bbd2d14ac432b8c8cf42b98b3bdd5bfe0e6edddeebebe8b61d
+"cookie@npm:^0.7.0":
+  version: 0.7.2
+  resolution: "cookie@npm:0.7.2"
+  checksum: 10c0/9596e8ccdbf1a3a88ae02cf5ee80c1c50959423e1022e4e60b91dd87c622af1da309253d8abdb258fb5e3eacb4f08e579dc58b4897b8087574eee0fd35dfa5d2
   languageName: node
   linkType: hard
 
@@ -9615,10 +9623,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nodemailer@npm:^6.9.6":
-  version: 6.9.8
-  resolution: "nodemailer@npm:6.9.8"
-  checksum: 10c0/9332587975240ac648e1295b1df15e339fcace3f7fab8af0382e7f2dd10e48296344dfa698d58f1667f220f7fe13c779d55d39144c9cd9ed6f5f559714183c75
+"nodemailer@npm:^6.9.9":
+  version: 6.10.0
+  resolution: "nodemailer@npm:6.10.0"
+  checksum: 10c0/39fd35d65b021b94c968eeac82a66dd843021b6ba53c659d01b1dd4cda73b6a2f96e20facfe500efa4b8d3f1cb23df10245c6c86b2bde5f806691ed17ce87826
   languageName: node
   linkType: hard