feat: Use CSS KeyValueStorage

Author: joachimvh

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

@@ -1,11 +1,11 @@
 {
   "@context": [
-    "https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma/^0.0.0/components/context.jsonld"
+    "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^7.0.0/components/context.jsonld"
   ],
   "@graph": [
     {
       "@id": "urn:uma:default:ResourceRegistrationStore",
-      "@type": "MemoryStore"
+      "@type": "MemoryMapStorage"
     }
   ]
-}
+}

packages/uma/config/tickets/storage/default.json

@@ -1,11 +1,11 @@
 {
   "@context": [
-    "https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma/^0.0.0/components/context.jsonld"
+    "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^7.0.0/components/context.jsonld"
   ],
   "@graph": [
     {
       "@id": "urn:uma:default:TicketStore",
-      "@type": "MemoryStore"
+      "@type": "MemoryMapStorage"
     }
   ]
-}
+}

packages/uma/config/tokens/storage/default.json

@@ -1,11 +1,11 @@
 {
   "@context": [
-    "https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma/^0.0.0/components/context.jsonld"
+    "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^7.0.0/components/context.jsonld"
   ],
   "@graph": [
     {
       "@id": "urn:uma:default:TokenStore",
-      "@type": "MemoryStore"
+      "@type": "MemoryMapStorage"
     }
   ]
-}
+}

packages/uma/src/dialog/BaseNegotiator.ts

@@ -6,10 +6,9 @@ import { NeedInfoError } from '../errors/NeedInfoError';
 import { DialogInput } from './Input';
 import { DialogOutput } from './Output';
 import { reType } from '../util/ReType';
-import { KeyValueStore } from '../util/storage/models/KeyValueStore';
 import { TicketingStrategy } from '../ticketing/strategy/TicketingStrategy';
 import { v4 } from 'uuid';
-import { BadRequestHttpError, ForbiddenHttpError, getLoggerFor } from '@solid/community-server';
+import { BadRequestHttpError, ForbiddenHttpError, getLoggerFor, KeyValueStorage } from '@solid/community-server';
 
 /**
  * A concrete Negotiator that verifies incoming Claims and processes Tickets
@@ -21,13 +20,13 @@ export class BaseNegotiator implements Negotiator {
   /**
    * Construct a new Negotiator
    * @param verifier - The Verifier used to verify Claims of incoming Credentials.
-   * @param ticketStore - A KeyValueStore to track Tickets.
+   * @param ticketStore - A KeyValueStorage to track Tickets.
    * @param ticketManager - The strategy describing the life cycle of a Ticket.
    * @param tokenFactory - A factory for minting Access Tokens.
    */
   public constructor(
     protected verifier: Verifier,
-    protected ticketStore: KeyValueStore<string, Ticket>,
+    protected ticketStore: KeyValueStorage<string, Ticket>,
     protected ticketingStrategy: TicketingStrategy,
     protected tokenFactory: TokenFactory,
   ) {}

packages/uma/src/index.ts

@@ -52,11 +52,6 @@ export * from './views/ScopeDescription';
 
 /* Replace the following with CSS types */
 
-// Storage
-export * from './util/storage/MemoryStore';
-export * from './util/storage/models/KeyValueStore';
-export * from './util/storage/models/TypedKeyValueStore';
-
 // HTTP
 export * from './util/http/identifier/BaseTargetExtractor';
 export * from './util/http/models/Handler';

packages/uma/src/routes/Introspection.ts

@@ -1,14 +1,13 @@
 import { HttpHandlerContext } from '../util/http/models/HttpHandlerContext';
 import { HttpHandler } from '../util/http/models/HttpHandler';
 import { HttpHandlerResponse } from '../util/http/models/HttpHandlerResponse';
-import { KeyValueStore } from '../util/storage/models/KeyValueStore';
 import { AccessToken } from '../tokens/AccessToken';
 import { JwtTokenFactory } from '../tokens/JwtTokenFactory';
 import { SerializedToken } from '../tokens/TokenFactory';
 import {
   BadRequestHttpError,
   getLoggerFor,
-  JwkGenerator,
+  JwkGenerator, KeyValueStorage,
   UnauthorizedHttpError,
   UnsupportedMediaTypeHttpError
 } from '@solid/community-server';
@@ -27,7 +26,7 @@ export class IntrospectionHandler implements HttpHandler {
    * @param jwtTokenFactory - The factory with which to produce JWT representations of the tokens.
    */
   constructor(
-    private readonly tokenStore: KeyValueStore<string, AccessToken>,
+    private readonly tokenStore: KeyValueStorage<string, AccessToken>,
     private readonly jwtTokenFactory: JwtTokenFactory,
     private readonly keyGen: JwkGenerator,
   ) {}
@@ -74,7 +73,7 @@ export class IntrospectionHandler implements HttpHandler {
     const token = await this.tokenStore.get(opaque);
     if (!token) throw new Error('Token not found.');
 
-    return this.jwtTokenFactory.serialize(Object.assign(token, { active: true }));
+    return this.jwtTokenFactory.serialize({ ...token, active: true } as AccessToken);
   }
 
 }

packages/uma/src/routes/ResourceRegistration.ts

@@ -2,13 +2,14 @@ import {
   BadRequestHttpError,
   createErrorMessage,
   getLoggerFor,
+  KeyValueStorage,
   MethodNotAllowedHttpError,
-  UnauthorizedHttpError, UnsupportedMediaTypeHttpError
+  UnauthorizedHttpError,
+  UnsupportedMediaTypeHttpError
 } from '@solid/community-server';
 import {HttpHandler} from '../util/http/models/HttpHandler';
 import {HttpHandlerContext} from '../util/http/models/HttpHandlerContext';
 import {HttpHandlerResponse} from '../util/http/models/HttpHandlerResponse';
-import {KeyValueStore} from '../util/storage/models/KeyValueStore';
 import {v4} from 'uuid';
 import { HttpHandlerRequest } from '../util/http/models/HttpHandlerRequest';
 import { ResourceDescription } from '../views/ResourceDescription';
@@ -30,7 +31,7 @@ export class ResourceRegistrationRequestHandler implements HttpHandler {
    * @param {RequestingPartyRegistration[]} resourceServers - Pod Servers to be registered with the UMA AS
    */
   constructor(
-    private readonly resourceStore: KeyValueStore<string, ResourceDescription>,
+    private readonly resourceStore: KeyValueStorage<string, ResourceDescription>,
   ) {}
 
   /**

packages/uma/src/routes/Ticket.ts

@@ -1,7 +1,7 @@
 import {
   BadRequestHttpError,
   createErrorMessage,
-  getLoggerFor, UnauthorizedHttpError,
+  getLoggerFor, KeyValueStorage, UnauthorizedHttpError,
   UnsupportedMediaTypeHttpError
 } from '@solid/community-server';
 import { HttpHandler } from '../util/http/models/HttpHandler';
@@ -10,7 +10,6 @@ import { HttpHandlerResponse } from '../util/http/models/HttpHandlerResponse';
 import { array, reType } from '../util/ReType';
 import { Permission } from '../views/Permission';
 import { Ticket } from '../ticketing/Ticket';
-import { KeyValueStore } from '../util/storage/models/KeyValueStore';
 import { TicketingStrategy } from '../ticketing/strategy/TicketingStrategy';
 import { v4 } from 'uuid';
 import { verifyRequest } from '../util/HttpMessageSignatures';
@@ -33,7 +32,7 @@ export class TicketRequestHandler implements HttpHandler {
    */
   constructor(
     private readonly ticketingStrategy: TicketingStrategy,
-    private readonly ticketStore: KeyValueStore<string, Ticket>,
+    private readonly ticketStore: KeyValueStorage<string, Ticket>,
   ) {}
 
   /**

packages/uma/src/tokens/OpaqueTokenFactory.ts

@@ -1,6 +1,6 @@
+import { KeyValueStorage } from '@solid/community-server';
 import {AccessToken} from './AccessToken';
 import {SerializedToken, TokenFactory} from './TokenFactory';
-import {KeyValueStore} from '../util/storage/models/KeyValueStore';
 import {v4} from 'uuid';
 
 /**
@@ -9,9 +9,9 @@ import {v4} from 'uuid';
 export class OpaqueTokenFactory extends TokenFactory {
   /**
    *
-   * @param {KeyValueStore<string, AccessToken>} tokenStore
+   * @param {KeyValueStorage<string, AccessToken>} tokenStore
    */
-  constructor(private tokenStore: KeyValueStore<string, AccessToken>) {
+  constructor(private tokenStore: KeyValueStorage<string, AccessToken>) {
     super();
   }