Revert "feat: derived resources (#36)"

This reverts commit 1839a7c.

package.json

@@ -58,11 +58,10 @@
     "start:all": "yarn workspaces foreach --exclude . -A -pi run start",
     "script:public": "yarn exec ts-node ./scripts/test-public.ts",
     "script:private": "yarn exec ts-node ./scripts/test-private.ts",
-    "script:derived": "yarn exec ts-node ./scripts/test-derived.ts",
     "script:registration": "yarn exec ts-node ./scripts/test-registration.ts",
     "script:ucp-enforcement": "yarn exec ts-node ./scripts/test-ucp-enforcement.ts",
     "script:uma-ucp": "yarn exec ts-node ./scripts/test-uma-ucp.ts",
-    "script:flow": "yarn run script:public && yarn run script:private && yarn run script:derived && yarn run script:uma-ucp && yarn run script:registration && yarn run script:ucp-enforcement"
+    "script:flow": "yarn run script:public && yarn run script:private && yarn run script:uma-ucp && yarn run script:registration && yarn run script:ucp-enforcement"
   },
   "devDependencies": {
     "@commitlint/cli": "^16.1.0",

packages/css/config/seed.json

@@ -5,44 +5,14 @@
     "authz": {
       "server": "http://localhost:4000/uma"
     },
-    "pods": [{ 
-      "name": "alice",
-      "settings": {
-        "name": "Alice",
-        "umaServer": "http://localhost:4000/uma"
-      }
-    }]
+    "pods": [ { "name": "alice" } ]
   },
   {
     "email": "[email protected]",
     "password": "abc123",
     "authz": {
       "server": "http://localhost:4000/uma"
     },
-    "pods": [
-      {
-        "name": "bob",
-        "settings": {
-          "name": "Bob",
-          "umaServer": "http://localhost:4000/uma"
-        }
-      }
-    ]
-  },
-  {
-    "email": "[email protected]",
-    "password": "abc123",
-    "authz": {
-      "server": "http://localhost:4000/uma"
-    },
-    "pods": [
-      {
-        "name": "demo",
-        "settings": {
-          "name": "Demo",
-          "umaServer": "http://localhost:4000/uma"
-        }
-      }
-    ]
+    "pods": [ { "name": "bob" } ]
   }
 ]

packages/css/package.json

@@ -60,11 +60,10 @@
     "build:ts": "yarn run -T tsc",
     "build:components": "yarn run -T componentsjs-generator -r uma-css -s src/ -c dist/components -i .componentsignore --lenient",
     "test": "yarn run -T jest --coverage",
-    "start": "yarn run community-solid-server -m . -c ./config/default.json ./config/derived.json ./config/demo.json --seedConfig ./config/seed.json"
+    "start": "yarn run community-solid-server -m . -c ./config/default.json --seedConfig ./config/seed.json"
   },
   "dependencies": {
     "@solid/community-server": "^7.0.2",
-    "@solidlab/derived-resources-component": "^1.0.1",
     "@solidlab/uma": "workspace:^",
     "componentsjs": "^5.4.2",
     "cross-fetch": "^4.0.0",

packages/css/src/uma/ResourceRegistrar.ts

@@ -1,7 +1,7 @@
-import type { UmaClient } from '../uma/UmaClient';
 import type { ResourceIdentifier, MonitoringStore } from '@solid/community-server';
 import { AS, getLoggerFor, StaticHandler } from '@solid/community-server';
 import { OwnerUtil } from '../util/OwnerUtil';
+import type { UmaClient } from '../uma/UmaClient';
 
 export class ResourceRegistrar extends StaticHandler {
   protected readonly logger = getLoggerFor(this);

packages/css/src/uma/UmaClient.ts

@@ -1,12 +1,11 @@
-import crypto from 'node:crypto';
-import {
-  type KeyValueStorage, type ResourceIdentifier,
-  AccessMap, getLoggerFor, InternalServerError, JwkGenerator,
-} from "@solid/community-server";
-import type { Fetcher } from "../util/fetch/Fetcher";
-import type { ResourceDescription } from '@solidlab/uma';
-import { httpbis, type SigningKey, type Request as SignRequest } from 'http-message-signatures';
+import type { KeyValueStorage, Representation, ResourceIdentifier } from "@solid/community-server";
+import { AccessMap, getLoggerFor, InternalServerError, JwkGenerator, NotFoundHttpError } from "@solid/community-server";
 import { JWTPayload, decodeJwt, createRemoteJWKSet, jwtVerify, JWTVerifyOptions } from "jose";
+import { httpbis, type SigningKey, type Request as SignRequest } from 'http-message-signatures';
+import fetch from 'cross-fetch';
+import type { Fetcher } from "../util/fetch/Fetcher";
+import crypto from 'node:crypto';
+import type { ResourceDescription } from "@solidlab/uma";
 
 export interface Claims {
   [key: string]: unknown;
@@ -72,9 +71,9 @@ export class UmaClient {
    */
   constructor(
     protected baseUrl: string,
-    protected umaIdStore: KeyValueStorage<string, string>,
     protected fetcher: Fetcher,
     protected keyGen: JwkGenerator, 
+    protected umaIdStore: KeyValueStorage<string, string>,
     protected options: UmaVerificationOptions = {},
   ) {}
 

packages/uma/src/dialog/BaseNegotiator.ts

@@ -95,9 +95,7 @@ export class BaseNegotiator implements Negotiator {
       return stored;
     }
 
-    if (!permissions) {
-      this.error(BadRequestHttpError, 'A token request without existing ticket should include requested permissions.');
-    }
+    if (!permissions) this.error(BadRequestHttpError, 'The provided ticket is not valid.');
 
     return await this.ticketingStrategy.initializeTicket(permissions);
   }

packages/uma/src/dialog/Input.ts

@@ -5,7 +5,7 @@ import { Permission } from "../views/Permission";
  * A ReType constant for {@link DialogInput:type}.
  */
 export const DialogInput = ({
-  ticket: $(string),
+  ticket: string,
   claim_token: $(string),
   claim_token_format: $(string), // TODO: switch to array of claims objects with unknown structure
   pct: $(string),