diff --git a/extensions/api.d.ts b/extensions/api.d.ts index 6fde2c03f..2e0216f3e 100644 --- a/extensions/api.d.ts +++ b/extensions/api.d.ts @@ -3,6 +3,7 @@ import type { WebServerService } from '@heyputer/backend/src/modules/web/WebServ import type query from '@heyputer/backend/src/om/query/query'; import type { Actor } from '@heyputer/backend/src/services/auth/Actor.js'; import type { BaseDatabaseAccessService } from '@heyputer/backend/src/services/database/BaseDatabaseAccessService.d.ts'; +import type { GetUserService } from '@heyputer/backend/src/services/GetUserService.js'; import type { EmailService } from '@heyputer/backend/src/services/EmailService.js'; import type { EntityStoreService } from '@heyputer/backend/src/services/EntityStoreService.js'; import type { MeteringService } from '@heyputer/backend/src/services/MeteringService/MeteringService.ts'; @@ -87,10 +88,6 @@ interface FilesystemModule { selectors: unknown; } -type StripPrefix< - TPrefix extends string, - T extends string, -> = T extends `${TPrefix}.${infer R}` ? R : never; // TODO DS: define this globally in core to use it there too interface ServiceNameMap { meteringService: Pick & @@ -99,6 +96,7 @@ interface ServiceNameMap { su: SUService; database: BaseDatabaseAccessService; user: UserService; + 'get-user': GetUserService; 'web-server': WebServerService; 'email': EmailService; 'es:app': EntityStoreService; diff --git a/src/backend/src/middleware/configurable_auth.js b/src/backend/src/middleware/configurable_auth.js index 119561452..e65fdb279 100644 --- a/src/backend/src/middleware/configurable_auth.js +++ b/src/backend/src/middleware/configurable_auth.js @@ -110,7 +110,8 @@ const configurable_auth = options => async (req, res, next) => { const services = context.get('services'); const svc_auth = services.get('auth'); - let actor; try { + let actor; + try { actor = await svc_auth.authenticate_from_token(token); } catch ( e ) { if ( e instanceof APIError ) { diff --git a/src/backend/src/services/repositories/DDBClient.ts b/src/backend/src/services/repositories/DDBClient.ts index 39cd376db..6fb7167f2 100644 --- a/src/backend/src/services/repositories/DDBClient.ts +++ b/src/backend/src/services/repositories/DDBClient.ts @@ -63,7 +63,7 @@ export class DDBClient { endpoint: dynamoEndpoint, region: 'us-west-2', }); - console.log(`Dynalite DynamoDB client created with region ${await client.config.region()}`); + console.log(`DynamoDB client created with region ${await client.config.region()}`); return client; }