Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 32 additions & 1 deletion src/utils/url.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { makeHeader, makeLink, makeUrl, WgerLink } from "utils/url";
import i18n from "i18n";
import { getAcceptLanguage, makeHeader, makeLink, makeUrl, WgerLink } from "utils/url";

describe("test url utility", () => {

Expand Down Expand Up @@ -67,6 +68,7 @@ describe("test the header utility", () => {
test('generate header', () => {
const result = makeHeader('123');
expect(result).toStrictEqual({
'Accept-Language': 'en',
'Authorization': `Token 123`,
'Content-Type': 'application/json',
});
Expand All @@ -75,6 +77,7 @@ describe("test the header utility", () => {
test('generate header - token from config', () => {
const result = makeHeader();
expect(result).toStrictEqual({
'Accept-Language': 'en',
'Authorization': `Token 122333444455555666666`,
'Content-Type': 'application/json',
});
Expand Down Expand Up @@ -123,5 +126,33 @@ describe("test the makeLink helper", () => {
const result = makeLink(WgerLink.WEIGHT_OVERVIEW, 'de',);
expect(result).toEqual('/de/weight/overview');
});
});

describe("test the getAcceptLanguage helper", () => {

beforeEach(() => {
// @ts-expect-error - test helper assignment
i18n.languages = undefined;
});

test("returns default when languages is undefined", () => {
// @ts-expect-error - test helper assignment
i18n.languages = undefined;
expect(getAcceptLanguage()).toBe("en");
});

test("returns default when languages is an empty array", () => {
i18n.languages = [];
expect(getAcceptLanguage()).toBe("en");
});

test("returns single language code", () => {
i18n.languages = ["de"];
expect(getAcceptLanguage()).toBe("de");
});

test("joins multiple language codes with comma", () => {
i18n.languages = ["de-DE", "fr-FR"];
expect(getAcceptLanguage()).toBe("de-DE, fr-FR");
});
});
14 changes: 12 additions & 2 deletions src/utils/url.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { AxiosRequestConfig } from "axios";
import { IS_PROD, VITE_API_KEY, VITE_API_SERVER } from "config";
import i18n from "i18n";
import slug from "slug";

interface makeUrlInterface {
Expand Down Expand Up @@ -222,7 +223,7 @@ export function makeHeader(token?: string) {

const out: AxiosRequestConfig['headers'] = {};
out['Content-Type'] = 'application/json';

out['Accept-Language'] = getAcceptLanguage();
if (token) {
out['Authorization'] = `Token ${token}`;
}
Expand All @@ -231,7 +232,16 @@ export function makeHeader(token?: string) {
if (IS_PROD && csrfCookie != undefined) {
out['X-CSRFToken'] = csrfCookie;
}

return out;
}

export function getAcceptLanguage(): string {
const languages = i18n.languages || [];
if (languages.length === 0) {
return 'en';
}

return languages.map((language) => {
return language;
}).join(', ');
}
Loading