#375: required URL validation for origin

Author: basmasking

docker/keycloak/comify-realm.json

@@ -666,7 +666,6 @@
       "alwaysDisplayInConsole": false,
       "clientAuthenticatorType": "client-secret",
       "redirectUris": [
-        "http://a.comify.local:3000/rpc/domain/authentication/login",
         "http://localhost:3000/rpc/domain/authentication/login",
         "http://localhost:5173/rpc/domain/authentication/login"
       ],

src/domain/authentication/login/login.ts

@@ -5,7 +5,7 @@ import getCreatorByEmail from '^/domain/creator/getByEmail';
 import registerCreator from '^/domain/creator/register';
 import { type Tenant } from '^/domain/tenant';
 
-import type { Requester } from '../types';
+import { type Requester } from '../types';
 
 export default async function login(identity: Identity, tenant: Tenant): Promise<Requester>
 {

src/domain/creator/create/validateData.ts

@@ -2,7 +2,7 @@
 import type { ValidationSchema } from '^/integrations/validation';
 import validator from '^/integrations/validation';
 
-import { optionalIdValidation } from '^/domain/definitions';
+import { optionalIdValidation, requiredIdValidation } from '^/domain/definitions';
 
 import InvalidCreator from '../InvalidCreator';
 import { fullNameValidation } from '../definitions';
@@ -19,7 +19,7 @@ const schema: ValidationSchema =
             required: true
         }
     },
-    tenantId: optionalIdValidation,
+    tenantId: requiredIdValidation,
     portraitId: optionalIdValidation
 };
 

src/domain/post/create/validateData.ts

@@ -10,7 +10,7 @@ import type { ValidationModel } from './types';
 const schema: ValidationSchema =
 {
     creatorId: requiredIdValidation,
-    tenantId: optionalIdValidation,
+    tenantId: requiredIdValidation,
     comicId: optionalIdValidation,
     commentId: optionalIdValidation,
     parentId: optionalIdValidation

src/integrations/runtime/middlewares/OriginMiddleware.ts

@@ -75,7 +75,7 @@ export default class OriginMiddleware implements Middleware
 
     #validateOriginValue(value: string | undefined): void
     {
-        const result = validator.validate({ url: value }, schema);
+        const result = validator.validate({ origin: value }, schema);
 
         if (result.invalid)
         {

src/integrations/runtime/middlewares/RequesterMiddleware.ts

@@ -17,13 +17,25 @@ export default class RequesterMiddleware implements Middleware
             request.setHeader('Authorization', this.#authorization);
         }
 
-        const response = await next();
-
-        if (response.hasHeader('Authorization'))
+        try
         {
-            this.#authorization = response.getHeader('Authorization')!;
+            const response = await next();
+
+            if (response.hasHeader('Authorization'))
+            {
+                this.#authorization = response.getHeader('Authorization')!;
+            }
+
+            return response;
         }
+        catch (error)
+        {
+            if (error?.constructor?.name === 'Unauthorized')
+            {
+                this.#authorization = undefined;
+            }
 
-        return response;
+            throw error;
+        }
     }
 }

src/webui/components/common/hooks/useTenant.ts

@@ -1,6 +1,7 @@
 
 import { useCallback } from 'react';
 
+import { tenant } from '^/domain/tenant';
 import getByOriginConverted from '^/domain/tenant/getByOriginConverted';
 
 import { useLoadData } from '^/webui/hooks';
@@ -9,9 +10,7 @@ export function useTenant()
 {
     const getTenant = useCallback(async () =>
     {
-        const tenant = await getByOriginConverted('');
-
-        return tenant;
+        return await getByOriginConverted(tenant.origin);
 
     }, []);
 

test/domain/tenant/fixtures/values.fixtures.ts

@@ -5,8 +5,8 @@ export const VALUES =
         TENANT1: 'example.com'
     },
     ORIGINS: {
-        FIRST: 'alpha.example.com',
-        SECOND: 'beta.example.com',
+        FIRST: 'http://alpha.example.com',
+        SECOND: 'http://beta.example.com',
         UNKNOWN: 'unknown'
     }
 };