#375: picked up some nitpicks

Author: basmasking

segments/reads.json

@@ -34,5 +34,5 @@
     "./domain/relation/getFollowers": { "default": {  "access": "protected" } },
     "./domain/relation/getFollowing": { "default": {  "access": "protected" } },
 
-    "./domain/tenant/getByOrigin": { "default": {  "access": "protected" } }
+    "./domain/tenant/getByOrigin": { "default": {  "access": "protected" }, "TenantNotFound": { } }
 }

src/domain/definitions.ts

@@ -1,6 +1,8 @@
 
 import type { Validation } from '^/integrations/validation';
 
+export const TENANT_BY_ORIGIN_PATH = 'domain/tenant/getByOriginConverted';
+
 export const SortOrders = {
     POPULAR: 'popular',
     RECENT: 'recent'

src/domain/tenant/tenant.ts

@@ -2,8 +2,8 @@
 import type { Tenant } from './types';
 
 const tenant: Tenant = {
-    id: 'id',
-    origin: 'origin'
+    id: 'default',
+    origin: 'localhost'
 };
 
 export default tenant;

src/integrations/authentication/implementations/openid/OpenID.ts

@@ -75,9 +75,13 @@ export default class OpenID implements IdentityProvider
     async login(origin: string, data: Record<string, unknown>): Promise<Session>
     {
         const clientConfiguration = this.#getClientConfiguration();
-        const currentUrl = new URL(`${this.#providerConfiguration.redirectPath}?session_state=${data.session_state}&iss=${data.iss}&code=${data.code}`, origin);
 
-        const tokens = await authorizationCodeGrant(clientConfiguration, currentUrl, {
+        const url = new URL(this.#providerConfiguration.redirectPath, origin);
+        url.searchParams.set('session_state', data.session_state as string);
+        url.searchParams.set('iss', data.iss as string);
+        url.searchParams.set('code', data.code as string);
+
+        const tokens = await authorizationCodeGrant(clientConfiguration, url, {
             pkceCodeVerifier: this.#codeVerifier,
             idTokenExpected: true
         });

src/integrations/runtime/authenticationMiddleware.ts

@@ -1,6 +1,8 @@
 
 import identityProvider from '^/integrations/authentication';
 
+import { TENANT_BY_ORIGIN_PATH } from '^/domain/definitions';
+
 import AuthenticationMiddleware from './middlewares/AuthenticationMiddleware';
 
 const authProcedures = {
@@ -11,6 +13,6 @@ const authProcedures = {
 
 const redirectPath = process.env.AUTHENTICATION_CLIENT_PATH || 'undefined';
 
-const whiteList: string[] = ['domain/tenant/getByOriginConverted'];
+const whiteList: string[] = [TENANT_BY_ORIGIN_PATH];
 
 export default new AuthenticationMiddleware(identityProvider, authProcedures, redirectPath, whiteList);

src/integrations/runtime/middlewares/OriginMiddleware.ts

@@ -36,7 +36,7 @@ export default class OriginMiddleware implements Middleware
         this.#validateOriginValue(origin);
 
         // The origin header is validated and set here for use in other middlewares
-        request.setHeader('origin', origin as string);
+        request.setHeader('origin', origin!);
 
         const response = await next();
 

src/integrations/runtime/middlewares/TenantMiddleware.ts

@@ -31,7 +31,7 @@ export default class TenantMiddleware implements Middleware
 
             const response = await next();
 
-            if (response.status < 500)
+            if (response.status === 200)
             {
                 this.#cache.set(origin, response);
             }

src/integrations/runtime/tenantMiddleware.ts

@@ -1,6 +1,8 @@
 
+import { TENANT_BY_ORIGIN_PATH } from '^/domain/definitions';
+
 import TenantMiddleware from './middlewares/TenantMiddleware';
 
-const tenantPath = 'domain/tenant/getByOriginConverted';
+const tenantPath = TENANT_BY_ORIGIN_PATH;
 
 export default new TenantMiddleware(tenantPath);