refactor: Remove unused code

Author: joachimvh

packages/uma/src/index.ts

@@ -53,11 +53,8 @@ export * from './views/ScopeDescription';
 /* Replace the following with CSS types */
 
 // Storage
-export * from './util/storage/JsonFileStore';
 export * from './util/storage/MemoryStore';
 export * from './util/storage/models/KeyValueStore';
-export * from './util/storage/models/TimedKeyValueStore';
-export * from './util/storage/models/TimedTypedKeyValueStore';
 export * from './util/storage/models/TypedKeyValueStore';
 
 // HTTP

packages/uma/src/tokens/JwtTokenFactory.ts

@@ -1,7 +1,6 @@
 import { importJWK, jwtVerify, SignJWT } from 'jose';
 import { v4 } from 'uuid';
 import { BadRequestHttpError, getLoggerFor, JwkGenerator } from '@solid/community-server';
-import { isString } from '../util/StringGuard';
 import { SerializedToken , TokenFactory} from './TokenFactory';
 import { AccessToken } from './AccessToken';
 import { array, reType } from '../util/ReType';
@@ -73,8 +72,8 @@ export class JwtTokenFactory extends TokenFactory {
         throw new Error('Missing JWT parameter(s): {sub, aud, permissions, webid, azp} are required.');
       }
 
-      if (!isString(payload.webid)) throw new Error('JWT claim "webid" is not a string.');
-      if (!isString(payload.azp)) throw new Error('JWT claim "azp" is not a string.');
+      if (typeof payload.webid !== 'string') throw new Error('JWT claim "webid" is not a string.');
+      if (typeof payload.azp !== 'string') throw new Error('JWT claim "azp" is not a string.');
 
       const permissions = payload.permissions;
 

packages/uma/src/util/StringGuard.ts

@@ -1,76 +1,47 @@
 import clone from 'clone';
-import { TimedValue } from './models/TimedKeyValueStore';
-import { TimedTypedKeyValueStore } from './models/TimedTypedKeyValueStore';
+import { KeyValueStore } from './models/KeyValueStore';
+import { TypedKeyValueStore } from './models/TypedKeyValueStore';
 
 /**
  * A {@link KeyValueStore} which uses a JavaScript Map for internal storage.
  *
  * @inheritdoc
  */
-export class MemoryStore<M> implements TimedTypedKeyValueStore<M> {
+export class MemoryStore<M> implements TypedKeyValueStore<M> {
 
-  private readonly data: Map<keyof M, TimedValue<M[keyof M]>>;
+  private readonly data: Map<keyof M, M[keyof M]>;
 
   /**
    *
    * @param initialData data to initialize the memorystore with @range {json}
    */
   constructor(initialData?: [keyof M, M[keyof M]][]) {
 
-    this.data = new Map(initialData?.map(([ key, value ]) => [ key, { value: clone(value), timestamp: Date.now() } ]));
+    this.data = new Map(initialData?.map(([ key, value ]) => [ key, clone(value) ]));
 
   }
 
-  get<T extends keyof M>(key: T): Promise<M[T] | undefined> {
-
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    return Promise.resolve(this.data.has(key) ? clone(this.data.get(key)?.value as M[T]) : undefined);
-
+  public async get<T extends keyof M>(key: T): Promise<M[T] | undefined> {
+    return this.data.has(key) ? clone(this.data.get(key) as M[T]) : undefined;
   }
 
-  has<T extends keyof M>(key: T): Promise<boolean> {
-
+  public async has<T extends keyof M>(key: T): Promise<boolean> {
     return Promise.resolve(this.data.has(key));
-
   }
 
-  set<T extends keyof M>(key: T, value: M[T]): Promise<this> {
-
-    this.data.set(key, { value: clone(value), timestamp: Date.now() });
-
+  public async set<T extends keyof M>(key: T, value: M[T]): Promise<this> {
+    this.data.set(key, clone(value));
     return Promise.resolve(this);
-
   }
 
-  delete<T extends keyof M>(key: T): Promise<boolean> {
-
+  public async delete<T extends keyof M>(key: T): Promise<boolean> {
     return Promise.resolve(this.data.delete(key));
-
   }
 
   // eslint-disable-next-line @typescript-eslint/require-await
-  async* entries(): AsyncIterableIterator<[keyof M, M[keyof M]]> {
-
+  public async* entries(): AsyncIterableIterator<[keyof M, M[keyof M]]> {
     for (const [ key, value ] of this.data.entries()) {
-
-      yield [ key, clone(value.value) ];
-
+      yield [ key, clone(value) ];
     }
-
-  }
-
-  latestUpdate<T extends keyof M>(key: T): Promise<number | undefined> {
-
-    return Promise.resolve(this.data.get(key)?.timestamp);
-
   }
-
-  hasUpdate <T extends keyof M>(key: T, time: number): Promise<boolean | undefined> {
-
-    const timedValue = this.data.get(key);
-
-    return Promise.resolve(timedValue ? timedValue.timestamp > time : undefined);
-
-  }
-
 }