fix(bridge): wire admin client and correct Baserow JWT URLs

- Mount /api/v1/admin routes in app builder
- Instantiate BaserowAdminClient and inject it into the container
- Add BASEROW_USER_AUTH_NOT_CONFIGURED error code
- Fix duplicate /api prefix in token-auth and token-refresh URLs
This commit is contained in:
Corentin JOGUET 2026-05-12 06:20:49 +00:00
parent 0d4aa0413d
commit 1644a72ccc
4 changed files with 23 additions and 2 deletions

View file

@ -18,6 +18,7 @@ import { type AuthVariables, authMiddleware } from './middleware/auth.js';
import { errorHandler } from './middleware/error-handler.js'; import { errorHandler } from './middleware/error-handler.js';
import { defaultRateLimitKey, rateLimit } from './middleware/rate-limit.js'; import { defaultRateLimitKey, rateLimit } from './middleware/rate-limit.js';
import { eventsRoutes } from './routes/events.js'; import { eventsRoutes } from './routes/events.js';
import { adminRoutes } from './routes/admin.js';
import { tablesRoutes } from './routes/tables.js'; import { tablesRoutes } from './routes/tables.js';
import { viewsRoutes } from './routes/views.js'; import { viewsRoutes } from './routes/views.js';
import { webhooksRoutes } from './routes/webhooks.js'; import { webhooksRoutes } from './routes/webhooks.js';
@ -83,6 +84,8 @@ export async function buildApp(): Promise<Hono<{ Variables: AuthVariables }>> {
v1.route('/tables', tablesRoutes); v1.route('/tables', tablesRoutes);
// R3.1.a : routes views — liste vues par table + donnees paginées d'une vue. // R3.1.a : routes views — liste vues par table + donnees paginées d'une vue.
v1.route('/views', viewsRoutes); v1.route('/views', viewsRoutes);
// Phase B (acadenice) : CRUD tables/fields/views via Baserow user JWT.
v1.route('/admin', adminRoutes);
app.route('/api/v1', v1); app.route('/api/v1', v1);
// R3.1.b : SSE realtime stream — monté sur /api/events hors /api/v1 pour // R3.1.b : SSE realtime stream — monté sur /api/events hors /api/v1 pour

View file

@ -173,7 +173,7 @@ export class BaserowJwtManagerImpl implements BaserowJwtManager {
private async doLogin(): Promise<string> { private async doLogin(): Promise<string> {
this.logger.debug({ email: this.email }, 'baserow jwt login'); this.logger.debug({ email: this.email }, 'baserow jwt login');
const url = `${this.baseUrl}/api/user/token-auth/`; const url = `${this.baseUrl}/user/token-auth/`;
const res = await fetch(url, { const res = await fetch(url, {
method: 'POST', method: 'POST',
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json' },
@ -202,7 +202,7 @@ export class BaserowJwtManagerImpl implements BaserowJwtManager {
private async doRefresh(currentToken: string): Promise<string> { private async doRefresh(currentToken: string): Promise<string> {
this.logger.debug('baserow jwt refresh'); this.logger.debug('baserow jwt refresh');
const url = `${this.baseUrl}/api/user/token-refresh/`; const url = `${this.baseUrl}/user/token-refresh/`;
const res = await fetch(url, { const res = await fetch(url, {
method: 'POST', method: 'POST',
headers: { 'Content-Type': 'application/json' }, headers: { 'Content-Type': 'application/json' },

View file

@ -9,6 +9,7 @@
*/ */
import type { Logger } from 'pino'; import type { Logger } from 'pino';
import { BaserowAdminClient } from '../adapters/baserow-admin-client.js';
import { BaserowClient } from '../adapters/baserow-client.js'; import { BaserowClient } from '../adapters/baserow-client.js';
import { RedisCache } from '../adapters/redis-cache.js'; import { RedisCache } from '../adapters/redis-cache.js';
import type { ApiTokenRecord } from '../middleware/auth.js'; import type { ApiTokenRecord } from '../middleware/auth.js';
@ -47,6 +48,9 @@ export interface Container {
logger: Logger; logger: Logger;
/** Gestionnaire JWT user Baserow pour endpoints metadata. Toujours present. */ /** Gestionnaire JWT user Baserow pour endpoints metadata. Toujours present. */
baserowJwt: BaserowJwtManager; baserowJwt: BaserowJwtManager;
/** Client admin Baserow (CRUD tables/fields/views). Lève
* BASEROW_USER_AUTH_NOT_CONFIGURED si appelé sans creds user. */
baserowAdmin: BaserowAdminClient;
} }
let _container: Container | null = null; let _container: Container | null = null;
@ -146,6 +150,12 @@ export async function initContainer(opts: InitOptions): Promise<Container> {
); );
} }
const baserowAdmin = new BaserowAdminClient({
baseUrl: config.baserowApiUrl,
jwtManager: baserowJwt,
logger: rootLogger,
});
const container: Container = { const container: Container = {
config, config,
baserow, baserow,
@ -157,6 +167,7 @@ export async function initContainer(opts: InitOptions): Promise<Container> {
groupsScopesMap, groupsScopesMap,
logger: rootLogger, logger: rootLogger,
baserowJwt, baserowJwt,
baserowAdmin,
}; };
setContainer(container); setContainer(container);
return container; return container;

View file

@ -14,6 +14,7 @@ export type ErrorCode =
| 'CONFLICT' | 'CONFLICT'
| 'RATE_LIMITED' | 'RATE_LIMITED'
| 'BASEROW_UNAVAILABLE' | 'BASEROW_UNAVAILABLE'
| 'BASEROW_USER_AUTH_NOT_CONFIGURED'
| 'DOCMOST_UNAVAILABLE' | 'DOCMOST_UNAVAILABLE'
| 'INTERNAL'; | 'INTERNAL';
@ -57,6 +58,12 @@ export const errors = {
rateLimited: (retryAfter: number) => rateLimited: (retryAfter: number) =>
new BridgeError('RATE_LIMITED', 429, 'Too many requests', { retry_after: retryAfter }), new BridgeError('RATE_LIMITED', 429, 'Too many requests', { retry_after: retryAfter }),
baserowDown: () => new BridgeError('BASEROW_UNAVAILABLE', 502, 'Baserow API unreachable'), baserowDown: () => new BridgeError('BASEROW_UNAVAILABLE', 502, 'Baserow API unreachable'),
baserowUserAuthNotConfigured: () =>
new BridgeError(
'BASEROW_USER_AUTH_NOT_CONFIGURED',
503,
'Baserow user JWT not configured (BASEROW_USER_EMAIL/PASSWORD missing)',
),
docmostDown: () => new BridgeError('DOCMOST_UNAVAILABLE', 502, 'Docmost API unreachable'), docmostDown: () => new BridgeError('DOCMOST_UNAVAILABLE', 502, 'Docmost API unreachable'),
internal: (message: string) => new BridgeError('INTERNAL', 500, message), internal: (message: string) => new BridgeError('INTERNAL', 500, message),
}; };