Frontend uses TMT log address from backend

JensForstmann · Nov 6, 2023 · ba63422 · ba63422
1 parent fe8ee47
commit ba63422
Show file tree

Hide file tree

Showing 4 changed files with 92 additions and 1 deletion.
diff --git a/backend/src/configController.ts b/backend/src/configController.ts
@@ -0,0 +1,16 @@
+import { Controller, Get, NoSecurity, Route, Security } from '@tsoa/runtime';
+import { TMT_LOG_ADDRESS } from '.';
+
+@Route('/api/config')
+@Security('bearer_token')
+export class ConfigController extends Controller {
+	@Get()
+	@NoSecurity()
+	async getConfig(): Promise<{
+		tmtLogAddress: string | null;
+	}> {
+		return {
+			tmtLogAddress: TMT_LOG_ADDRESS,
+		};
+	}
+}
diff --git a/backend/src/routes.ts b/backend/src/routes.ts
@@ -21,6 +21,8 @@ import { GameServersController } from './gameServersController';
 import { PresetsController } from './presetsController';
 // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
 import { DebugController } from './debugController';
+// WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
+import { ConfigController } from './configController';
 import { expressAuthentication } from './auth';
 // @ts-ignore - no great way to install types from subpackage
 const promiseAny = require('promise.any');
@@ -1845,6 +1847,30 @@ export function RegisterRoutes(app: Router) {
 		}
 	);
 	// WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
+	app.get(
+		'/api/config',
+		...fetchMiddlewares<RequestHandler>(ConfigController),
+		...fetchMiddlewares<RequestHandler>(ConfigController.prototype.getConfig),
+
+		function ConfigController_getConfig(request: any, response: any, next: any) {
+			const args = {};
+
+			// WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
+
+			let validatedArgs: any[] = [];
+			try {
+				validatedArgs = getValidatedArgs(args, request, response);
+
+				const controller = new ConfigController();
+
+				const promise = controller.getConfig.apply(controller, validatedArgs as any);
+				promiseHandler(controller, promise, response, undefined, next);
+			} catch (err) {
+				return next(err);
+			}
+		}
+	);
+	// WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
 
 	// WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
 

diff --git a/backend/swagger.json b/backend/swagger.json
@@ -2990,6 +2990,34 @@
 				],
 				"parameters": []
 			}
+		},
+		"/api/config": {
+			"get": {
+				"operationId": "GetConfig",
+				"responses": {
+					"200": {
+						"description": "Ok",
+						"content": {
+							"application/json": {
+								"schema": {
+									"properties": {
+										"tmtLogAddress": {
+											"type": "string",
+											"nullable": true
+										}
+									},
+									"required": [
+										"tmtLogAddress"
+									],
+									"type": "object"
+								}
+							}
+						}
+					}
+				},
+				"security": [],
+				"parameters": []
+			}
 		}
 	},
 	"servers": [

diff --git a/frontend/src/pages/create.tsx b/frontend/src/pages/create.tsx
@@ -192,7 +192,7 @@ export const CreatePage: Component = () => {
 		},
 		matchEndAction: 'NONE',
 		mode: 'SINGLE',
-		tmtLogAddress: window.location.protocol + '//' + window.location.host,
+		tmtLogAddress: undefined, // will be set in onMount()
 		canClinch: true,
 	});
 
@@ -217,10 +217,19 @@ export const CreatePage: Component = () => {
 		}
 	});
 
+	const setTmtLogAddress = async () => {
+		fetcher<{ tmtLogAddress: string | null }>('GET', `/api/config`).then((resp) => {
+			const tmtLogAddress =
+				resp?.tmtLogAddress ?? window.location.protocol + '//' + window.location.host;
+			setMatchCreateDto('tmtLogAddress', tmtLogAddress);
+		});
+	};
+
 	onMount(() => {
 		if (electionStepsRef) {
 			autoAnimate(electionStepsRef);
 		}
+		setTmtLogAddress();
 	});
 
 	const setMatchDataFromPreset = (presetId: string) => {
@@ -576,6 +585,18 @@ export const CreatePage: Component = () => {
 					{t('Quit server via Rcon after match end')}
 				</option>
 			</SelectInput>
+			<TextInput
+				label={t('TMT Log Address')}
+				labelTopRight={t('HTTP log receiver from the perspective of the game server')}
+				value={matchCreateDto.tmtLogAddress ?? ''}
+				onInput={(e) => setMatchCreateDto('tmtLogAddress', e.currentTarget.value)}
+			/>
+			<ToggleInput
+				label={t('Can Clinch')}
+				labelTopRight={t('Ends match series after a map if a winner is determined')}
+				checked={matchCreateDto.canClinch}
+				onInput={(e) => setMatchCreateDto('canClinch', e.currentTarget.checked)}
+			/>
 
 			<TextArea
 				label={t('Match Init Payload Data (JSON)')}