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
18 changes: 14 additions & 4 deletions src/common/language/api.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { functionProvider } from "@modular-rest/client";
import { authentication, functionProvider } from "@modular-rest/client";
import type {
KeepPhrasePendingReply,
LangCode,
Expand All @@ -17,14 +17,24 @@ import type {
*
* Deliberately NOT wrapped in withAuthRetry: a missing function answers with an
* error body, and a recovery there would log a registered user out.
*
* The `user_access` functions read the account from `args.userId`: modular-rest does
* not add it, and without it the server answers "User ID is required", so the popup
* pill and the save window language row never showed against a real server.
*/

/** The signed-in user's id for `user_access` functions (the server checks it is theirs). */
function caller(): { userId?: string } {
const id = authentication.user?.id;
return id ? { userId: id } : {};
}

/** `get-language-state`, or null when the server does not have it (yet). */
export async function fetchLanguageState(): Promise<LanguageState | null> {
try {
const state = await functionProvider.run<LanguageState>({
name: "get-language-state",
args: {},
args: { ...caller() },
});
return isLanguageState(state) ? state : null;
} catch (_e) {
Expand Down Expand Up @@ -52,7 +62,7 @@ export async function fetchLanguageCapabilities(): Promise<LanguageCapabilities
export async function setActiveLanguage(language: LangCode): Promise<LanguageState> {
const reply = await functionProvider.run<{ state: LanguageState }>({
name: "set-active-language",
args: { language },
args: { ...caller(), language },
});
if (!reply || !isLanguageState(reply.state)) {
throw new Error("The server did not return the new language state.");
Expand All @@ -70,7 +80,7 @@ export async function keepPhrasePending(
): Promise<KeepPhrasePendingReply> {
return functionProvider.run<KeepPhrasePendingReply>({
name: "keep-phrase-pending",
args: { phrase, language },
args: { ...caller(), phrase, language },
});
}

Expand Down
55 changes: 55 additions & 0 deletions tests/language-api.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import { describe, it, expect, vi, beforeEach } from "vitest";

// The server's `user_access` functions read the account from args.userId and answer
// "User ID is required" without it, so every call that acts on the learner must send it.
const run = vi.fn();
const auth = { user: { id: "u1", type: "user" } as { id: string; type: string } | null };

vi.mock("@modular-rest/client", () => ({
functionProvider: { run: (...a: unknown[]) => run(...a) },
authentication: {
get user() {
return auth.user;
},
},
}));

import { fetchLanguageCapabilities, fetchLanguageState, keepPhrasePending, setActiveLanguage } from "../src/common/language/api";

const STATE = { translationLanguage: "fa", learningLanguage: "de", languages: [], onboardingState: "done", plan: "learner", maxLanguages: 10, pending: [] };

describe("language API client", () => {
beforeEach(() => {
run.mockReset();
auth.user = { id: "u1", type: "user" };
});

it("get-language-state sends the signed-in user's id", async () => {
run.mockResolvedValue(STATE);
await expect(fetchLanguageState()).resolves.toEqual(STATE);
expect(run).toHaveBeenCalledWith({ name: "get-language-state", args: { userId: "u1" } });
});

it("set-active-language and keep-phrase-pending send the user's id", async () => {
run.mockResolvedValueOnce({ state: STATE });
await setActiveLanguage("de");
expect(run).toHaveBeenLastCalledWith({ name: "set-active-language", args: { userId: "u1", language: "de" } });

run.mockResolvedValueOnce({ phraseId: "p1", expiresAt: "2026-11-15" });
await keepPhrasePending({ phrase: "Hallo" }, "de");
expect(run).toHaveBeenLastCalledWith({ name: "keep-phrase-pending", args: { userId: "u1", phrase: { phrase: "Hallo" }, language: "de" } });
});

it("get-language-capabilities stays anonymous", async () => {
run.mockResolvedValue({ learning: [], own: [] });
await fetchLanguageCapabilities();
expect(run).toHaveBeenCalledWith({ name: "get-language-capabilities", args: {} });
});

it("sends no userId while nobody is signed in (the server then refuses, and the reader answers null)", async () => {
auth.user = null;
run.mockRejectedValue(new Error("User ID is required"));
await expect(fetchLanguageState()).resolves.toBeNull();
expect(run).toHaveBeenCalledWith({ name: "get-language-state", args: {} });
});
});
2 changes: 1 addition & 1 deletion tests/popup-languages.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ describe("LanguageSwitcher (popup list)", () => {
await w.find("[data-testid='language-row-en']").trigger("click");
await flushPromises();

expect(run).toHaveBeenCalledWith({ name: "set-active-language", args: { language: "en" } });
expect(run).toHaveBeenCalledWith({ name: "set-active-language", args: { userId: "u1", language: "en" } });
expect(useLanguageStore().state?.learningLanguage).toBe("en");
const sent = (globalThis as any).chrome.tabs.sendMessage.mock.calls;
expect(sent).toHaveLength(2);
Expand Down
Loading