upload: refactor - setProjectForSSR(), etc. (#869)

zbycz · Jan 5, 2025 · f751aaf · f751aaf
1 parent 943ce83
commit f751aaf
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/pages/_document.tsx b/pages/_document.tsx
@@ -88,7 +88,7 @@ MyDocument.getInitialProps = async (
   // server intl is not available in App, only in this file (because we don't want to sent messages over and over again)
   const serverIntl = await getServerIntl(ctx);
   setIntl(serverIntl); // for ssr
-  setProjectForSSR(ctx);
+  setProjectForSSR(ctx.req);
 
   const initialProps = await documentGetInitialProps(ctx);
 

diff --git a/src/services/intl.tsx b/src/services/intl.tsx
@@ -5,6 +5,7 @@ import { MessagesType, TranslationId } from './types';
 import { isBrowser, isServer } from '../components/helpers';
 import { getServerIntl } from './intlServer';
 import { publishDbgObject } from '../utils';
+import { LANGUAGES } from '../config.mjs';
 
 type Values = { [variable: string]: string | number };
 
@@ -62,6 +63,9 @@ export const changeLang = (langId: string) => {
 
 export const setIntl = (initialIntl: Intl) => {
   if (initialIntl) {
+    if (!LANGUAGES[initialIntl.lang]) {
+      throw new Error(`Invalid language: ${initialIntl.lang}`);
+    }
     intl.lang = initialIntl.lang;
     intl.messages = initialIntl.messages;
     publishDbgObject('intl', intl);

diff --git a/src/services/project.tsx b/src/services/project.tsx
@@ -3,6 +3,7 @@ import type { DocumentContext } from 'next/dist/shared/lib/utils';
 import { publishDbgObject } from '../utils';
 import { isBrowser } from '../components/helpers';
 import type { TranslationId } from './types';
+import { IncomingMessage } from 'node:http';
 
 type Project = {
   id: string;
@@ -64,8 +65,8 @@ const setProject = (host: string) => {
 };
 
 // server - runs in document getInitialProps()
-export const setProjectForSSR = (ctx: DocumentContext) => {
-  const { host } = ctx.req.headers;
+export const setProjectForSSR = (req: IncomingMessage) => {
+  const { host } = req.headers;
   setProject(host);
 };
 

diff --git a/src/services/types.ts b/src/services/types.ts
@@ -112,7 +112,7 @@ export interface Feature {
     osmappLabel?: string;
   };
   center: Position;
-  countryCode?: string; // ISO3166-1 code, undefined = no country
+  countryCode?: string; // ISO3166-1 code lowercase, undefined = no country
   roundedCenter?: LonLatRounded;
   error?: 'network' | 'unknown' | '404' | '500'; // etc.
   deleted?: boolean;