Implements tasks 1.3, 3.2-3.3, 4.1-4.4, 5.1-5.6, 6.1 of
deepen-connected-services. Built TDD: contract test red, adapter green
for each capability seam.
Capability adapters (providers/wahoo/):
- importer.ts: Importer seam — listImportable + importOne against
Wahoo /v1/workouts. Filters fitness_app_id >= 1000 (Wahoo doesn't
share third-party data). 2 contract tests green.
- pusher.ts: RoutePusher seam — pushRoute(ctx, input) -> {remoteId,
version}. FIT-Course conversion, route:<id> external_id, PUT-vs-POST
decision, PUT->POST-on-404 fallback all internal to the adapter
(per ADR-0003). Idempotency via sync_pushes preserved. 4 contract
tests green.
- webhook.ts: WebhookReceiver seam — parseWebhook + handle. Routes
events to local users via provider_user_id; unknown user returns
silently. 6 contract tests green.
- manifest.ts: declares credential_kind=oauth, OAuth config, scopes,
buildAuthUrl, exchangeCode, and references each capability adapter.
Module shape:
- connected-services/index.ts: side-effect imports providers/index.ts
to register manifests, then re-exports manager + registry + types.
- connected-services/providers/index.ts: barrel that calls
registerManifest(wahooManifest).
- connected-services/oauth-state.server.ts: OAuth state encode/decode
(extracted from legacy pushes.server.ts).
- connected-services/push-action.server.ts: orchestration above the
RoutePusher seam — load route, ownership check, scope check, build
RoutePushInput, invoke pusher, return PushOutcome union. Replaces
the legacy pushRouteToProvider in lib/sync/pushes.server.ts.
Caller migration (group 5):
- api.sync.connect.$provider.ts -> manifest.buildAuthUrl
- api.sync.callback.$provider.ts -> manifest.exchangeCode + link()
- api.sync.disconnect.$provider.ts -> unlinkByUserProvider (calls
best-effort revoke via the credential adapter, then deletes locally)
- api.sync.webhook.$provider.ts -> manifest.webhookReceiver dispatch
- api.sync.push.$provider.$routeId.ts -> push-action.pushRouteToProvider
- sync.import.$provider.tsx -> manifest.importer.listImportable +
inline FIT->GPX in the action (form-supplied metadata bypasses the
Importer seam which is reserved for automatic / webhook imports)
- routes.$id.tsx -> getService instead of getConnection
- settings.connections.tsx -> getAllManifests instead of legacy registry
Legacy lib/sync/ deleted except imports.server.ts (which manages the
sync_imports table, untouched by this change).
DB migration verified locally (task 1.3): pnpm db:migrate-data renamed
the table and backfilled credentials JSONB; pnpm db:push then dropped
the legacy access_token/refresh_token/expires_at columns. Final shape
matches the schema; check constraints + unique index in place.
Test status (task 6.1):
- pnpm typecheck: green across all 15 workspaces
- pnpm lint: green
- @trails-cool/journal: 112 passed, 31 skipped — 12 fewer tests than
before because pushes.server.test.ts and the legacy wahoo.test.ts
were deleted. Their coverage is replaced by the new contract tests
(importer/pusher/webhook) plus manager.test.ts + oauth.test.ts.
Remaining: 6.2 (e2e), 6.3-6.4 (manual smoke + staging migration test),
7.1-7.3 (followups + spec deltas at archive).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
108 lines
3.7 KiB
TypeScript
108 lines
3.7 KiB
TypeScript
import { data, redirect, useSearchParams } from "react-router";
|
|
import { useTranslation } from "react-i18next";
|
|
import { eq } from "drizzle-orm";
|
|
import type { Route } from "./+types/settings.connections";
|
|
import { getSessionUser } from "~/lib/auth.server";
|
|
import { getDb } from "~/lib/db";
|
|
import { connectedServices } from "@trails-cool/db/schema/journal";
|
|
import { getAllManifests } from "~/lib/connected-services";
|
|
|
|
const KNOWN_ERRORS = ["too_many_tokens", "sync_failed", "generic"] as const;
|
|
type KnownError = (typeof KNOWN_ERRORS)[number];
|
|
function isKnownError(value: string | null): value is KnownError {
|
|
return value !== null && (KNOWN_ERRORS as readonly string[]).includes(value);
|
|
}
|
|
|
|
export function meta() {
|
|
return [{ title: "Connected services — Settings — trails.cool" }];
|
|
}
|
|
|
|
export async function loader({ request }: Route.LoaderArgs) {
|
|
const user = await getSessionUser(request);
|
|
if (!user) throw redirect("/auth/login");
|
|
|
|
const db = getDb();
|
|
const connections = await db
|
|
.select({
|
|
provider: connectedServices.provider,
|
|
providerUserId: connectedServices.providerUserId,
|
|
})
|
|
.from(connectedServices)
|
|
.where(eq(connectedServices.userId, user.id));
|
|
|
|
const providers = getAllManifests().map((m) => {
|
|
const conn = connections.find((c) => c.provider === m.id);
|
|
return {
|
|
id: m.id,
|
|
name: m.displayName,
|
|
connected: !!conn,
|
|
providerUserId: conn?.providerUserId,
|
|
};
|
|
});
|
|
|
|
return data({ providers });
|
|
}
|
|
|
|
export default function ConnectionsSettings({ loaderData }: Route.ComponentProps) {
|
|
const { providers } = loaderData;
|
|
const { t } = useTranslation(["journal"]);
|
|
const [searchParams] = useSearchParams();
|
|
const errorParam = searchParams.get("error");
|
|
const errorKey: KnownError | null = isKnownError(errorParam) ? errorParam : errorParam ? "generic" : null;
|
|
|
|
return (
|
|
<section>
|
|
<h2 className="text-lg font-semibold text-gray-900">{t("settings.services.title")}</h2>
|
|
{errorKey && (
|
|
<div
|
|
role="alert"
|
|
className="mt-4 rounded-md border border-red-200 bg-red-50 px-4 py-3 text-sm text-red-800"
|
|
>
|
|
{t(`settings.services.errors.${errorKey}`)}
|
|
</div>
|
|
)}
|
|
<div className="mt-4 space-y-3">
|
|
{providers.map((p) => (
|
|
<div
|
|
key={p.id}
|
|
className="flex items-center justify-between rounded-md border border-gray-200 px-4 py-3"
|
|
>
|
|
<div>
|
|
<p className="font-medium text-gray-900">{p.name}</p>
|
|
{p.connected && p.providerUserId && (
|
|
<p className="text-xs text-gray-500">
|
|
{t("settings.services.connectedAs", { id: p.providerUserId })}
|
|
</p>
|
|
)}
|
|
</div>
|
|
{p.connected ? (
|
|
<div className="flex items-center gap-3">
|
|
<a
|
|
href={`/sync/import/${p.id}`}
|
|
className="text-sm text-blue-600 hover:underline"
|
|
>
|
|
{t("sync.import")}
|
|
</a>
|
|
<form method="post" action={`/api/sync/disconnect/${p.id}`}>
|
|
<button
|
|
type="submit"
|
|
className="text-sm text-red-600 hover:underline"
|
|
>
|
|
{t("settings.services.disconnect")}
|
|
</button>
|
|
</form>
|
|
</div>
|
|
) : (
|
|
<a
|
|
href={`/api/sync/connect/${p.id}`}
|
|
className="rounded-md bg-blue-600 px-3 py-1.5 text-sm text-white hover:bg-blue-700"
|
|
>
|
|
{t("settings.services.connect")}
|
|
</a>
|
|
)}
|
|
</div>
|
|
))}
|
|
</div>
|
|
</section>
|
|
);
|
|
}
|