From 13bbf5dbd592ab9743c1c471c6fbdfd85630c15d Mon Sep 17 00:00:00 2001 From: Rory& Date: Thu, 4 Dec 2025 10:36:26 +0100 Subject: Remove fallback URIs, remove endpointClient, expose admin api --- src/api/Server.ts | 3 +++ src/api/routes/policies/instance/domains.ts | 22 ++++++++-------------- 2 files changed, 11 insertions(+), 14 deletions(-) (limited to 'src/api') diff --git a/src/api/Server.ts b/src/api/Server.ts index 133e9dbb6..62a51777d 100644 --- a/src/api/Server.ts +++ b/src/api/Server.ts @@ -158,6 +158,9 @@ export class SpacebarServer extends Server { baseUrl: Config.get().gateway.endpointPublic, encoding: [...(erlpackSupported ? ["etf"] : []), "json"], compression: ["zstd-stream", "zlib-stream", null], + }, + admin: Config.get().admin.endpointPublic === null ? undefined : { + baseUrl: Config.get().admin.endpointPublic } }); }); diff --git a/src/api/routes/policies/instance/domains.ts b/src/api/routes/policies/instance/domains.ts index a4cc0aa1b..967ac2f4c 100644 --- a/src/api/routes/policies/instance/domains.ts +++ b/src/api/routes/policies/instance/domains.ts @@ -33,20 +33,14 @@ router.get( async (req: Request, res: Response) => { const { cdn, gateway, api } = Config.get(); - const IdentityForm = { - cdn: - cdn.endpointPublic || - process.env.CDN || - "http://localhost:3001", - gateway: - gateway.endpointPublic || - process.env.GATEWAY || - "ws://localhost:3001", - defaultApiVersion: api.defaultVersion ?? 9, - apiEndpoint: api.endpointPublic ?? "http://localhost:3001/api/", - }; - - res.json(IdentityForm); + res.json({ + admin: Config.get().admin.endpointPublic, + api: Config.get().api.endpointPublic?.split("/api")[0] || "", // Transitional, see /.well-known/spacebar/client + apiEndpoint: api.endpointPublic, + cdn: cdn.endpointPublic, + defaultApiVersion: api.defaultVersion, + gateway: gateway.endpointPublic, + }); }, ); -- cgit 1.5.1