chore: rename routes

Signed-off-by: Wouter Termont <wouter.termont@ugent.be>

Author: termontwouter

packages/uma/config/default.json

@@ -59,7 +59,7 @@
             }
           ],
           "defaultHandler": {
-            "@type": "DefaultRouteHandler"
+            "@type": "DefaultRequestHandler"
           }
         }
       }

packages/uma/config/discovery/default.json

@@ -14,7 +14,7 @@
                 }
             ],
             "handler": {
-              "@type": "UmaConfigRequestHandler",
+              "@type": "ConfigRequestHandler",
               "baseUrl": { "@id": "urn:uma:variables:baseUrl" }
             },
             "path":  "/uma/.well-known/uma2-configuration"

packages/uma/config/resource/default.json

@@ -5,7 +5,7 @@
   "@graph": [
     {
       "@id": "urn:uma:default:ResourceRegistrationHandler",
-      "@type": "ResourceRegistrationHandler",
+      "@type": "ResourceRegistrationRequestHandler",
       "baseUrl": "urn:uma:variables:baseUrl",
       "resourceStore": {
         "@id": "urn:uma:default:ResourceRegistrationStore",

packages/uma/config/ticket/default.json

@@ -16,7 +16,7 @@
       "handler": {
         "@type": "JsonHttpErrorHandler",
         "nestedHandler": {
-          "@type": "PermissionRegistrationHandler",
+          "@type": "TicketRequestHandler",
           "resourceServers": [
             {
               "@type": "RequestingPartyRegistration",

packages/uma/package.json

@@ -65,7 +65,6 @@
     "cross-fetch": "^4.0.0",
     "jose": "^4.5.1",
     "logform": "^2.6.0",
-    "typescript-memoize": "^1.1.0",
     "uuid": "^9.0.1",
     "winston": "^3.11.0"
   },

packages/uma/src/index.ts

@@ -8,14 +8,13 @@ export * from './models/ScopeDescription';
 export * from './models/Ticket';
 
 // Routes
-export * from './routes/DefaultRouteHandler';
-export * from './routes/IntrospectionHandler';
-export * from './routes/JwksRequestHandler';
-export * from './routes/OAuthConfigRequestHandler';
-export * from './routes/PermissionRegistrationHandler';
-export * from './routes/ResourceRegistrationHandler';
-export * from './routes/TokenRequestHandler';
-export * from './routes/UmaConfigRequestHandler';
+export * from './routes/Default';
+export * from './routes/Introspection';
+export * from './routes/Jwks';
+export * from './routes/Ticket';
+export * from './routes/ResourceRegistration';
+export * from './routes/Token';
+export * from './routes/Config';
 
 // Token
 export * from './token/JwtTokenFactory';

…c/routes/UmaConfigRequestHandler.test.ts packages/uma/src/routes/Config.test.tspackages/uma/src/routes/UmaConfigRequestHandler.test.ts renamed to packages/uma/src/routes/Config.test.ts packages/uma/src/routes/UmaConfigRequestHandler.test.ts renamed to packages/uma/src/routes/Config.test.ts

@@ -0,0 +1,83 @@
+import { ASYMMETRIC_CRYPTOGRAPHIC_ALGORITHM }
+  from '@solid/access-token-verifier/dist/constant/ASYMMETRIC_CRYPTOGRAPHIC_ALGORITHM';
+import { HttpHandler } from '../util/http/models/HttpHandler';
+import { HttpHandlerContext } from '../util/http/models/HttpHandlerContext';
+import { HttpHandlerResponse } from '../util/http/models/HttpHandlerResponse';
+import { Logger } from '../util/logging/Logger';
+import { getLoggerFor } from '../util/logging/LoggerUtils';
+
+// eslint-disable no-unused-vars
+export enum ResponseType {
+  Token = 'token',
+  Code = 'code',
+  IDToken = 'id_token'
+};
+// eslint-enable
+
+export type OAuthConfiguration = {
+    issuer: string,
+    jwks_uri?: string,
+    token_endpoint?: string,
+    grant_types_supported?: string[],
+    dpop_signing_alg_values_supported?: string[],
+    response_types_supported?: ResponseType[]
+    scopes_supported?: string[]
+}
+
+export type UmaConfiguration = OAuthConfiguration & {
+  uma_profiles_supported: string[],
+  resource_registration_endpoint: string,
+  permission_endpoint: string,
+  introspection_endpoint: string
+}
+
+/**
+ * An HttpHandler used for returning the configuration
+ * of the UMA Authorization Service.
+ */
+export class ConfigRequestHandler extends HttpHandler {
+  protected readonly logger: Logger = getLoggerFor(this);
+
+  /**
+  * An HttpHandler used for returning the configuration
+  * of the UMA Authorization Service.
+    * @param {string} baseUrl - Base URL of the AS
+    */
+  constructor(protected readonly baseUrl: string) {
+    super();
+  }
+
+  /**
+   * Returns the endpoint's UMA configuration
+   *
+   * @param {HttpHandlerContext} context - an irrelevant incoming context
+   * @return {Observable<HttpHandlerResponse>} - the mock response
+   */
+  async handle(context: HttpHandlerContext): Promise<HttpHandlerResponse> {
+    this.logger.info(`Received discovery request at '${context.request.url}'`);
+    return {
+      body: JSON.stringify(this.getConfig()),
+      headers: {'content-type': 'application/json'},
+      status: 200,
+    };
+  }
+
+  /**
+   * Returns UMA Configuration for the AS
+   * @return {UmaConfiguration} - AS Configuration
+   */
+  public getConfig(): UmaConfiguration {
+    return {
+      jwks_uri: `${this.baseUrl}/keys`,
+      token_endpoint: `${this.baseUrl}/token`,
+      grant_types_supported: ['urn:ietf:params:oauth:grant-type:uma-ticket'],
+      issuer: `${this.baseUrl}`,
+      permission_endpoint: `${this.baseUrl}/ticket`,
+      introspection_endpoint: `${this.baseUrl}/introspect`,
+      resource_registration_endpoint: `${this.baseUrl}/resources`,
+      uma_profiles_supported: ['http://openid.net/specs/openid-connect-core-1_0.html#IDToken'],
+      dpop_signing_alg_values_supported: [...ASYMMETRIC_CRYPTOGRAPHIC_ALGORITHM],
+      response_types_supported: [ResponseType.Token],
+    };
+  }
+}

packages/uma/src/routes/Config.ts

@@ -5,7 +5,7 @@ import {HttpHandlerResponse} from '../util/http/models/HttpHandlerResponse';
 /**
  * Default route handler
  */
-export class DefaultRouteHandler extends HttpHandler {
+export class DefaultRequestHandler extends HttpHandler {
   /**
      * Default request handler returning a 404 error
      * @param {HttpHandlerContext} input