From 56f0aef21d3fcec7ac7e968cb1c1b071becbbe26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20S=C3=B3jko?= Date: Tue, 1 Aug 2023 09:34:52 +0200 Subject: [PATCH] fix: controller naming (#678) * fix: rename home server controllers to base controllers * fix: rename inversify express controllers to annotated controllers --- package.json | 1 + packages/auth/bin/server.ts | 36 +++---- packages/auth/src/Bootstrap/Container.ts | 96 +++++++++---------- packages/auth/src/Bootstrap/Types.ts | 32 +++---- ...ec.ts => AnnotatedAdminController.spec.ts} | 11 +-- ...troller.ts => AnnotatedAdminController.ts} | 4 +- ...ntroller.ts => AnnotatedAuthController.ts} | 4 +- ...s => AnnotatedAuthenticatorsController.ts} | 4 +- ...ts => AnnotatedFeaturesController.spec.ts} | 6 +- ...ller.ts => AnnotatedFeaturesController.ts} | 4 +- ...r.ts => AnnotatedHealthCheckController.ts} | 2 +- ...ts => AnnotatedInternalController.spec.ts} | 6 +- ...ller.ts => AnnotatedInternalController.ts} | 2 +- ...c.ts => AnnotatedListedController.spec.ts} | 6 +- ...roller.ts => AnnotatedListedController.ts} | 4 +- ....ts => AnnotatedOfflineController.spec.ts} | 6 +- ...oller.ts => AnnotatedOfflineController.ts} | 4 +- ....ts => AnnotatedSessionController.spec.ts} | 6 +- ...oller.ts => AnnotatedSessionController.ts} | 4 +- ...ts => AnnotatedSessionsController.spec.ts} | 6 +- ...ller.ts => AnnotatedSessionsController.ts} | 4 +- ...ts => AnnotatedSettingsController.spec.ts} | 7 +- ...ller.ts => AnnotatedSettingsController.ts} | 4 +- ...AnnotatedSubscriptionInvitesController.ts} | 4 +- ...tedSubscriptionSettingsController.spec.ts} | 6 +- ...nnotatedSubscriptionSettingsController.ts} | 4 +- ...tatedSubscriptionTokensController.spec.ts} | 6 +- ... AnnotatedSubscriptionTokensController.ts} | 4 +- ....ts => AnnotatedUserRequestsController.ts} | 4 +- ...ec.ts => AnnotatedUsersController.spec.ts} | 6 +- ...troller.ts => AnnotatedUsersController.ts} | 4 +- ... => AnnotatedValetTokenController.spec.ts} | 6 +- ...er.ts => AnnotatedValetTokenController.ts} | 4 +- ...er.ts => AnnotatedWebSocketsController.ts} | 4 +- .../BaseAdminController.ts} | 2 +- .../BaseAuthController.ts} | 2 +- .../BaseAuthenticatorsController.ts} | 2 +- .../BaseFeaturesController.ts} | 2 +- .../BaseListedController.ts} | 2 +- .../BaseOfflineController.ts} | 2 +- .../BaseSessionController.ts} | 2 +- .../BaseSessionsController.ts} | 2 +- .../BaseSettingsController.ts} | 2 +- .../BaseSubscriptionInvitesController.ts} | 2 +- .../BaseSubscriptionSettingsController.ts} | 2 +- .../BaseSubscriptionTokensController.ts} | 2 +- .../BaseUserRequestsController.ts} | 2 +- .../BaseUsersController.ts} | 2 +- .../BaseValetTokenController.ts} | 2 +- .../BaseWebSocketsController.ts} | 2 +- packages/files/bin/server.ts | 6 +- ...ec.ts => AnnotatedFilesController.spec.ts} | 6 +- ...troller.ts => AnnotatedFilesController.ts} | 2 +- .../AnnotatedHealthCheckController.spec.ts | 12 +++ .../AnnotatedHealthCheckController.ts} | 2 +- ...=> AnnotatedSharedVaultFilesController.ts} | 2 +- ...ersifyExpressHealthCheckController.spec.ts | 12 --- .../files/src/Infra/InversifyExpress/index.ts | 3 +- packages/revisions/bin/server.ts | 4 +- packages/revisions/src/Bootstrap/Container.ts | 6 +- packages/revisions/src/Bootstrap/Types.ts | 2 +- ...r.ts => AnnotatedHealthCheckController.ts} | 2 +- ...ler.ts => AnnotatedRevisionsController.ts} | 4 +- .../BaseRevisionsController.ts} | 2 +- packages/syncing-server/bin/server.ts | 12 +-- .../syncing-server/src/Bootstrap/Container.ts | 30 +++--- .../syncing-server/src/Bootstrap/Types.ts | 10 +- .../AnnotatedHealthCheckController.ts} | 2 +- ...troller.ts => AnnotatedItemsController.ts} | 4 +- ...ller.ts => AnnotatedMessagesController.ts} | 4 +- ... AnnotatedSharedVaultInvitesController.ts} | 4 +- ...=> AnnotatedSharedVaultUsersController.ts} | 4 +- ....ts => AnnotatedSharedVaultsController.ts} | 4 +- .../BaseItemsController.ts} | 2 +- .../BaseMessagesController.ts} | 2 +- .../BaseSharedVaultInvitesController.ts} | 2 +- .../BaseSharedVaultUsersController.ts} | 2 +- .../BaseSharedVaultsController.ts} | 2 +- packages/websockets/bin/server.ts | 4 +- ...r.ts => AnnotatedHealthCheckController.ts} | 2 +- ...er.ts => AnnotatedWebSocketsController.ts} | 2 +- 81 files changed, 248 insertions(+), 252 deletions(-) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressAdminController.spec.ts => AnnotatedAdminController.spec.ts} (95%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressAdminController.ts => AnnotatedAdminController.ts} (92%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressAuthController.ts => AnnotatedAuthController.ts} (95%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressAuthenticatorsController.ts => AnnotatedAuthenticatorsController.ts} (89%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressFeaturesController.spec.ts => AnnotatedFeaturesController.spec.ts} (90%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressFeaturesController.ts => AnnotatedFeaturesController.ts} (80%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressHealthCheckController.ts => AnnotatedHealthCheckController.ts} (76%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressInternalController.spec.ts => AnnotatedInternalController.spec.ts} (92%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressInternalController.ts => AnnotatedInternalController.ts} (94%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressListedController.spec.ts => AnnotatedListedController.spec.ts} (88%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressListedController.ts => AnnotatedListedController.ts} (81%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressOfflineController.spec.ts => AnnotatedOfflineController.spec.ts} (97%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressOfflineController.ts => AnnotatedOfflineController.ts} (93%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressSessionController.spec.ts => AnnotatedSessionController.spec.ts} (96%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressSessionController.ts => AnnotatedSessionController.ts} (91%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressSessionsController.spec.ts => AnnotatedSessionsController.spec.ts} (95%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressSessionsController.ts => AnnotatedSessionsController.ts} (90%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressSettingsController.spec.ts => AnnotatedSettingsController.spec.ts} (97%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressSettingsController.ts => AnnotatedSettingsController.ts} (91%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressSubscriptionInvitesController.ts => AnnotatedSubscriptionInvitesController.ts} (88%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressSubscriptionSettingsController.spec.ts => AnnotatedSubscriptionSettingsController.spec.ts} (87%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressSubscriptionSettingsController.ts => AnnotatedSubscriptionSettingsController.ts} (77%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressSubscriptionTokensController.spec.ts => AnnotatedSubscriptionTokensController.spec.ts} (96%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressSubscriptionTokensController.ts => AnnotatedSubscriptionTokensController.ts} (90%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressUserRequestsController.ts => AnnotatedUserRequestsController.ts} (78%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressUsersController.spec.ts => AnnotatedUsersController.spec.ts} (98%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressUsersController.ts => AnnotatedUsersController.ts} (94%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressValetTokenController.spec.ts => AnnotatedValetTokenController.spec.ts} (94%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressValetTokenController.ts => AnnotatedValetTokenController.ts} (79%) rename packages/auth/src/Infra/InversifyExpressUtils/{InversifyExpressWebSocketsController.ts => AnnotatedWebSocketsController.ts} (83%) rename packages/auth/src/Infra/InversifyExpressUtils/{HomeServer/HomeServerAdminController.ts => Base/BaseAdminController.ts} (98%) rename packages/auth/src/Infra/InversifyExpressUtils/{HomeServer/HomeServerAuthController.ts => Base/BaseAuthController.ts} (99%) rename packages/auth/src/Infra/InversifyExpressUtils/{HomeServer/HomeServerAuthenticatorsController.ts => Base/BaseAuthenticatorsController.ts} (97%) rename packages/auth/src/Infra/InversifyExpressUtils/{HomeServer/HomeServerFeaturesController.ts => Base/BaseFeaturesController.ts} (94%) rename packages/auth/src/Infra/InversifyExpressUtils/{HomeServer/HomeServerListedController.ts => Base/BaseListedController.ts} (94%) rename packages/auth/src/Infra/InversifyExpressUtils/{HomeServer/HomeServerOfflineController.ts => Base/BaseOfflineController.ts} (98%) rename packages/auth/src/Infra/InversifyExpressUtils/{HomeServer/HomeServerSessionController.ts => Base/BaseSessionController.ts} (98%) rename packages/auth/src/Infra/InversifyExpressUtils/{HomeServer/HomeServerSessionsController.ts => Base/BaseSessionsController.ts} (97%) rename packages/auth/src/Infra/InversifyExpressUtils/{HomeServer/HomeServerSettingsController.ts => Base/BaseSettingsController.ts} (98%) rename packages/auth/src/Infra/InversifyExpressUtils/{HomeServer/HomeServerSubscriptionInvitesController.ts => Base/BaseSubscriptionInvitesController.ts} (97%) rename packages/auth/src/Infra/InversifyExpressUtils/{HomeServer/HomeServerSubscriptionSettingsController.ts => Base/BaseSubscriptionSettingsController.ts} (91%) rename packages/auth/src/Infra/InversifyExpressUtils/{HomeServer/HomeServerSubscriptionTokensController.ts => Base/BaseSubscriptionTokensController.ts} (97%) rename packages/auth/src/Infra/InversifyExpressUtils/{HomeServer/HomeServerUserRequestsController.ts => Base/BaseUserRequestsController.ts} (92%) rename packages/auth/src/Infra/InversifyExpressUtils/{HomeServer/HomeServerUsersController.ts => Base/BaseUsersController.ts} (99%) rename packages/auth/src/Infra/InversifyExpressUtils/{HomeServer/HomeServerValetTokenController.ts => Base/BaseValetTokenController.ts} (96%) rename packages/auth/src/Infra/InversifyExpressUtils/{HomeServer/HomeServerWebSocketsController.ts => Base/BaseWebSocketsController.ts} (95%) rename packages/files/src/Infra/InversifyExpress/{InversifyExpressFilesController.spec.ts => AnnotatedFilesController.spec.ts} (98%) rename packages/files/src/Infra/InversifyExpress/{InversifyExpressFilesController.ts => AnnotatedFilesController.ts} (98%) create mode 100644 packages/files/src/Infra/InversifyExpress/AnnotatedHealthCheckController.spec.ts rename packages/{syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressHealthCheckController.ts => files/src/Infra/InversifyExpress/AnnotatedHealthCheckController.ts} (76%) rename packages/files/src/Infra/InversifyExpress/{InversifyExpressSharedVaultFilesController.ts => AnnotatedSharedVaultFilesController.ts} (98%) delete mode 100644 packages/files/src/Infra/InversifyExpress/InversifyExpressHealthCheckController.spec.ts rename packages/revisions/src/Infra/InversifyExpress/{InversifyExpressHealthCheckController.ts => AnnotatedHealthCheckController.ts} (70%) rename packages/revisions/src/Infra/InversifyExpress/{InversifyExpressRevisionsController.ts => AnnotatedRevisionsController.ts} (84%) rename packages/revisions/src/Infra/InversifyExpress/{HomeServer/HomeServerRevisionsController.ts => Base/BaseRevisionsController.ts} (95%) rename packages/{files/src/Infra/InversifyExpress/InversifyExpressHealthCheckController.ts => syncing-server/src/Infra/InversifyExpressUtils/AnnotatedHealthCheckController.ts} (76%) rename packages/syncing-server/src/Infra/InversifyExpressUtils/{InversifyExpressItemsController.ts => AnnotatedItemsController.ts} (92%) rename packages/syncing-server/src/Infra/InversifyExpressUtils/{InversifyExpressMessagesController.ts => AnnotatedMessagesController.ts} (94%) rename packages/syncing-server/src/Infra/InversifyExpressUtils/{InversifyExpressSharedVaultInvitesController.ts => AnnotatedSharedVaultInvitesController.ts} (96%) rename packages/syncing-server/src/Infra/InversifyExpressUtils/{InversifyExpressSharedVaultUsersController.ts => AnnotatedSharedVaultUsersController.ts} (88%) rename packages/syncing-server/src/Infra/InversifyExpressUtils/{InversifyExpressSharedVaultsController.ts => AnnotatedSharedVaultsController.ts} (93%) rename packages/syncing-server/src/Infra/InversifyExpressUtils/{HomeServer/HomeServerItemsController.ts => Base/BaseItemsController.ts} (98%) rename packages/syncing-server/src/Infra/InversifyExpressUtils/{HomeServer/HomeServerMessagesController.ts => Base/BaseMessagesController.ts} (98%) rename packages/syncing-server/src/Infra/InversifyExpressUtils/{HomeServer/HomeServerSharedVaultInvitesController.ts => Base/BaseSharedVaultInvitesController.ts} (99%) rename packages/syncing-server/src/Infra/InversifyExpressUtils/{HomeServer/HomeServerSharedVaultUsersController.ts => Base/BaseSharedVaultUsersController.ts} (97%) rename packages/syncing-server/src/Infra/InversifyExpressUtils/{HomeServer/HomeServerSharedVaultsController.ts => Base/BaseSharedVaultsController.ts} (98%) rename packages/websockets/src/Infra/InversifyExpressUtils/{InversifyExpressHealthCheckController.ts => AnnotatedHealthCheckController.ts} (76%) rename packages/websockets/src/Infra/InversifyExpressUtils/{InversifyExpressWebSocketsController.ts => AnnotatedWebSocketsController.ts} (96%) diff --git a/package.json b/package.json index c706e3ce0..c3d3a2bee 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ }, "scripts": { "lint": "yarn workspaces foreach -p -j 10 --verbose run lint", + "lint:fix": "yarn workspaces foreach -p -j 10 --verbose run lint:fix", "clean": "yarn workspaces foreach -p --verbose run clean", "setup:env": "cp .env.sample .env && yarn workspaces foreach -p --verbose run setup:env", "release": "lerna version --conventional-graduate --conventional-commits --yes -m \"chore(release): publish new version\"", diff --git a/packages/auth/bin/server.ts b/packages/auth/bin/server.ts index 91e1c4662..39d27a297 100644 --- a/packages/auth/bin/server.ts +++ b/packages/auth/bin/server.ts @@ -1,23 +1,23 @@ import 'reflect-metadata' -import '../src/Infra/InversifyExpressUtils/InversifyExpressAuthController' -import '../src/Infra/InversifyExpressUtils/InversifyExpressAuthenticatorsController' -import '../src/Infra/InversifyExpressUtils/InversifyExpressSessionsController' -import '../src/Infra/InversifyExpressUtils/InversifyExpressSubscriptionInvitesController' -import '../src/Infra/InversifyExpressUtils/InversifyExpressUserRequestsController' -import '../src/Infra/InversifyExpressUtils/InversifyExpressWebSocketsController' -import '../src/Infra/InversifyExpressUtils/InversifyExpressUsersController' -import '../src/Infra/InversifyExpressUtils/InversifyExpressValetTokenController' -import '../src/Infra/InversifyExpressUtils/InversifyExpressAdminController' -import '../src/Infra/InversifyExpressUtils/InversifyExpressSubscriptionTokensController' -import '../src/Infra/InversifyExpressUtils/InversifyExpressSubscriptionSettingsController' -import '../src/Infra/InversifyExpressUtils/InversifyExpressSettingsController' -import '../src/Infra/InversifyExpressUtils/InversifyExpressSessionController' -import '../src/Infra/InversifyExpressUtils/InversifyExpressOfflineController' -import '../src/Infra/InversifyExpressUtils/InversifyExpressListedController' -import '../src/Infra/InversifyExpressUtils/InversifyExpressInternalController' -import '../src/Infra/InversifyExpressUtils/InversifyExpressHealthCheckController' -import '../src/Infra/InversifyExpressUtils/InversifyExpressFeaturesController' +import '../src/Infra/InversifyExpressUtils/AnnotatedAuthController' +import '../src/Infra/InversifyExpressUtils/AnnotatedAuthenticatorsController' +import '../src/Infra/InversifyExpressUtils/AnnotatedSessionsController' +import '../src/Infra/InversifyExpressUtils/AnnotatedSubscriptionInvitesController' +import '../src/Infra/InversifyExpressUtils/AnnotatedUserRequestsController' +import '../src/Infra/InversifyExpressUtils/AnnotatedWebSocketsController' +import '../src/Infra/InversifyExpressUtils/AnnotatedUsersController' +import '../src/Infra/InversifyExpressUtils/AnnotatedValetTokenController' +import '../src/Infra/InversifyExpressUtils/AnnotatedAdminController' +import '../src/Infra/InversifyExpressUtils/AnnotatedSubscriptionTokensController' +import '../src/Infra/InversifyExpressUtils/AnnotatedSubscriptionSettingsController' +import '../src/Infra/InversifyExpressUtils/AnnotatedSettingsController' +import '../src/Infra/InversifyExpressUtils/AnnotatedSessionController' +import '../src/Infra/InversifyExpressUtils/AnnotatedOfflineController' +import '../src/Infra/InversifyExpressUtils/AnnotatedListedController' +import '../src/Infra/InversifyExpressUtils/AnnotatedInternalController' +import '../src/Infra/InversifyExpressUtils/AnnotatedHealthCheckController' +import '../src/Infra/InversifyExpressUtils/AnnotatedFeaturesController' import * as cors from 'cors' import { urlencoded, json, Request, Response, NextFunction } from 'express' diff --git a/packages/auth/src/Bootstrap/Container.ts b/packages/auth/src/Bootstrap/Container.ts index 86e17ef98..45a752641 100644 --- a/packages/auth/src/Bootstrap/Container.ts +++ b/packages/auth/src/Bootstrap/Container.ts @@ -234,22 +234,22 @@ import { OfflineUserAuthMiddleware } from '../Infra/InversifyExpressUtils/Middle import { LockMiddleware } from '../Infra/InversifyExpressUtils/Middleware/LockMiddleware' import { RequiredCrossServiceTokenMiddleware } from '../Infra/InversifyExpressUtils/Middleware/RequiredCrossServiceTokenMiddleware' import { OptionalCrossServiceTokenMiddleware } from '../Infra/InversifyExpressUtils/Middleware/OptionalCrossServiceTokenMiddleware' -import { HomeServerSettingsController } from '../Infra/InversifyExpressUtils/HomeServer/HomeServerSettingsController' -import { HomeServerAdminController } from '../Infra/InversifyExpressUtils/HomeServer/HomeServerAdminController' -import { HomeServerAuthController } from '../Infra/InversifyExpressUtils/HomeServer/HomeServerAuthController' -import { HomeServerAuthenticatorsController } from '../Infra/InversifyExpressUtils/HomeServer/HomeServerAuthenticatorsController' -import { HomeServerFeaturesController } from '../Infra/InversifyExpressUtils/HomeServer/HomeServerFeaturesController' -import { HomeServerListedController } from '../Infra/InversifyExpressUtils/HomeServer/HomeServerListedController' -import { HomeServerOfflineController } from '../Infra/InversifyExpressUtils/HomeServer/HomeServerOfflineController' -import { HomeServerSessionController } from '../Infra/InversifyExpressUtils/HomeServer/HomeServerSessionController' -import { HomeServerSubscriptionInvitesController } from '../Infra/InversifyExpressUtils/HomeServer/HomeServerSubscriptionInvitesController' -import { HomeServerSubscriptionSettingsController } from '../Infra/InversifyExpressUtils/HomeServer/HomeServerSubscriptionSettingsController' -import { HomeServerSubscriptionTokensController } from '../Infra/InversifyExpressUtils/HomeServer/HomeServerSubscriptionTokensController' -import { HomeServerUserRequestsController } from '../Infra/InversifyExpressUtils/HomeServer/HomeServerUserRequestsController' -import { HomeServerUsersController } from '../Infra/InversifyExpressUtils/HomeServer/HomeServerUsersController' -import { HomeServerValetTokenController } from '../Infra/InversifyExpressUtils/HomeServer/HomeServerValetTokenController' -import { HomeServerWebSocketsController } from '../Infra/InversifyExpressUtils/HomeServer/HomeServerWebSocketsController' -import { HomeServerSessionsController } from '../Infra/InversifyExpressUtils/HomeServer/HomeServerSessionsController' +import { BaseSettingsController } from '../Infra/InversifyExpressUtils/Base/BaseSettingsController' +import { BaseAdminController } from '../Infra/InversifyExpressUtils/Base/BaseAdminController' +import { BaseAuthController } from '../Infra/InversifyExpressUtils/Base/BaseAuthController' +import { BaseAuthenticatorsController } from '../Infra/InversifyExpressUtils/Base/BaseAuthenticatorsController' +import { BaseFeaturesController } from '../Infra/InversifyExpressUtils/Base/BaseFeaturesController' +import { BaseListedController } from '../Infra/InversifyExpressUtils/Base/BaseListedController' +import { BaseOfflineController } from '../Infra/InversifyExpressUtils/Base/BaseOfflineController' +import { BaseSessionController } from '../Infra/InversifyExpressUtils/Base/BaseSessionController' +import { BaseSubscriptionInvitesController } from '../Infra/InversifyExpressUtils/Base/BaseSubscriptionInvitesController' +import { BaseSubscriptionSettingsController } from '../Infra/InversifyExpressUtils/Base/BaseSubscriptionSettingsController' +import { BaseSubscriptionTokensController } from '../Infra/InversifyExpressUtils/Base/BaseSubscriptionTokensController' +import { BaseUserRequestsController } from '../Infra/InversifyExpressUtils/Base/BaseUserRequestsController' +import { BaseUsersController } from '../Infra/InversifyExpressUtils/Base/BaseUsersController' +import { BaseValetTokenController } from '../Infra/InversifyExpressUtils/Base/BaseValetTokenController' +import { BaseWebSocketsController } from '../Infra/InversifyExpressUtils/Base/BaseWebSocketsController' +import { BaseSessionsController } from '../Infra/InversifyExpressUtils/Base/BaseSessionsController' import { Transform } from 'stream' import { ActivatePremiumFeatures } from '../Domain/UseCase/ActivatePremiumFeatures/ActivatePremiumFeatures' @@ -1037,9 +1037,9 @@ export class ContainerConfigLoader { } container - .bind(TYPES.Auth_HomeServerAuthController) + .bind(TYPES.Auth_BaseAuthController) .toConstantValue( - new HomeServerAuthController( + new BaseAuthController( container.get(TYPES.Auth_VerifyMFA), container.get(TYPES.Auth_SignIn), container.get(TYPES.Auth_GetUserKeyParams), @@ -1054,42 +1054,42 @@ export class ContainerConfigLoader { // Inversify Controllers if (isConfiguredForHomeServer) { container - .bind(TYPES.Auth_HomeServerAuthenticatorsController) + .bind(TYPES.Auth_BaseAuthenticatorsController) .toConstantValue( - new HomeServerAuthenticatorsController( + new BaseAuthenticatorsController( container.get(TYPES.Auth_AuthenticatorsController), container.get(TYPES.Auth_ControllerContainer), ), ) container - .bind(TYPES.Auth_HomeServerSubscriptionInvitesController) + .bind(TYPES.Auth_BaseSubscriptionInvitesController) .toConstantValue( - new HomeServerSubscriptionInvitesController( + new BaseSubscriptionInvitesController( container.get(TYPES.Auth_SubscriptionInvitesController), container.get(TYPES.Auth_ControllerContainer), ), ) container - .bind(TYPES.Auth_HomeServerUserRequestsController) + .bind(TYPES.Auth_BaseUserRequestsController) .toConstantValue( - new HomeServerUserRequestsController( + new BaseUserRequestsController( container.get(TYPES.Auth_UserRequestsController), container.get(TYPES.Auth_ControllerContainer), ), ) container - .bind(TYPES.Auth_HomeServerWebSocketsController) + .bind(TYPES.Auth_BaseWebSocketsController) .toConstantValue( - new HomeServerWebSocketsController( + new BaseWebSocketsController( container.get(TYPES.Auth_CreateCrossServiceToken), container.get(TYPES.Auth_WebSocketConnectionTokenDecoder), container.get(TYPES.Auth_ControllerContainer), ), ) container - .bind(TYPES.Auth_HomeServerSessionsController) + .bind(TYPES.Auth_BaseSessionsController) .toConstantValue( - new HomeServerSessionsController( + new BaseSessionsController( container.get(TYPES.Auth_GetActiveSessionsForUser), container.get(TYPES.Auth_AuthenticateRequest), container.get(TYPES.Auth_SessionProjector), @@ -1098,17 +1098,17 @@ export class ContainerConfigLoader { ), ) container - .bind(TYPES.Auth_HomeServerValetTokenController) + .bind(TYPES.Auth_BaseValetTokenController) .toConstantValue( - new HomeServerValetTokenController( + new BaseValetTokenController( container.get(TYPES.Auth_CreateValetToken), container.get(TYPES.Auth_ControllerContainer), ), ) container - .bind(TYPES.Auth_HomeServerUsersController) + .bind(TYPES.Auth_BaseUsersController) .toConstantValue( - new HomeServerUsersController( + new BaseUsersController( container.get(TYPES.Auth_UpdateUser), container.get(TYPES.Auth_GetUserKeyParams), container.get(TYPES.Auth_DeleteAccount), @@ -1120,9 +1120,9 @@ export class ContainerConfigLoader { ), ) container - .bind(TYPES.Auth_HomeServerAdminController) + .bind(TYPES.Auth_BaseAdminController) .toConstantValue( - new HomeServerAdminController( + new BaseAdminController( container.get(TYPES.Auth_DeleteSetting), container.get(TYPES.Auth_UserRepository), container.get(TYPES.Auth_CreateSubscriptionToken), @@ -1131,9 +1131,9 @@ export class ContainerConfigLoader { ), ) container - .bind(TYPES.Auth_HomeServerSubscriptionTokensController) + .bind(TYPES.Auth_BaseSubscriptionTokensController) .toConstantValue( - new HomeServerSubscriptionTokensController( + new BaseSubscriptionTokensController( container.get(TYPES.Auth_CreateSubscriptionToken), container.get(TYPES.Auth_AuthenticateSubscriptionToken), container.get(TYPES.Auth_SettingService), @@ -1145,17 +1145,17 @@ export class ContainerConfigLoader { ), ) container - .bind(TYPES.Auth_HomeServerSubscriptionSettingsController) + .bind(TYPES.Auth_BaseSubscriptionSettingsController) .toConstantValue( - new HomeServerSubscriptionSettingsController( + new BaseSubscriptionSettingsController( container.get(TYPES.Auth_GetSetting), container.get(TYPES.Auth_ControllerContainer), ), ) container - .bind(TYPES.Auth_HomeServerSettingsController) + .bind(TYPES.Auth_BaseSettingsController) .toConstantValue( - new HomeServerSettingsController( + new BaseSettingsController( container.get(TYPES.Auth_GetSettings), container.get(TYPES.Auth_GetSetting), container.get(TYPES.Auth_UpdateSetting), @@ -1164,9 +1164,9 @@ export class ContainerConfigLoader { ), ) container - .bind(TYPES.Auth_HomeServerSessionController) + .bind(TYPES.Auth_BaseSessionController) .toConstantValue( - new HomeServerSessionController( + new BaseSessionController( container.get(TYPES.Auth_DeleteSessionForUser), container.get(TYPES.Auth_DeletePreviousSessionsForUser), container.get(TYPES.Auth_RefreshSessionToken), @@ -1174,9 +1174,9 @@ export class ContainerConfigLoader { ), ) container - .bind(TYPES.Auth_HomeServerOfflineController) + .bind(TYPES.Auth_BaseOfflineController) .toConstantValue( - new HomeServerOfflineController( + new BaseOfflineController( container.get(TYPES.Auth_GetUserFeatures), container.get(TYPES.Auth_GetUserOfflineSubscription), container.get(TYPES.Auth_CreateOfflineSubscriptionToken), @@ -1188,17 +1188,17 @@ export class ContainerConfigLoader { ), ) container - .bind(TYPES.Auth_HomeServerListedController) + .bind(TYPES.Auth_BaseListedController) .toConstantValue( - new HomeServerListedController( + new BaseListedController( container.get(TYPES.Auth_CreateListedAccount), container.get(TYPES.Auth_ControllerContainer), ), ) container - .bind(TYPES.Auth_HomeServerFeaturesController) + .bind(TYPES.Auth_BaseFeaturesController) .toConstantValue( - new HomeServerFeaturesController( + new BaseFeaturesController( container.get(TYPES.Auth_GetUserFeatures), container.get(TYPES.Auth_ControllerContainer), ), diff --git a/packages/auth/src/Bootstrap/Types.ts b/packages/auth/src/Bootstrap/Types.ts index fc0e7a558..dc405eed6 100644 --- a/packages/auth/src/Bootstrap/Types.ts +++ b/packages/auth/src/Bootstrap/Types.ts @@ -217,22 +217,22 @@ const TYPES = { Auth_ProtocolVersionSelector: Symbol.for('Auth_ProtocolVersionSelector'), Auth_BooleanSelector: Symbol.for('Auth_BooleanSelector'), Auth_UserSubscriptionService: Symbol.for('Auth_UserSubscriptionService'), - Auth_HomeServerAuthController: Symbol.for('Auth_HomeServerAuthController'), - Auth_HomeServerAuthenticatorsController: Symbol.for('Auth_HomeServerAuthenticatorsController'), - Auth_HomeServerSubscriptionInvitesController: Symbol.for('Auth_HomeServerSubscriptionInvitesController'), - Auth_HomeServerUserRequestsController: Symbol.for('Auth_HomeServerUserRequestsController'), - Auth_HomeServerWebSocketsController: Symbol.for('Auth_HomeServerWebSocketsController'), - Auth_HomeServerSessionsController: Symbol.for('Auth_HomeServerSessionsController'), - Auth_HomeServerValetTokenController: Symbol.for('Auth_HomeServerValetTokenController'), - Auth_HomeServerUsersController: Symbol.for('Auth_HomeServerUsersController'), - Auth_HomeServerAdminController: Symbol.for('Auth_HomeServerAdminController'), - Auth_HomeServerSubscriptionTokensController: Symbol.for('Auth_HomeServerSubscriptionTokensController'), - Auth_HomeServerSubscriptionSettingsController: Symbol.for('Auth_HomeServerSubscriptionSettingsController'), - Auth_HomeServerSettingsController: Symbol.for('Auth_HomeServerSettingsController'), - Auth_HomeServerSessionController: Symbol.for('Auth_HomeServerSessionController'), - Auth_HomeServerOfflineController: Symbol.for('Auth_HomeServerOfflineController'), - Auth_HomeServerListedController: Symbol.for('Auth_HomeServerListedController'), - Auth_HomeServerFeaturesController: Symbol.for('Auth_HomeServerFeaturesController'), + Auth_BaseAuthController: Symbol.for('Auth_BaseAuthController'), + Auth_BaseAuthenticatorsController: Symbol.for('Auth_BaseAuthenticatorsController'), + Auth_BaseSubscriptionInvitesController: Symbol.for('Auth_BaseSubscriptionInvitesController'), + Auth_BaseUserRequestsController: Symbol.for('Auth_BaseUserRequestsController'), + Auth_BaseWebSocketsController: Symbol.for('Auth_BaseWebSocketsController'), + Auth_BaseSessionsController: Symbol.for('Auth_BaseSessionsController'), + Auth_BaseValetTokenController: Symbol.for('Auth_BaseValetTokenController'), + Auth_BaseUsersController: Symbol.for('Auth_BaseUsersController'), + Auth_BaseAdminController: Symbol.for('Auth_BaseAdminController'), + Auth_BaseSubscriptionTokensController: Symbol.for('Auth_BaseSubscriptionTokensController'), + Auth_BaseSubscriptionSettingsController: Symbol.for('Auth_BaseSubscriptionSettingsController'), + Auth_BaseSettingsController: Symbol.for('Auth_BaseSettingsController'), + Auth_BaseSessionController: Symbol.for('Auth_BaseSessionController'), + Auth_BaseOfflineController: Symbol.for('Auth_BaseOfflineController'), + Auth_BaseListedController: Symbol.for('Auth_BaseListedController'), + Auth_BaseFeaturesController: Symbol.for('Auth_BaseFeaturesController'), } export default TYPES diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressAdminController.spec.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedAdminController.spec.ts similarity index 95% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressAdminController.spec.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedAdminController.spec.ts index 97544af0c..e9625024a 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressAdminController.spec.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedAdminController.spec.ts @@ -1,6 +1,6 @@ import 'reflect-metadata' -import { InversifyExpressAdminController } from './InversifyExpressAdminController' +import { AnnotatedAdminController } from './AnnotatedAdminController' import { results } from 'inversify-express-utils' import { User } from '../../Domain/User/User' import { UserRepositoryInterface } from '../../Domain/User/UserRepositoryInterface' @@ -9,7 +9,7 @@ import { DeleteSetting } from '../../Domain/UseCase/DeleteSetting/DeleteSetting' import { CreateSubscriptionToken } from '../../Domain/UseCase/CreateSubscriptionToken/CreateSubscriptionToken' import { CreateOfflineSubscriptionToken } from '../../Domain/UseCase/CreateOfflineSubscriptionToken/CreateOfflineSubscriptionToken' -describe('InversifyExpressAdminController', () => { +describe('AnnotatedAdminController', () => { let deleteSetting: DeleteSetting let userRepository: UserRepositoryInterface let createSubscriptionToken: CreateSubscriptionToken @@ -18,12 +18,7 @@ describe('InversifyExpressAdminController', () => { let user: User const createController = () => - new InversifyExpressAdminController( - deleteSetting, - userRepository, - createSubscriptionToken, - createOfflineSubscriptionToken, - ) + new AnnotatedAdminController(deleteSetting, userRepository, createSubscriptionToken, createOfflineSubscriptionToken) beforeEach(() => { user = {} as jest.Mocked diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressAdminController.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedAdminController.ts similarity index 92% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressAdminController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedAdminController.ts index 937dc02bb..ea8cb156c 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressAdminController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedAdminController.ts @@ -9,14 +9,14 @@ import { results, } from 'inversify-express-utils' import TYPES from '../../Bootstrap/Types' -import { HomeServerAdminController } from './HomeServer/HomeServerAdminController' +import { BaseAdminController } from './Base/BaseAdminController' import { CreateOfflineSubscriptionToken } from '../../Domain/UseCase/CreateOfflineSubscriptionToken/CreateOfflineSubscriptionToken' import { CreateSubscriptionToken } from '../../Domain/UseCase/CreateSubscriptionToken/CreateSubscriptionToken' import { DeleteSetting } from '../../Domain/UseCase/DeleteSetting/DeleteSetting' import { UserRepositoryInterface } from '../../Domain/User/UserRepositoryInterface' @controller('/admin') -export class InversifyExpressAdminController extends HomeServerAdminController { +export class AnnotatedAdminController extends BaseAdminController { constructor( @inject(TYPES.Auth_DeleteSetting) override doDeleteSetting: DeleteSetting, @inject(TYPES.Auth_UserRepository) override userRepository: UserRepositoryInterface, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressAuthController.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedAuthController.ts similarity index 95% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressAuthController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedAuthController.ts index 4b4a68fd1..6a8a8bff4 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressAuthController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedAuthController.ts @@ -16,10 +16,10 @@ import { Logger } from 'winston' import { GetUserKeyParams } from '../../Domain/UseCase/GetUserKeyParams/GetUserKeyParams' import { AuthController } from '../../Controller/AuthController' import { inject } from 'inversify' -import { HomeServerAuthController } from './HomeServer/HomeServerAuthController' +import { BaseAuthController } from './Base/BaseAuthController' @controller('/auth') -export class InversifyExpressAuthController extends HomeServerAuthController { +export class AnnotatedAuthController extends BaseAuthController { constructor( @inject(TYPES.Auth_VerifyMFA) override verifyMFA: VerifyMFA, @inject(TYPES.Auth_SignIn) override signInUseCase: SignIn, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressAuthenticatorsController.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedAuthenticatorsController.ts similarity index 89% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressAuthenticatorsController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedAuthenticatorsController.ts index dd07db6e1..4097061bc 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressAuthenticatorsController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedAuthenticatorsController.ts @@ -10,10 +10,10 @@ import { import TYPES from '../../Bootstrap/Types' import { AuthenticatorsController } from '../../Controller/AuthenticatorsController' import { inject } from 'inversify' -import { HomeServerAuthenticatorsController } from './HomeServer/HomeServerAuthenticatorsController' +import { BaseAuthenticatorsController } from './Base/BaseAuthenticatorsController' @controller('/authenticators') -export class InversifyExpressAuthenticatorsController extends HomeServerAuthenticatorsController { +export class AnnotatedAuthenticatorsController extends BaseAuthenticatorsController { constructor( @inject(TYPES.Auth_AuthenticatorsController) override authenticatorsController: AuthenticatorsController, ) { diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressFeaturesController.spec.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedFeaturesController.spec.ts similarity index 90% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressFeaturesController.spec.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedFeaturesController.spec.ts index 2a365df93..3dc88cf8e 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressFeaturesController.spec.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedFeaturesController.spec.ts @@ -2,19 +2,19 @@ import 'reflect-metadata' import * as express from 'express' -import { InversifyExpressFeaturesController } from './InversifyExpressFeaturesController' +import { AnnotatedFeaturesController } from './AnnotatedFeaturesController' import { results } from 'inversify-express-utils' import { User } from '../../Domain/User/User' import { GetUserFeatures } from '../../Domain/UseCase/GetUserFeatures/GetUserFeatures' -describe('InversifyExpressFeaturesController', () => { +describe('AnnotatedFeaturesController', () => { let getUserFeatures: GetUserFeatures let request: express.Request let response: express.Response let user: User - const createController = () => new InversifyExpressFeaturesController(getUserFeatures) + const createController = () => new AnnotatedFeaturesController(getUserFeatures) beforeEach(() => { user = {} as jest.Mocked diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressFeaturesController.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedFeaturesController.ts similarity index 80% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressFeaturesController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedFeaturesController.ts index 601e18099..a01e680f9 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressFeaturesController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedFeaturesController.ts @@ -8,10 +8,10 @@ import { } from 'inversify-express-utils' import TYPES from '../../Bootstrap/Types' import { GetUserFeatures } from '../../Domain/UseCase/GetUserFeatures/GetUserFeatures' -import { HomeServerFeaturesController } from './HomeServer/HomeServerFeaturesController' +import { BaseFeaturesController } from './Base/BaseFeaturesController' @controller('/users/:userUuid/features') -export class InversifyExpressFeaturesController extends HomeServerFeaturesController { +export class AnnotatedFeaturesController extends BaseFeaturesController { constructor(@inject(TYPES.Auth_GetUserFeatures) override doGetUserFeatures: GetUserFeatures) { super(doGetUserFeatures) } diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressHealthCheckController.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedHealthCheckController.ts similarity index 76% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressHealthCheckController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedHealthCheckController.ts index 535288409..75216a5f9 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressHealthCheckController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedHealthCheckController.ts @@ -1,7 +1,7 @@ import { controller, httpGet } from 'inversify-express-utils' @controller('/healthcheck') -export class InversifyExpressHealthCheckController { +export class AnnotatedHealthCheckController { @httpGet('/') public async get(): Promise { return 'OK' diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressInternalController.spec.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedInternalController.spec.ts similarity index 92% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressInternalController.spec.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedInternalController.spec.ts index fcf5fd45b..b7581f1aa 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressInternalController.spec.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedInternalController.spec.ts @@ -2,13 +2,13 @@ import 'reflect-metadata' import * as express from 'express' -import { InversifyExpressInternalController } from './InversifyExpressInternalController' +import { AnnotatedInternalController } from './AnnotatedInternalController' import { results } from 'inversify-express-utils' import { User } from '../../Domain/User/User' import { GetUserFeatures } from '../../Domain/UseCase/GetUserFeatures/GetUserFeatures' import { GetSetting } from '../../Domain/UseCase/GetSetting/GetSetting' -describe('InversifyExpressInternalController', () => { +describe('AnnotatedInternalController', () => { let getUserFeatures: GetUserFeatures let getSetting: GetSetting @@ -16,7 +16,7 @@ describe('InversifyExpressInternalController', () => { let response: express.Response let user: User - const createController = () => new InversifyExpressInternalController(getUserFeatures, getSetting) + const createController = () => new AnnotatedInternalController(getUserFeatures, getSetting) beforeEach(() => { user = {} as jest.Mocked diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressInternalController.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedInternalController.ts similarity index 94% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressInternalController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedInternalController.ts index 10fa7fdb1..be916ccc2 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressInternalController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedInternalController.ts @@ -12,7 +12,7 @@ import { GetSetting } from '../../Domain/UseCase/GetSetting/GetSetting' import { GetUserFeatures } from '../../Domain/UseCase/GetUserFeatures/GetUserFeatures' @controller('/internal') -export class InversifyExpressInternalController extends BaseHttpController { +export class AnnotatedInternalController extends BaseHttpController { constructor( @inject(TYPES.Auth_GetUserFeatures) private doGetUserFeatures: GetUserFeatures, @inject(TYPES.Auth_GetSetting) private doGetSetting: GetSetting, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressListedController.spec.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedListedController.spec.ts similarity index 88% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressListedController.spec.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedListedController.spec.ts index 05d21824b..7eb89343c 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressListedController.spec.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedListedController.spec.ts @@ -3,18 +3,18 @@ import 'reflect-metadata' import * as express from 'express' import { results } from 'inversify-express-utils' -import { InversifyExpressListedController } from './InversifyExpressListedController' +import { AnnotatedListedController } from './AnnotatedListedController' import { User } from '../../Domain/User/User' import { CreateListedAccount } from '../../Domain/UseCase/CreateListedAccount/CreateListedAccount' -describe('InversifyExpressListedController', () => { +describe('AnnotatedListedController', () => { let createListedAccount: CreateListedAccount let request: express.Request let response: express.Response let user: User - const createController = () => new InversifyExpressListedController(createListedAccount) + const createController = () => new AnnotatedListedController(createListedAccount) beforeEach(() => { user = {} as jest.Mocked diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressListedController.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedListedController.ts similarity index 81% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressListedController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedListedController.ts index 31aa565ff..640d52c20 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressListedController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedListedController.ts @@ -4,10 +4,10 @@ import { controller, httpPost, results } from 'inversify-express-utils' import { Request, Response } from 'express' import TYPES from '../../Bootstrap/Types' import { CreateListedAccount } from '../../Domain/UseCase/CreateListedAccount/CreateListedAccount' -import { HomeServerListedController } from './HomeServer/HomeServerListedController' +import { BaseListedController } from './Base/BaseListedController' @controller('/listed') -export class InversifyExpressListedController extends HomeServerListedController { +export class AnnotatedListedController extends BaseListedController { constructor(@inject(TYPES.Auth_CreateListedAccount) override doCreateListedAccount: CreateListedAccount) { super(doCreateListedAccount) } diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressOfflineController.spec.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedOfflineController.spec.ts similarity index 97% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressOfflineController.spec.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedOfflineController.spec.ts index 5fd81f3ab..398bab364 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressOfflineController.spec.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedOfflineController.spec.ts @@ -2,7 +2,7 @@ import 'reflect-metadata' import * as express from 'express' -import { InversifyExpressOfflineController } from './InversifyExpressOfflineController' +import { AnnotatedOfflineController } from './AnnotatedOfflineController' import { results } from 'inversify-express-utils' import { User } from '../../Domain/User/User' import { GetUserFeatures } from '../../Domain/UseCase/GetUserFeatures/GetUserFeatures' @@ -15,7 +15,7 @@ import { OfflineUserTokenData, TokenEncoderInterface } from '@standardnotes/secu import { SubscriptionName } from '@standardnotes/common' import { Logger } from 'winston' -describe('InversifyExpressOfflineController', () => { +describe('AnnotatedOfflineController', () => { let getUserFeatures: GetUserFeatures let getUserOfflineSubscription: GetUserOfflineSubscription let createOfflineSubscriptionToken: CreateOfflineSubscriptionToken @@ -29,7 +29,7 @@ describe('InversifyExpressOfflineController', () => { let user: User const createController = () => - new InversifyExpressOfflineController( + new AnnotatedOfflineController( getUserFeatures, getUserOfflineSubscription, createOfflineSubscriptionToken, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressOfflineController.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedOfflineController.ts similarity index 93% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressOfflineController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedOfflineController.ts index cbda870cd..b1adcb9ed 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressOfflineController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedOfflineController.ts @@ -14,10 +14,10 @@ import { AuthenticateOfflineSubscriptionToken } from '../../Domain/UseCase/Authe import { CreateOfflineSubscriptionToken } from '../../Domain/UseCase/CreateOfflineSubscriptionToken/CreateOfflineSubscriptionToken' import { GetUserFeatures } from '../../Domain/UseCase/GetUserFeatures/GetUserFeatures' import { GetUserOfflineSubscription } from '../../Domain/UseCase/GetUserOfflineSubscription/GetUserOfflineSubscription' -import { HomeServerOfflineController } from './HomeServer/HomeServerOfflineController' +import { BaseOfflineController } from './Base/BaseOfflineController' @controller('/offline') -export class InversifyExpressOfflineController extends HomeServerOfflineController { +export class AnnotatedOfflineController extends BaseOfflineController { constructor( @inject(TYPES.Auth_GetUserFeatures) override doGetUserFeatures: GetUserFeatures, @inject(TYPES.Auth_GetUserOfflineSubscription) override getUserOfflineSubscription: GetUserOfflineSubscription, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSessionController.spec.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSessionController.spec.ts similarity index 96% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSessionController.spec.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSessionController.spec.ts index 8801d902c..3253d0ab6 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSessionController.spec.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSessionController.spec.ts @@ -2,13 +2,13 @@ import 'reflect-metadata' import * as express from 'express' -import { InversifyExpressSessionController } from './InversifyExpressSessionController' +import { AnnotatedSessionController } from './AnnotatedSessionController' import { results } from 'inversify-express-utils' import { DeletePreviousSessionsForUser } from '../../Domain/UseCase/DeletePreviousSessionsForUser' import { DeleteSessionForUser } from '../../Domain/UseCase/DeleteSessionForUser' import { RefreshSessionToken } from '../../Domain/UseCase/RefreshSessionToken' -describe('InversifyExpressSessionController', () => { +describe('AnnotatedSessionController', () => { let deleteSessionForUser: DeleteSessionForUser let deletePreviousSessionsForUser: DeletePreviousSessionsForUser let refreshSessionToken: RefreshSessionToken @@ -16,7 +16,7 @@ describe('InversifyExpressSessionController', () => { let response: express.Response const createController = () => - new InversifyExpressSessionController(deleteSessionForUser, deletePreviousSessionsForUser, refreshSessionToken) + new AnnotatedSessionController(deleteSessionForUser, deletePreviousSessionsForUser, refreshSessionToken) beforeEach(() => { deleteSessionForUser = {} as jest.Mocked diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSessionController.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSessionController.ts similarity index 91% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSessionController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSessionController.ts index f88f37558..c53bacc99 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSessionController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSessionController.ts @@ -11,10 +11,10 @@ import TYPES from '../../Bootstrap/Types' import { DeletePreviousSessionsForUser } from '../../Domain/UseCase/DeletePreviousSessionsForUser' import { DeleteSessionForUser } from '../../Domain/UseCase/DeleteSessionForUser' import { RefreshSessionToken } from '../../Domain/UseCase/RefreshSessionToken' -import { HomeServerSessionController } from './HomeServer/HomeServerSessionController' +import { BaseSessionController } from './Base/BaseSessionController' @controller('/session') -export class InversifyExpressSessionController extends HomeServerSessionController { +export class AnnotatedSessionController extends BaseSessionController { constructor( @inject(TYPES.Auth_DeleteSessionForUser) override deleteSessionForUser: DeleteSessionForUser, @inject(TYPES.Auth_DeletePreviousSessionsForUser) diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSessionsController.spec.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSessionsController.spec.ts similarity index 95% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSessionsController.spec.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSessionsController.spec.ts index 8a23d5da4..c3a1ffe1d 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSessionsController.spec.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSessionsController.spec.ts @@ -2,7 +2,7 @@ import 'reflect-metadata' import * as express from 'express' -import { InversifyExpressSessionsController } from './InversifyExpressSessionsController' +import { AnnotatedSessionsController } from './AnnotatedSessionsController' import { results } from 'inversify-express-utils' import { User } from '@standardnotes/responses' @@ -12,7 +12,7 @@ import { GetActiveSessionsForUser } from '../../Domain/UseCase/GetActiveSessions import { ProjectorInterface } from '../../Projection/ProjectorInterface' import { Session } from '../../Domain/Session/Session' -describe('InversifyExpressSessionsController', () => { +describe('AnnotatedSessionsController', () => { let getActiveSessionsForUser: GetActiveSessionsForUser let authenticateRequest: AuthenticateRequest let sessionProjector: ProjectorInterface @@ -23,7 +23,7 @@ describe('InversifyExpressSessionsController', () => { let createCrossServiceToken: CreateCrossServiceToken const createController = () => - new InversifyExpressSessionsController( + new AnnotatedSessionsController( getActiveSessionsForUser, authenticateRequest, sessionProjector, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSessionsController.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSessionsController.ts similarity index 90% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSessionsController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSessionsController.ts index 515d915c3..cb330dcba 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSessionsController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSessionsController.ts @@ -14,10 +14,10 @@ import { CreateCrossServiceToken } from '../../Domain/UseCase/CreateCrossService import { GetActiveSessionsForUser } from '../../Domain/UseCase/GetActiveSessionsForUser' import { ProjectorInterface } from '../../Projection/ProjectorInterface' import { Session } from '../../Domain/Session/Session' -import { HomeServerSessionsController } from './HomeServer/HomeServerSessionsController' +import { BaseSessionsController } from './Base/BaseSessionsController' @controller('/sessions') -export class InversifyExpressSessionsController extends HomeServerSessionsController { +export class AnnotatedSessionsController extends BaseSessionsController { constructor( @inject(TYPES.Auth_GetActiveSessionsForUser) override getActiveSessionsForUser: GetActiveSessionsForUser, @inject(TYPES.Auth_AuthenticateRequest) override authenticateRequest: AuthenticateRequest, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSettingsController.spec.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSettingsController.spec.ts similarity index 97% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSettingsController.spec.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSettingsController.spec.ts index a5b5167e6..97a6bbc98 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSettingsController.spec.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSettingsController.spec.ts @@ -2,7 +2,7 @@ import 'reflect-metadata' import * as express from 'express' -import { InversifyExpressSettingsController } from './InversifyExpressSettingsController' +import { AnnotatedSettingsController } from './AnnotatedSettingsController' import { results } from 'inversify-express-utils' import { EncryptionVersion } from '../../Domain/Encryption/EncryptionVersion' import { DeleteSetting } from '../../Domain/UseCase/DeleteSetting/DeleteSetting' @@ -11,7 +11,7 @@ import { GetSettings } from '../../Domain/UseCase/GetSettings/GetSettings' import { UpdateSetting } from '../../Domain/UseCase/UpdateSetting/UpdateSetting' import { User } from '../../Domain/User/User' -describe('InversifyExpressSettingsController', () => { +describe('AnnotatedSettingsController', () => { let deleteSetting: DeleteSetting let getSettings: GetSettings let getSetting: GetSetting @@ -21,8 +21,7 @@ describe('InversifyExpressSettingsController', () => { let response: express.Response let user: User - const createController = () => - new InversifyExpressSettingsController(getSettings, getSetting, updateSetting, deleteSetting) + const createController = () => new AnnotatedSettingsController(getSettings, getSetting, updateSetting, deleteSetting) beforeEach(() => { deleteSetting = {} as jest.Mocked diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSettingsController.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSettingsController.ts similarity index 91% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSettingsController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSettingsController.ts index 8f4bfb8f1..815e118fd 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSettingsController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSettingsController.ts @@ -13,10 +13,10 @@ import { DeleteSetting } from '../../Domain/UseCase/DeleteSetting/DeleteSetting' import { GetSetting } from '../../Domain/UseCase/GetSetting/GetSetting' import { GetSettings } from '../../Domain/UseCase/GetSettings/GetSettings' import { UpdateSetting } from '../../Domain/UseCase/UpdateSetting/UpdateSetting' -import { HomeServerSettingsController } from './HomeServer/HomeServerSettingsController' +import { BaseSettingsController } from './Base/BaseSettingsController' @controller('/users/:userUuid') -export class InversifyExpressSettingsController extends HomeServerSettingsController { +export class AnnotatedSettingsController extends BaseSettingsController { constructor( @inject(TYPES.Auth_GetSettings) override doGetSettings: GetSettings, @inject(TYPES.Auth_GetSetting) override doGetSetting: GetSetting, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSubscriptionInvitesController.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSubscriptionInvitesController.ts similarity index 88% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSubscriptionInvitesController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSubscriptionInvitesController.ts index 5f4e920b8..71389202b 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSubscriptionInvitesController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSubscriptionInvitesController.ts @@ -11,10 +11,10 @@ import { inject } from 'inversify' import TYPES from '../../Bootstrap/Types' import { SubscriptionInvitesController } from '../../Controller/SubscriptionInvitesController' -import { HomeServerSubscriptionInvitesController } from './HomeServer/HomeServerSubscriptionInvitesController' +import { BaseSubscriptionInvitesController } from './Base/BaseSubscriptionInvitesController' @controller('/subscription-invites') -export class InversifyExpressSubscriptionInvitesController extends HomeServerSubscriptionInvitesController { +export class AnnotatedSubscriptionInvitesController extends BaseSubscriptionInvitesController { constructor( @inject(TYPES.Auth_SubscriptionInvitesController) override subscriptionInvitesController: SubscriptionInvitesController, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSubscriptionSettingsController.spec.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSubscriptionSettingsController.spec.ts similarity index 87% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSubscriptionSettingsController.spec.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSubscriptionSettingsController.spec.ts index 22add6290..b152b6b76 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSubscriptionSettingsController.spec.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSubscriptionSettingsController.spec.ts @@ -3,18 +3,18 @@ import 'reflect-metadata' import * as express from 'express' import { results } from 'inversify-express-utils' -import { InversifyExpressSubscriptionSettingsController } from './InversifyExpressSubscriptionSettingsController' +import { AnnotatedSubscriptionSettingsController } from './AnnotatedSubscriptionSettingsController' import { User } from '../../Domain/User/User' import { GetSetting } from '../../Domain/UseCase/GetSetting/GetSetting' -describe('InversifyExpressSubscriptionSettingsController', () => { +describe('AnnotatedSubscriptionSettingsController', () => { let getSetting: GetSetting let request: express.Request let response: express.Response let user: User - const createController = () => new InversifyExpressSubscriptionSettingsController(getSetting) + const createController = () => new AnnotatedSubscriptionSettingsController(getSetting) beforeEach(() => { user = {} as jest.Mocked diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSubscriptionSettingsController.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSubscriptionSettingsController.ts similarity index 77% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSubscriptionSettingsController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSubscriptionSettingsController.ts index 65693808d..b14fc36d9 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSubscriptionSettingsController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSubscriptionSettingsController.ts @@ -8,10 +8,10 @@ import { } from 'inversify-express-utils' import TYPES from '../../Bootstrap/Types' import { GetSetting } from '../../Domain/UseCase/GetSetting/GetSetting' -import { HomeServerSubscriptionSettingsController } from './HomeServer/HomeServerSubscriptionSettingsController' +import { BaseSubscriptionSettingsController } from './Base/BaseSubscriptionSettingsController' @controller('/users/:userUuid') -export class InversifyExpressSubscriptionSettingsController extends HomeServerSubscriptionSettingsController { +export class AnnotatedSubscriptionSettingsController extends BaseSubscriptionSettingsController { constructor(@inject(TYPES.Auth_GetSetting) override doGetSetting: GetSetting) { super(doGetSetting) } diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSubscriptionTokensController.spec.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSubscriptionTokensController.spec.ts similarity index 96% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSubscriptionTokensController.spec.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSubscriptionTokensController.spec.ts index ccadb3009..12fed39b2 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSubscriptionTokensController.spec.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSubscriptionTokensController.spec.ts @@ -3,7 +3,7 @@ import 'reflect-metadata' import * as express from 'express' import { results } from 'inversify-express-utils' -import { InversifyExpressSubscriptionTokensController } from './InversifyExpressSubscriptionTokensController' +import { AnnotatedSubscriptionTokensController } from './AnnotatedSubscriptionTokensController' import { CrossServiceTokenData, TokenEncoderInterface } from '@standardnotes/security' import { Setting } from '../../Domain/Setting/Setting' @@ -15,7 +15,7 @@ import { ProjectorInterface } from '../../Projection/ProjectorInterface' import { User } from '../../Domain/User/User' import { Role } from '../../Domain/Role/Role' -describe('InversifyExpressSubscriptionTokensController', () => { +describe('AnnotatedSubscriptionTokensController', () => { let createSubscriptionToken: CreateSubscriptionToken let authenticateToken: AuthenticateSubscriptionToken const jwtTTL = 60 @@ -31,7 +31,7 @@ describe('InversifyExpressSubscriptionTokensController', () => { let role: Role const createController = () => - new InversifyExpressSubscriptionTokensController( + new AnnotatedSubscriptionTokensController( createSubscriptionToken, authenticateToken, settingService, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSubscriptionTokensController.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSubscriptionTokensController.ts similarity index 90% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSubscriptionTokensController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSubscriptionTokensController.ts index ba8952fc9..4f65f07cc 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressSubscriptionTokensController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedSubscriptionTokensController.ts @@ -15,10 +15,10 @@ import { AuthenticateSubscriptionToken } from '../../Domain/UseCase/Authenticate import { CreateSubscriptionToken } from '../../Domain/UseCase/CreateSubscriptionToken/CreateSubscriptionToken' import { User } from '../../Domain/User/User' import { ProjectorInterface } from '../../Projection/ProjectorInterface' -import { HomeServerSubscriptionTokensController } from './HomeServer/HomeServerSubscriptionTokensController' +import { BaseSubscriptionTokensController } from './Base/BaseSubscriptionTokensController' @controller('/subscription-tokens') -export class InversifyExpressSubscriptionTokensController extends HomeServerSubscriptionTokensController { +export class AnnotatedSubscriptionTokensController extends BaseSubscriptionTokensController { constructor( @inject(TYPES.Auth_CreateSubscriptionToken) override createSubscriptionToken: CreateSubscriptionToken, @inject(TYPES.Auth_AuthenticateSubscriptionToken) override authenticateToken: AuthenticateSubscriptionToken, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressUserRequestsController.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedUserRequestsController.ts similarity index 78% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressUserRequestsController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedUserRequestsController.ts index 29ce89d15..5167143d2 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressUserRequestsController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedUserRequestsController.ts @@ -4,10 +4,10 @@ import { results, httpPost, controller } from 'inversify-express-utils' import TYPES from '../../Bootstrap/Types' import { UserRequestsController } from '../../Controller/UserRequestsController' import { inject } from 'inversify' -import { HomeServerUserRequestsController } from './HomeServer/HomeServerUserRequestsController' +import { BaseUserRequestsController } from './Base/BaseUserRequestsController' @controller('/users/:userUuid/requests') -export class InversifyExpressUserRequestsController extends HomeServerUserRequestsController { +export class AnnotatedUserRequestsController extends BaseUserRequestsController { constructor(@inject(TYPES.Auth_UserRequestsController) override userRequestsController: UserRequestsController) { super(userRequestsController) } diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressUsersController.spec.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedUsersController.spec.ts similarity index 98% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressUsersController.spec.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedUsersController.spec.ts index 11424cd74..7a66d6ded 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressUsersController.spec.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedUsersController.spec.ts @@ -2,7 +2,7 @@ import 'reflect-metadata' import * as express from 'express' -import { InversifyExpressUsersController } from './InversifyExpressUsersController' +import { AnnotatedUsersController } from './AnnotatedUsersController' import { results } from 'inversify-express-utils' import { Username } from '@standardnotes/domain-core' import { DeleteAccount } from '../../Domain/UseCase/DeleteAccount/DeleteAccount' @@ -15,7 +15,7 @@ import { InviteToSharedSubscription } from '../../Domain/UseCase/InviteToSharedS import { UpdateUser } from '../../Domain/UseCase/UpdateUser' import { User } from '../../Domain/User/User' -describe('InversifyExpressUsersController', () => { +describe('AnnotatedUsersController', () => { let updateUser: UpdateUser let deleteAccount: DeleteAccount let getUserKeyParams: GetUserKeyParams @@ -30,7 +30,7 @@ describe('InversifyExpressUsersController', () => { let user: User const createController = () => - new InversifyExpressUsersController( + new AnnotatedUsersController( updateUser, getUserKeyParams, deleteAccount, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressUsersController.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedUsersController.ts similarity index 94% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressUsersController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedUsersController.ts index 34d6f33a8..5eb931720 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressUsersController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedUsersController.ts @@ -17,10 +17,10 @@ import { GetUserSubscription } from '../../Domain/UseCase/GetUserSubscription/Ge import { ClearLoginAttempts } from '../../Domain/UseCase/ClearLoginAttempts' import { IncreaseLoginAttempts } from '../../Domain/UseCase/IncreaseLoginAttempts' import { ChangeCredentials } from '../../Domain/UseCase/ChangeCredentials/ChangeCredentials' -import { HomeServerUsersController } from './HomeServer/HomeServerUsersController' +import { BaseUsersController } from './Base/BaseUsersController' @controller('/users') -export class InversifyExpressUsersController extends HomeServerUsersController { +export class AnnotatedUsersController extends BaseUsersController { constructor( @inject(TYPES.Auth_UpdateUser) override updateUser: UpdateUser, @inject(TYPES.Auth_GetUserKeyParams) override getUserKeyParams: GetUserKeyParams, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressValetTokenController.spec.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedValetTokenController.spec.ts similarity index 94% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressValetTokenController.spec.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedValetTokenController.spec.ts index a42626bcf..c90983673 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressValetTokenController.spec.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedValetTokenController.spec.ts @@ -2,15 +2,15 @@ import 'reflect-metadata' import { Request, Response } from 'express' import { results } from 'inversify-express-utils' -import { InversifyExpressValetTokenController } from './InversifyExpressValetTokenController' +import { AnnotatedValetTokenController } from './AnnotatedValetTokenController' import { CreateValetToken } from '../../Domain/UseCase/CreateValetToken/CreateValetToken' -describe('InversifyExpressValetTokenController', () => { +describe('AnnotatedValetTokenController', () => { let createValetToken: CreateValetToken let request: Request let response: Response - const createController = () => new InversifyExpressValetTokenController(createValetToken) + const createController = () => new AnnotatedValetTokenController(createValetToken) beforeEach(() => { createValetToken = {} as jest.Mocked diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressValetTokenController.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedValetTokenController.ts similarity index 79% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressValetTokenController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedValetTokenController.ts index a64e39a07..95b5a22ee 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressValetTokenController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedValetTokenController.ts @@ -8,10 +8,10 @@ import { } from 'inversify-express-utils' import TYPES from '../../Bootstrap/Types' import { CreateValetToken } from '../../Domain/UseCase/CreateValetToken/CreateValetToken' -import { HomeServerValetTokenController } from './HomeServer/HomeServerValetTokenController' +import { BaseValetTokenController } from './Base/BaseValetTokenController' @controller('/valet-tokens', TYPES.Auth_RequiredCrossServiceTokenMiddleware) -export class InversifyExpressValetTokenController extends HomeServerValetTokenController { +export class AnnotatedValetTokenController extends BaseValetTokenController { constructor(@inject(TYPES.Auth_CreateValetToken) override createValetKey: CreateValetToken) { super(createValetKey) } diff --git a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressWebSocketsController.ts b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedWebSocketsController.ts similarity index 83% rename from packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressWebSocketsController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/AnnotatedWebSocketsController.ts index 87386f58d..6b758b158 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/InversifyExpressWebSocketsController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/AnnotatedWebSocketsController.ts @@ -9,10 +9,10 @@ import { import { CreateCrossServiceToken } from '../../Domain/UseCase/CreateCrossServiceToken/CreateCrossServiceToken' import { inject } from 'inversify' import TYPES from '../../Bootstrap/Types' -import { HomeServerWebSocketsController } from './HomeServer/HomeServerWebSocketsController' +import { BaseWebSocketsController } from './Base/BaseWebSocketsController' @controller('/sockets') -export class InversifyExpressWebSocketsController extends HomeServerWebSocketsController { +export class AnnotatedWebSocketsController extends BaseWebSocketsController { constructor( @inject(TYPES.Auth_CreateCrossServiceToken) override createCrossServiceToken: CreateCrossServiceToken, @inject(TYPES.Auth_WebSocketConnectionTokenDecoder) diff --git a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerAdminController.ts b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseAdminController.ts similarity index 98% rename from packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerAdminController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/Base/BaseAdminController.ts index 114b43c3c..811c715a7 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerAdminController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseAdminController.ts @@ -8,7 +8,7 @@ import { CreateSubscriptionToken } from '../../../Domain/UseCase/CreateSubscript import { DeleteSetting } from '../../../Domain/UseCase/DeleteSetting/DeleteSetting' import { UserRepositoryInterface } from '../../../Domain/User/UserRepositoryInterface' -export class HomeServerAdminController extends BaseHttpController { +export class BaseAdminController extends BaseHttpController { constructor( protected doDeleteSetting: DeleteSetting, protected userRepository: UserRepositoryInterface, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerAuthController.ts b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseAuthController.ts similarity index 99% rename from packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerAuthController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/Base/BaseAuthController.ts index ee4142d18..9ee0d0f22 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerAuthController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseAuthController.ts @@ -10,7 +10,7 @@ import { VerifyMFA } from '../../../Domain/UseCase/VerifyMFA' import { AuthController } from '../../../Controller/AuthController' import { BaseHttpController, results } from 'inversify-express-utils' -export class HomeServerAuthController extends BaseHttpController { +export class BaseAuthController extends BaseHttpController { constructor( protected verifyMFA: VerifyMFA, protected signInUseCase: SignIn, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerAuthenticatorsController.ts b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseAuthenticatorsController.ts similarity index 97% rename from packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerAuthenticatorsController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/Base/BaseAuthenticatorsController.ts index e65abe6a8..1cc99d959 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerAuthenticatorsController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseAuthenticatorsController.ts @@ -4,7 +4,7 @@ import { Request, Response } from 'express' import { AuthenticatorsController } from '../../../Controller/AuthenticatorsController' import { BaseHttpController, results } from 'inversify-express-utils' -export class HomeServerAuthenticatorsController extends BaseHttpController { +export class BaseAuthenticatorsController extends BaseHttpController { constructor( protected authenticatorsController: AuthenticatorsController, private controllerContainer?: ControllerContainerInterface, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerFeaturesController.ts b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseFeaturesController.ts similarity index 94% rename from packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerFeaturesController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/Base/BaseFeaturesController.ts index 327c8f6bd..cbfaf38ab 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerFeaturesController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseFeaturesController.ts @@ -4,7 +4,7 @@ import { Request, Response } from 'express' import { GetUserFeatures } from '../../../Domain/UseCase/GetUserFeatures/GetUserFeatures' import { BaseHttpController, results } from 'inversify-express-utils' -export class HomeServerFeaturesController extends BaseHttpController { +export class BaseFeaturesController extends BaseHttpController { constructor( protected doGetUserFeatures: GetUserFeatures, private controllerContainer?: ControllerContainerInterface, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerListedController.ts b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseListedController.ts similarity index 94% rename from packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerListedController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/Base/BaseListedController.ts index c236d465a..79e7699e8 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerListedController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseListedController.ts @@ -5,7 +5,7 @@ import { Request, Response } from 'express' import { CreateListedAccount } from '../../../Domain/UseCase/CreateListedAccount/CreateListedAccount' import { BaseHttpController, results } from 'inversify-express-utils' -export class HomeServerListedController extends BaseHttpController { +export class BaseListedController extends BaseHttpController { constructor( protected doCreateListedAccount: CreateListedAccount, private controllerContainer?: ControllerContainerInterface, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerOfflineController.ts b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseOfflineController.ts similarity index 98% rename from packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerOfflineController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/Base/BaseOfflineController.ts index 3ff19d116..eb383a59c 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerOfflineController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseOfflineController.ts @@ -9,7 +9,7 @@ import { CreateOfflineSubscriptionToken } from '../../../Domain/UseCase/CreateOf import { GetUserFeatures } from '../../../Domain/UseCase/GetUserFeatures/GetUserFeatures' import { GetUserOfflineSubscription } from '../../../Domain/UseCase/GetUserOfflineSubscription/GetUserOfflineSubscription' -export class HomeServerOfflineController extends BaseHttpController { +export class BaseOfflineController extends BaseHttpController { constructor( protected doGetUserFeatures: GetUserFeatures, protected getUserOfflineSubscription: GetUserOfflineSubscription, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSessionController.ts b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseSessionController.ts similarity index 98% rename from packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSessionController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/Base/BaseSessionController.ts index ccb867406..49636305e 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSessionController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseSessionController.ts @@ -7,7 +7,7 @@ import { DeletePreviousSessionsForUser } from '../../../Domain/UseCase/DeletePre import { DeleteSessionForUser } from '../../../Domain/UseCase/DeleteSessionForUser' import { RefreshSessionToken } from '../../../Domain/UseCase/RefreshSessionToken' -export class HomeServerSessionController extends BaseHttpController { +export class BaseSessionController extends BaseHttpController { constructor( protected deleteSessionForUser: DeleteSessionForUser, protected deletePreviousSessionsForUser: DeletePreviousSessionsForUser, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSessionsController.ts b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseSessionsController.ts similarity index 97% rename from packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSessionsController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/Base/BaseSessionsController.ts index 23734a248..d9ca8b770 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSessionsController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseSessionsController.ts @@ -10,7 +10,7 @@ import { BaseHttpController, results } from 'inversify-express-utils' import { User } from '../../../Domain/User/User' import { SessionProjector } from '../../../Projection/SessionProjector' -export class HomeServerSessionsController extends BaseHttpController { +export class BaseSessionsController extends BaseHttpController { constructor( protected getActiveSessionsForUser: GetActiveSessionsForUser, protected authenticateRequest: AuthenticateRequest, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSettingsController.ts b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseSettingsController.ts similarity index 98% rename from packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSettingsController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/Base/BaseSettingsController.ts index 9f4daab81..5087c97ec 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSettingsController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseSettingsController.ts @@ -9,7 +9,7 @@ import { UpdateSetting } from '../../../Domain/UseCase/UpdateSetting/UpdateSetti import { BaseHttpController, results } from 'inversify-express-utils' import { EncryptionVersion } from '../../../Domain/Encryption/EncryptionVersion' -export class HomeServerSettingsController extends BaseHttpController { +export class BaseSettingsController extends BaseHttpController { constructor( protected doGetSettings: GetSettings, protected doGetSetting: GetSetting, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSubscriptionInvitesController.ts b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseSubscriptionInvitesController.ts similarity index 97% rename from packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSubscriptionInvitesController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/Base/BaseSubscriptionInvitesController.ts index 929d11e44..5a889ad09 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSubscriptionInvitesController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseSubscriptionInvitesController.ts @@ -6,7 +6,7 @@ import { ApiVersion } from '@standardnotes/api' import { SubscriptionInvitesController } from '../../../Controller/SubscriptionInvitesController' import { Role } from '../../../Domain/Role/Role' -export class HomeServerSubscriptionInvitesController extends BaseHttpController { +export class BaseSubscriptionInvitesController extends BaseHttpController { constructor( protected subscriptionInvitesController: SubscriptionInvitesController, private controllerContainer?: ControllerContainerInterface, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSubscriptionSettingsController.ts b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseSubscriptionSettingsController.ts similarity index 91% rename from packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSubscriptionSettingsController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/Base/BaseSubscriptionSettingsController.ts index 2a5bb1a50..93905ab2b 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSubscriptionSettingsController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseSubscriptionSettingsController.ts @@ -4,7 +4,7 @@ import { Request, Response } from 'express' import { GetSetting } from '../../../Domain/UseCase/GetSetting/GetSetting' -export class HomeServerSubscriptionSettingsController extends BaseHttpController { +export class BaseSubscriptionSettingsController extends BaseHttpController { constructor(protected doGetSetting: GetSetting, private controllerContainer?: ControllerContainerInterface) { super() diff --git a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSubscriptionTokensController.ts b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseSubscriptionTokensController.ts similarity index 97% rename from packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSubscriptionTokensController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/Base/BaseSubscriptionTokensController.ts index 9d388d5de..84fa186eb 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSubscriptionTokensController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseSubscriptionTokensController.ts @@ -11,7 +11,7 @@ import { ProjectorInterface } from '../../../Projection/ProjectorInterface' import { SettingName } from '@standardnotes/settings' import { User } from '../../../Domain/User/User' -export class HomeServerSubscriptionTokensController extends BaseHttpController { +export class BaseSubscriptionTokensController extends BaseHttpController { constructor( protected createSubscriptionToken: CreateSubscriptionToken, protected authenticateToken: AuthenticateSubscriptionToken, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerUserRequestsController.ts b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseUserRequestsController.ts similarity index 92% rename from packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerUserRequestsController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/Base/BaseUserRequestsController.ts index af3896e32..303a50b1a 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerUserRequestsController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseUserRequestsController.ts @@ -4,7 +4,7 @@ import { Request, Response } from 'express' import { UserRequestsController } from '../../../Controller/UserRequestsController' -export class HomeServerUserRequestsController extends BaseHttpController { +export class BaseUserRequestsController extends BaseHttpController { constructor( protected userRequestsController: UserRequestsController, private controllerContainer?: ControllerContainerInterface, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerUsersController.ts b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseUsersController.ts similarity index 99% rename from packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerUsersController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/Base/BaseUsersController.ts index f9a64e41c..48039a9cd 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerUsersController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseUsersController.ts @@ -11,7 +11,7 @@ import { IncreaseLoginAttempts } from '../../../Domain/UseCase/IncreaseLoginAtte import { UpdateUser } from '../../../Domain/UseCase/UpdateUser' import { ErrorTag } from '@standardnotes/responses' -export class HomeServerUsersController extends BaseHttpController { +export class BaseUsersController extends BaseHttpController { constructor( protected updateUser: UpdateUser, protected getUserKeyParams: GetUserKeyParams, diff --git a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerValetTokenController.ts b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseValetTokenController.ts similarity index 96% rename from packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerValetTokenController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/Base/BaseValetTokenController.ts index 0e98c1585..1ef281318 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerValetTokenController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseValetTokenController.ts @@ -7,7 +7,7 @@ import { ValetTokenOperation } from '@standardnotes/security' import { CreateValetToken } from '../../../Domain/UseCase/CreateValetToken/CreateValetToken' import { CreateValetTokenPayload } from '../../../Domain/ValetToken/CreateValetTokenPayload' -export class HomeServerValetTokenController extends BaseHttpController { +export class BaseValetTokenController extends BaseHttpController { constructor(protected createValetKey: CreateValetToken, private controllerContainer?: ControllerContainerInterface) { super() diff --git a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerWebSocketsController.ts b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseWebSocketsController.ts similarity index 95% rename from packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerWebSocketsController.ts rename to packages/auth/src/Infra/InversifyExpressUtils/Base/BaseWebSocketsController.ts index ba79aa811..9e079c249 100644 --- a/packages/auth/src/Infra/InversifyExpressUtils/HomeServer/HomeServerWebSocketsController.ts +++ b/packages/auth/src/Infra/InversifyExpressUtils/Base/BaseWebSocketsController.ts @@ -6,7 +6,7 @@ import { BaseHttpController, results } from 'inversify-express-utils' import { CreateCrossServiceToken } from '../../../Domain/UseCase/CreateCrossServiceToken/CreateCrossServiceToken' import { ErrorTag } from '@standardnotes/responses' -export class HomeServerWebSocketsController extends BaseHttpController { +export class BaseWebSocketsController extends BaseHttpController { constructor( protected createCrossServiceToken: CreateCrossServiceToken, protected tokenDecoder: TokenDecoderInterface, diff --git a/packages/files/bin/server.ts b/packages/files/bin/server.ts index 9743286c4..447fae742 100644 --- a/packages/files/bin/server.ts +++ b/packages/files/bin/server.ts @@ -2,9 +2,9 @@ import 'reflect-metadata' import * as busboy from 'connect-busboy' -import '../src/Infra/InversifyExpress/InversifyExpressHealthCheckController' -import '../src/Infra/InversifyExpress/InversifyExpressFilesController' -import '../src/Infra/InversifyExpress/InversifyExpressSharedVaultFilesController' +import '../src/Infra/InversifyExpress/AnnotatedHealthCheckController' +import '../src/Infra/InversifyExpress/AnnotatedFilesController' +import '../src/Infra/InversifyExpress/AnnotatedSharedVaultFilesController' import helmet from 'helmet' import * as cors from 'cors' diff --git a/packages/files/src/Infra/InversifyExpress/InversifyExpressFilesController.spec.ts b/packages/files/src/Infra/InversifyExpress/AnnotatedFilesController.spec.ts similarity index 98% rename from packages/files/src/Infra/InversifyExpress/InversifyExpressFilesController.spec.ts rename to packages/files/src/Infra/InversifyExpress/AnnotatedFilesController.spec.ts index 14ce3c1b2..5c250ecb4 100644 --- a/packages/files/src/Infra/InversifyExpress/InversifyExpressFilesController.spec.ts +++ b/packages/files/src/Infra/InversifyExpress/AnnotatedFilesController.spec.ts @@ -7,7 +7,7 @@ import { UploadFileChunk } from '../../Domain/UseCase/UploadFileChunk/UploadFile import { Request, Response } from 'express' import { Writable, Readable } from 'stream' -import { InversifyExpressFilesController } from './InversifyExpressFilesController' +import { AnnotatedFilesController } from './AnnotatedFilesController' import { GetFileMetadata } from '../../Domain/UseCase/GetFileMetadata/GetFileMetadata' import { results } from 'inversify-express-utils' import { RemoveFile } from '../../Domain/UseCase/RemoveFile/RemoveFile' @@ -15,7 +15,7 @@ import { ValetTokenOperation } from '@standardnotes/security' import { BadRequestErrorMessageResult } from 'inversify-express-utils/lib/results' import { Result } from '@standardnotes/domain-core' -describe('InversifyExpressFilesController', () => { +describe('AnnotatedFilesController', () => { let uploadFileChunk: UploadFileChunk let createUploadSession: CreateUploadSession let finishUploadSession: FinishUploadSession @@ -28,7 +28,7 @@ describe('InversifyExpressFilesController', () => { const maxChunkBytes = 100_000 const createController = () => - new InversifyExpressFilesController( + new AnnotatedFilesController( uploadFileChunk, createUploadSession, finishUploadSession, diff --git a/packages/files/src/Infra/InversifyExpress/InversifyExpressFilesController.ts b/packages/files/src/Infra/InversifyExpress/AnnotatedFilesController.ts similarity index 98% rename from packages/files/src/Infra/InversifyExpress/InversifyExpressFilesController.ts rename to packages/files/src/Infra/InversifyExpress/AnnotatedFilesController.ts index c6cce7cf8..e703e0a61 100644 --- a/packages/files/src/Infra/InversifyExpress/InversifyExpressFilesController.ts +++ b/packages/files/src/Infra/InversifyExpress/AnnotatedFilesController.ts @@ -12,7 +12,7 @@ import { RemoveFile } from '../../Domain/UseCase/RemoveFile/RemoveFile' import { ValetTokenOperation } from '@standardnotes/security' @controller('/v1/files', TYPES.Files_ValetTokenAuthMiddleware) -export class InversifyExpressFilesController extends BaseHttpController { +export class AnnotatedFilesController extends BaseHttpController { constructor( @inject(TYPES.Files_UploadFileChunk) private uploadFileChunk: UploadFileChunk, @inject(TYPES.Files_CreateUploadSession) private createUploadSession: CreateUploadSession, diff --git a/packages/files/src/Infra/InversifyExpress/AnnotatedHealthCheckController.spec.ts b/packages/files/src/Infra/InversifyExpress/AnnotatedHealthCheckController.spec.ts new file mode 100644 index 000000000..cc71f17af --- /dev/null +++ b/packages/files/src/Infra/InversifyExpress/AnnotatedHealthCheckController.spec.ts @@ -0,0 +1,12 @@ +import 'reflect-metadata' + +import { AnnotatedHealthCheckController } from './AnnotatedHealthCheckController' + +describe('AnnotatedHealthCheckController', () => { + const createController = () => new AnnotatedHealthCheckController() + + it('should return OK', async () => { + const response = (await createController().get()) as string + expect(response).toEqual('OK') + }) +}) diff --git a/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressHealthCheckController.ts b/packages/files/src/Infra/InversifyExpress/AnnotatedHealthCheckController.ts similarity index 76% rename from packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressHealthCheckController.ts rename to packages/files/src/Infra/InversifyExpress/AnnotatedHealthCheckController.ts index 535288409..75216a5f9 100644 --- a/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressHealthCheckController.ts +++ b/packages/files/src/Infra/InversifyExpress/AnnotatedHealthCheckController.ts @@ -1,7 +1,7 @@ import { controller, httpGet } from 'inversify-express-utils' @controller('/healthcheck') -export class InversifyExpressHealthCheckController { +export class AnnotatedHealthCheckController { @httpGet('/') public async get(): Promise { return 'OK' diff --git a/packages/files/src/Infra/InversifyExpress/InversifyExpressSharedVaultFilesController.ts b/packages/files/src/Infra/InversifyExpress/AnnotatedSharedVaultFilesController.ts similarity index 98% rename from packages/files/src/Infra/InversifyExpress/InversifyExpressSharedVaultFilesController.ts rename to packages/files/src/Infra/InversifyExpress/AnnotatedSharedVaultFilesController.ts index 5ec31549e..f6e899962 100644 --- a/packages/files/src/Infra/InversifyExpress/InversifyExpressSharedVaultFilesController.ts +++ b/packages/files/src/Infra/InversifyExpress/AnnotatedSharedVaultFilesController.ts @@ -14,7 +14,7 @@ import { StreamDownloadFile } from '../../Domain/UseCase/StreamDownloadFile/Stre import { UploadFileChunk } from '../../Domain/UseCase/UploadFileChunk/UploadFileChunk' @controller('/v1/shared-vault/files', TYPES.Files_SharedVaultValetTokenAuthMiddleware) -export class InversifyExpressSharedVaultFilesController extends BaseHttpController { +export class AnnotatedSharedVaultFilesController extends BaseHttpController { constructor( @inject(TYPES.Files_UploadFileChunk) private uploadFileChunk: UploadFileChunk, @inject(TYPES.Files_CreateUploadSession) private createUploadSession: CreateUploadSession, diff --git a/packages/files/src/Infra/InversifyExpress/InversifyExpressHealthCheckController.spec.ts b/packages/files/src/Infra/InversifyExpress/InversifyExpressHealthCheckController.spec.ts deleted file mode 100644 index 308d8ccbc..000000000 --- a/packages/files/src/Infra/InversifyExpress/InversifyExpressHealthCheckController.spec.ts +++ /dev/null @@ -1,12 +0,0 @@ -import 'reflect-metadata' - -import { InversifyExpressHealthCheckController } from './InversifyExpressHealthCheckController' - -describe('InversifyExpressHealthCheckController', () => { - const createController = () => new InversifyExpressHealthCheckController() - - it('should return OK', async () => { - const response = (await createController().get()) as string - expect(response).toEqual('OK') - }) -}) diff --git a/packages/files/src/Infra/InversifyExpress/index.ts b/packages/files/src/Infra/InversifyExpress/index.ts index e26976a72..c950e8999 100644 --- a/packages/files/src/Infra/InversifyExpress/index.ts +++ b/packages/files/src/Infra/InversifyExpress/index.ts @@ -1 +1,2 @@ -export * from './InversifyExpressFilesController' +export * from './AnnotatedFilesController' +export * from './AnnotatedSharedVaultFilesController' diff --git a/packages/revisions/bin/server.ts b/packages/revisions/bin/server.ts index c2db44234..aae68df3f 100644 --- a/packages/revisions/bin/server.ts +++ b/packages/revisions/bin/server.ts @@ -9,8 +9,8 @@ import TYPES from '../src/Bootstrap/Types' import { Env } from '../src/Bootstrap/Env' import { ContainerConfigLoader } from '../src/Bootstrap/Container' -import '../src/Infra/InversifyExpress/InversifyExpressRevisionsController' -import '../src/Infra/InversifyExpress/InversifyExpressHealthCheckController' +import '../src/Infra/InversifyExpress/AnnotatedRevisionsController' +import '../src/Infra/InversifyExpress/AnnotatedHealthCheckController' const container = new ContainerConfigLoader() void container.load().then((container) => { diff --git a/packages/revisions/src/Bootstrap/Container.ts b/packages/revisions/src/Bootstrap/Container.ts index 6c4d4e78d..52c9c4ec8 100644 --- a/packages/revisions/src/Bootstrap/Container.ts +++ b/packages/revisions/src/Bootstrap/Container.ts @@ -45,7 +45,7 @@ import { CopyRevisions } from '../Domain/UseCase/CopyRevisions/CopyRevisions' import { FSDumpRepository } from '../Infra/FS/FSDumpRepository' import { S3DumpRepository } from '../Infra/S3/S3ItemDumpRepository' import { RevisionItemStringMapper } from '../Mapping/RevisionItemStringMapper' -import { HomeServerRevisionsController } from '../Infra/InversifyExpress/HomeServer/HomeServerRevisionsController' +import { BaseRevisionsController } from '../Infra/InversifyExpress/Base/BaseRevisionsController' import { Transform } from 'stream' export class ContainerConfigLoader { @@ -343,9 +343,9 @@ export class ContainerConfigLoader { // Inversify Controllers if (isConfiguredForHomeServer) { container - .bind(TYPES.Revisions_HomeServerRevisionsController) + .bind(TYPES.Revisions_BaseRevisionsController) .toConstantValue( - new HomeServerRevisionsController( + new BaseRevisionsController( container.get(TYPES.Revisions_RevisionsController), container.get(TYPES.Revisions_ControllerContainer), ), diff --git a/packages/revisions/src/Bootstrap/Types.ts b/packages/revisions/src/Bootstrap/Types.ts index 7b744fce5..d7d78870d 100644 --- a/packages/revisions/src/Bootstrap/Types.ts +++ b/packages/revisions/src/Bootstrap/Types.ts @@ -43,7 +43,7 @@ const TYPES = { Revisions_DomainEventMessageHandler: Symbol.for('Revisions_DomainEventMessageHandler'), Revisions_Timer: Symbol.for('Revisions_Timer'), // Inversify Express Controllers - Revisions_HomeServerRevisionsController: Symbol.for('Revisions_HomeServerRevisionsController'), + Revisions_BaseRevisionsController: Symbol.for('Revisions_BaseRevisionsController'), } export default TYPES diff --git a/packages/revisions/src/Infra/InversifyExpress/InversifyExpressHealthCheckController.ts b/packages/revisions/src/Infra/InversifyExpress/AnnotatedHealthCheckController.ts similarity index 70% rename from packages/revisions/src/Infra/InversifyExpress/InversifyExpressHealthCheckController.ts rename to packages/revisions/src/Infra/InversifyExpress/AnnotatedHealthCheckController.ts index be95460f4..b50195663 100644 --- a/packages/revisions/src/Infra/InversifyExpress/InversifyExpressHealthCheckController.ts +++ b/packages/revisions/src/Infra/InversifyExpress/AnnotatedHealthCheckController.ts @@ -1,7 +1,7 @@ import { BaseHttpController, controller, httpGet } from 'inversify-express-utils' @controller('/healthcheck') -export class InversifyExpressHealthCheckController extends BaseHttpController { +export class AnnotatedHealthCheckController extends BaseHttpController { @httpGet('/') public async get(): Promise { return 'OK' diff --git a/packages/revisions/src/Infra/InversifyExpress/InversifyExpressRevisionsController.ts b/packages/revisions/src/Infra/InversifyExpress/AnnotatedRevisionsController.ts similarity index 84% rename from packages/revisions/src/Infra/InversifyExpress/InversifyExpressRevisionsController.ts rename to packages/revisions/src/Infra/InversifyExpress/AnnotatedRevisionsController.ts index 01389d700..d318b87b2 100644 --- a/packages/revisions/src/Infra/InversifyExpress/InversifyExpressRevisionsController.ts +++ b/packages/revisions/src/Infra/InversifyExpress/AnnotatedRevisionsController.ts @@ -4,10 +4,10 @@ import { inject } from 'inversify' import TYPES from '../../Bootstrap/Types' import { RevisionsController } from '../../Controller/RevisionsController' -import { HomeServerRevisionsController } from './HomeServer/HomeServerRevisionsController' +import { BaseRevisionsController } from './Base/BaseRevisionsController' @controller('/items/:itemUuid/revisions', TYPES.Revisions_ApiGatewayAuthMiddleware) -export class InversifyExpressRevisionsController extends HomeServerRevisionsController { +export class AnnotatedRevisionsController extends BaseRevisionsController { constructor(@inject(TYPES.Revisions_RevisionsController) override revisionsController: RevisionsController) { super(revisionsController) } diff --git a/packages/revisions/src/Infra/InversifyExpress/HomeServer/HomeServerRevisionsController.ts b/packages/revisions/src/Infra/InversifyExpress/Base/BaseRevisionsController.ts similarity index 95% rename from packages/revisions/src/Infra/InversifyExpress/HomeServer/HomeServerRevisionsController.ts rename to packages/revisions/src/Infra/InversifyExpress/Base/BaseRevisionsController.ts index eca99e991..c47839af1 100644 --- a/packages/revisions/src/Infra/InversifyExpress/HomeServer/HomeServerRevisionsController.ts +++ b/packages/revisions/src/Infra/InversifyExpress/Base/BaseRevisionsController.ts @@ -4,7 +4,7 @@ import { ControllerContainerInterface } from '@standardnotes/domain-core' import { RevisionsController } from '../../../Controller/RevisionsController' -export class HomeServerRevisionsController extends BaseHttpController { +export class BaseRevisionsController extends BaseHttpController { constructor( protected revisionsController: RevisionsController, private controllerContainer?: ControllerContainerInterface, diff --git a/packages/syncing-server/bin/server.ts b/packages/syncing-server/bin/server.ts index 5d03b5690..9ce9289bb 100644 --- a/packages/syncing-server/bin/server.ts +++ b/packages/syncing-server/bin/server.ts @@ -1,11 +1,11 @@ import 'reflect-metadata' -import '../src/Infra/InversifyExpressUtils/InversifyExpressHealthCheckController' -import '../src/Infra/InversifyExpressUtils/InversifyExpressItemsController' -import '../src/Infra/InversifyExpressUtils/InversifyExpressMessagesController' -import '../src/Infra/InversifyExpressUtils/InversifyExpressSharedVaultInvitesController' -import '../src/Infra/InversifyExpressUtils/InversifyExpressSharedVaultUsersController' -import '../src/Infra/InversifyExpressUtils/InversifyExpressSharedVaultsController' +import '../src/Infra/InversifyExpressUtils/AnnotatedHealthCheckController' +import '../src/Infra/InversifyExpressUtils/AnnotatedItemsController' +import '../src/Infra/InversifyExpressUtils/AnnotatedMessagesController' +import '../src/Infra/InversifyExpressUtils/AnnotatedSharedVaultInvitesController' +import '../src/Infra/InversifyExpressUtils/AnnotatedSharedVaultUsersController' +import '../src/Infra/InversifyExpressUtils/AnnotatedSharedVaultsController' import helmet from 'helmet' import * as cors from 'cors' diff --git a/packages/syncing-server/src/Bootstrap/Container.ts b/packages/syncing-server/src/Bootstrap/Container.ts index 3ed304354..0b8aa2b8c 100644 --- a/packages/syncing-server/src/Bootstrap/Container.ts +++ b/packages/syncing-server/src/Bootstrap/Container.ts @@ -59,7 +59,7 @@ import { FSItemBackupService } from '../Infra/FS/FSItemBackupService' import { AuthHttpService } from '../Infra/HTTP/AuthHttpService' import { S3ItemBackupService } from '../Infra/S3/S3ItemBackupService' import { ControllerContainer, ControllerContainerInterface, MapperInterface } from '@standardnotes/domain-core' -import { HomeServerItemsController } from '../Infra/InversifyExpressUtils/HomeServer/HomeServerItemsController' +import { BaseItemsController } from '../Infra/InversifyExpressUtils/Base/BaseItemsController' import { Transform } from 'stream' import { TypeORMItem } from '../Infra/TypeORM/TypeORMItem' import { ItemPersistenceMapper } from '../Mapping/Persistence/ItemPersistenceMapper' @@ -88,7 +88,7 @@ import { TypeORMSharedVaultAssociationRepository } from '../Infra/TypeORM/TypeOR import { KeySystemAssociation } from '../Domain/KeySystem/KeySystemAssociation' import { KeySystemAssociationRepositoryInterface } from '../Domain/KeySystem/KeySystemAssociationRepositoryInterface' import { KeySystemAssociationPersistenceMapper } from '../Mapping/Persistence/KeySystemAssociationPersistenceMapper' -import { HomeServerSharedVaultInvitesController } from '../Infra/InversifyExpressUtils/HomeServer/HomeServerSharedVaultInvitesController' +import { BaseSharedVaultInvitesController } from '../Infra/InversifyExpressUtils/Base/BaseSharedVaultInvitesController' import { InviteUserToSharedVault } from '../Domain/UseCase/SharedVaults/InviteUserToSharedVault/InviteUserToSharedVault' import { TypeORMSharedVaultRepository } from '../Infra/TypeORM/TypeORMSharedVaultRepository' import { TypeORMSharedVault } from '../Infra/TypeORM/TypeORMSharedVault' @@ -113,7 +113,7 @@ import { DeleteSharedVaultInvitesToUser } from '../Domain/UseCase/SharedVaults/D import { DeleteSharedVaultInvitesSentByUser } from '../Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser' import { GetSharedVaultInvitesSentByUser } from '../Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentByUser/GetSharedVaultInvitesSentByUser' import { GetSharedVaultInvitesSentToUser } from '../Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUser' -import { HomeServerSharedVaultUsersController } from '../Infra/InversifyExpressUtils/HomeServer/HomeServerSharedVaultUsersController' +import { BaseSharedVaultUsersController } from '../Infra/InversifyExpressUtils/Base/BaseSharedVaultUsersController' import { GetSharedVaultUsers } from '../Domain/UseCase/SharedVaults/GetSharedVaultUsers/GetSharedVaultUsers' import { RemoveUserFromSharedVault } from '../Domain/UseCase/SharedVaults/RemoveUserFromSharedVault/RemoveUserFromSharedVault' import { AddNotificationForUser } from '../Domain/UseCase/Messaging/AddNotificationForUser/AddNotificationForUser' @@ -124,7 +124,7 @@ import { NotificationPersistenceMapper } from '../Mapping/Persistence/Notificati import { Notification } from '../Domain/Notifications/Notification' import { SharedVaultUserHttpRepresentation } from '../Mapping/Http/SharedVaultUserHttpRepresentation' import { SharedVaultUserHttpMapper } from '../Mapping/Http/SharedVaultUserHttpMapper' -import { HomeServerSharedVaultsController } from '../Infra/InversifyExpressUtils/HomeServer/HomeServerSharedVaultsController' +import { BaseSharedVaultsController } from '../Infra/InversifyExpressUtils/Base/BaseSharedVaultsController' import { GetSharedVaults } from '../Domain/UseCase/SharedVaults/GetSharedVaults/GetSharedVaults' import { CreateSharedVault } from '../Domain/UseCase/SharedVaults/CreateSharedVault/CreateSharedVault' import { DeleteSharedVault } from '../Domain/UseCase/SharedVaults/DeleteSharedVault/DeleteSharedVault' @@ -134,7 +134,7 @@ import { SharedVaultHttpRepresentation } from '../Mapping/Http/SharedVaultHttpRe import { SharedVaultHttpMapper } from '../Mapping/Http/SharedVaultHttpMapper' import { SharedVaultInviteHttpRepresentation } from '../Mapping/Http/SharedVaultInviteHttpRepresentation' import { SharedVaultInviteHttpMapper } from '../Mapping/Http/SharedVaultInviteHttpMapper' -import { HomeServerMessagesController } from '../Infra/InversifyExpressUtils/HomeServer/HomeServerMessagesController' +import { BaseMessagesController } from '../Infra/InversifyExpressUtils/Base/BaseMessagesController' import { GetMessagesSentToUser } from '../Domain/UseCase/Messaging/GetMessagesSentToUser/GetMessagesSentToUser' import { TypeORMMessage } from '../Infra/TypeORM/TypeORMMessage' import { MessageRepositoryInterface } from '../Domain/Message/MessageRepositoryInterface' @@ -925,9 +925,9 @@ export class ContainerConfigLoader { if (isConfiguredForHomeServer) { container - .bind(TYPES.Sync_HomeServerItemsController) + .bind(TYPES.Sync_BaseItemsController) .toConstantValue( - new HomeServerItemsController( + new BaseItemsController( container.get(TYPES.Sync_SyncItems), container.get(TYPES.Sync_CheckIntegrity), container.get(TYPES.Sync_GetItem), @@ -937,9 +937,9 @@ export class ContainerConfigLoader { ), ) container - .bind(TYPES.Sync_HomeServerSharedVaultInvitesController) + .bind(TYPES.Sync_BaseSharedVaultInvitesController) .toConstantValue( - new HomeServerSharedVaultInvitesController( + new BaseSharedVaultInvitesController( container.get(TYPES.Sync_InviteUserToSharedVault), container.get(TYPES.Sync_UpdateSharedVaultInvite), container.get(TYPES.Sync_AcceptInviteToSharedVault), @@ -953,9 +953,9 @@ export class ContainerConfigLoader { ), ) container - .bind(TYPES.Sync_HomeServerSharedVaultUsersController) + .bind(TYPES.Sync_BaseSharedVaultUsersController) .toConstantValue( - new HomeServerSharedVaultUsersController( + new BaseSharedVaultUsersController( container.get(TYPES.Sync_GetSharedVaultUsers), container.get(TYPES.Sync_RemoveSharedVaultUser), container.get(TYPES.Sync_SharedVaultUserHttpMapper), @@ -963,9 +963,9 @@ export class ContainerConfigLoader { ), ) container - .bind(TYPES.Sync_HomeServerSharedVaultsController) + .bind(TYPES.Sync_BaseSharedVaultsController) .toConstantValue( - new HomeServerSharedVaultsController( + new BaseSharedVaultsController( container.get(TYPES.Sync_GetSharedVaults), container.get(TYPES.Sync_CreateSharedVault), container.get(TYPES.Sync_DeleteSharedVault), @@ -976,9 +976,9 @@ export class ContainerConfigLoader { ), ) container - .bind(TYPES.Sync_HomeServerMessagesController) + .bind(TYPES.Sync_BaseMessagesController) .toConstantValue( - new HomeServerMessagesController( + new BaseMessagesController( container.get(TYPES.Sync_GetMessagesSentToUser), container.get(TYPES.Sync_GetMessagesSentByUser), container.get(TYPES.Sync_SendMessageToUser), diff --git a/packages/syncing-server/src/Bootstrap/Types.ts b/packages/syncing-server/src/Bootstrap/Types.ts index 6831688c3..90e5c2b9e 100644 --- a/packages/syncing-server/src/Bootstrap/Types.ts +++ b/packages/syncing-server/src/Bootstrap/Types.ts @@ -107,11 +107,11 @@ const TYPES = { Sync_ContentFilter: Symbol.for('Sync_ContentFilter'), Sync_ItemTransferCalculator: Symbol.for('Sync_ItemTransferCalculator'), Sync_ControllerContainer: Symbol.for('Sync_ControllerContainer'), - Sync_HomeServerItemsController: Symbol.for('Sync_HomeServerItemsController'), - Sync_HomeServerSharedVaultInvitesController: Symbol.for('Sync_HomeServerSharedVaultInvitesController'), - Sync_HomeServerSharedVaultUsersController: Symbol.for('Sync_HomeServerSharedVaultUsersController'), - Sync_HomeServerSharedVaultsController: Symbol.for('Sync_HomeServerSharedVaultsController'), - Sync_HomeServerMessagesController: Symbol.for('Sync_HomeServerMessagesController'), + Sync_BaseItemsController: Symbol.for('Sync_BaseItemsController'), + Sync_BaseSharedVaultInvitesController: Symbol.for('Sync_BaseSharedVaultInvitesController'), + Sync_BaseSharedVaultUsersController: Symbol.for('Sync_BaseSharedVaultUsersController'), + Sync_BaseSharedVaultsController: Symbol.for('Sync_BaseSharedVaultsController'), + Sync_BaseMessagesController: Symbol.for('Sync_BaseMessagesController'), // Mapping Sync_SharedVaultHttpMapper: Symbol.for('Sync_SharedVaultHttpMapper'), Sync_SharedVaultUserHttpMapper: Symbol.for('Sync_SharedVaultUserHttpMapper'), diff --git a/packages/files/src/Infra/InversifyExpress/InversifyExpressHealthCheckController.ts b/packages/syncing-server/src/Infra/InversifyExpressUtils/AnnotatedHealthCheckController.ts similarity index 76% rename from packages/files/src/Infra/InversifyExpress/InversifyExpressHealthCheckController.ts rename to packages/syncing-server/src/Infra/InversifyExpressUtils/AnnotatedHealthCheckController.ts index 535288409..75216a5f9 100644 --- a/packages/files/src/Infra/InversifyExpress/InversifyExpressHealthCheckController.ts +++ b/packages/syncing-server/src/Infra/InversifyExpressUtils/AnnotatedHealthCheckController.ts @@ -1,7 +1,7 @@ import { controller, httpGet } from 'inversify-express-utils' @controller('/healthcheck') -export class InversifyExpressHealthCheckController { +export class AnnotatedHealthCheckController { @httpGet('/') public async get(): Promise { return 'OK' diff --git a/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressItemsController.ts b/packages/syncing-server/src/Infra/InversifyExpressUtils/AnnotatedItemsController.ts similarity index 92% rename from packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressItemsController.ts rename to packages/syncing-server/src/Infra/InversifyExpressUtils/AnnotatedItemsController.ts index c6b29e57a..ee86356d3 100644 --- a/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressItemsController.ts +++ b/packages/syncing-server/src/Infra/InversifyExpressUtils/AnnotatedItemsController.ts @@ -8,12 +8,12 @@ import { SyncResponseFactoryResolverInterface } from '../../Domain/Item/SyncResp import { CheckIntegrity } from '../../Domain/UseCase/Syncing/CheckIntegrity/CheckIntegrity' import { GetItem } from '../../Domain/UseCase/Syncing/GetItem/GetItem' import { SyncItems } from '../../Domain/UseCase/Syncing/SyncItems/SyncItems' -import { HomeServerItemsController } from './HomeServer/HomeServerItemsController' +import { BaseItemsController } from './Base/BaseItemsController' import { MapperInterface } from '@standardnotes/domain-core' import { ItemHttpRepresentation } from '../../Mapping/Http/ItemHttpRepresentation' @controller('/items', TYPES.Sync_AuthMiddleware) -export class InversifyExpressItemsController extends HomeServerItemsController { +export class AnnotatedItemsController extends BaseItemsController { constructor( @inject(TYPES.Sync_SyncItems) override syncItems: SyncItems, @inject(TYPES.Sync_CheckIntegrity) override checkIntegrity: CheckIntegrity, diff --git a/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressMessagesController.ts b/packages/syncing-server/src/Infra/InversifyExpressUtils/AnnotatedMessagesController.ts similarity index 94% rename from packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressMessagesController.ts rename to packages/syncing-server/src/Infra/InversifyExpressUtils/AnnotatedMessagesController.ts index 13771b067..089c9ea32 100644 --- a/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressMessagesController.ts +++ b/packages/syncing-server/src/Infra/InversifyExpressUtils/AnnotatedMessagesController.ts @@ -4,7 +4,7 @@ import { MapperInterface } from '@standardnotes/domain-core' import { Request, Response } from 'express' import TYPES from '../../Bootstrap/Types' -import { HomeServerMessagesController } from './HomeServer/HomeServerMessagesController' +import { BaseMessagesController } from './Base/BaseMessagesController' import { GetMessagesSentToUser } from '../../Domain/UseCase/Messaging/GetMessagesSentToUser/GetMessagesSentToUser' import { DeleteAllMessagesSentToUser } from '../../Domain/UseCase/Messaging/DeleteAllMessagesSentToUser/DeleteAllMessagesSentToUser' import { DeleteMessage } from '../../Domain/UseCase/Messaging/DeleteMessage/DeleteMessage' @@ -14,7 +14,7 @@ import { Message } from '../../Domain/Message/Message' import { GetMessagesSentByUser } from '../../Domain/UseCase/Messaging/GetMessagesSentByUser/GetMessagesSentByUser' @controller('/messages', TYPES.Sync_AuthMiddleware) -export class InversifyExpressMessagesController extends HomeServerMessagesController { +export class AnnotatedMessagesController extends BaseMessagesController { constructor( @inject(TYPES.Sync_GetMessagesSentToUser) override getMessageSentToUserUseCase: GetMessagesSentToUser, @inject(TYPES.Sync_GetMessagesSentByUser) override getMessagesSentByUserUseCase: GetMessagesSentByUser, diff --git a/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressSharedVaultInvitesController.ts b/packages/syncing-server/src/Infra/InversifyExpressUtils/AnnotatedSharedVaultInvitesController.ts similarity index 96% rename from packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressSharedVaultInvitesController.ts rename to packages/syncing-server/src/Infra/InversifyExpressUtils/AnnotatedSharedVaultInvitesController.ts index 8fc7fc805..2168c1291 100644 --- a/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressSharedVaultInvitesController.ts +++ b/packages/syncing-server/src/Infra/InversifyExpressUtils/AnnotatedSharedVaultInvitesController.ts @@ -12,12 +12,12 @@ import { GetSharedVaultInvitesSentByUser } from '../../Domain/UseCase/SharedVaul import { InviteUserToSharedVault } from '../../Domain/UseCase/SharedVaults/InviteUserToSharedVault/InviteUserToSharedVault' import { UpdateSharedVaultInvite } from '../../Domain/UseCase/SharedVaults/UpdateSharedVaultInvite/UpdateSharedVaultInvite' import { SharedVaultInviteHttpRepresentation } from '../../Mapping/Http/SharedVaultInviteHttpRepresentation' -import { HomeServerSharedVaultInvitesController } from './HomeServer/HomeServerSharedVaultInvitesController' +import { BaseSharedVaultInvitesController } from './Base/BaseSharedVaultInvitesController' import { GetSharedVaultInvitesSentToUser } from '../../Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUser' import { inject } from 'inversify' @controller('/shared-vaults', TYPES.Sync_AuthMiddleware) -export class InversifyExpressSharedVaultInvitesController extends HomeServerSharedVaultInvitesController { +export class AnnotatedSharedVaultInvitesController extends BaseSharedVaultInvitesController { constructor( @inject(TYPES.Sync_InviteUserToSharedVault) override inviteUserToSharedVaultUseCase: InviteUserToSharedVault, @inject(TYPES.Sync_UpdateSharedVaultInvite) override updateSharedVaultInviteUseCase: UpdateSharedVaultInvite, diff --git a/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressSharedVaultUsersController.ts b/packages/syncing-server/src/Infra/InversifyExpressUtils/AnnotatedSharedVaultUsersController.ts similarity index 88% rename from packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressSharedVaultUsersController.ts rename to packages/syncing-server/src/Infra/InversifyExpressUtils/AnnotatedSharedVaultUsersController.ts index eba1e4c7d..c136cdb2d 100644 --- a/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressSharedVaultUsersController.ts +++ b/packages/syncing-server/src/Infra/InversifyExpressUtils/AnnotatedSharedVaultUsersController.ts @@ -3,7 +3,7 @@ import { inject } from 'inversify' import { MapperInterface } from '@standardnotes/domain-core' import { Request, Response } from 'express' -import { HomeServerSharedVaultUsersController } from './HomeServer/HomeServerSharedVaultUsersController' +import { BaseSharedVaultUsersController } from './Base/BaseSharedVaultUsersController' import TYPES from '../../Bootstrap/Types' import { SharedVaultUser } from '../../Domain/SharedVault/User/SharedVaultUser' import { SharedVaultUserHttpRepresentation } from '../../Mapping/Http/SharedVaultUserHttpRepresentation' @@ -11,7 +11,7 @@ import { GetSharedVaultUsers } from '../../Domain/UseCase/SharedVaults/GetShared import { RemoveUserFromSharedVault } from '../../Domain/UseCase/SharedVaults/RemoveUserFromSharedVault/RemoveUserFromSharedVault' @controller('/shared-vaults/:sharedVaultUuid/users', TYPES.Sync_AuthMiddleware) -export class InversifyExpressSharedVaultUsersController extends HomeServerSharedVaultUsersController { +export class AnnotatedSharedVaultUsersController extends BaseSharedVaultUsersController { constructor( @inject(TYPES.Sync_GetSharedVaultUsers) override getSharedVaultUsersUseCase: GetSharedVaultUsers, @inject(TYPES.Sync_RemoveSharedVaultUser) override removeUserFromSharedVaultUseCase: RemoveUserFromSharedVault, diff --git a/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressSharedVaultsController.ts b/packages/syncing-server/src/Infra/InversifyExpressUtils/AnnotatedSharedVaultsController.ts similarity index 93% rename from packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressSharedVaultsController.ts rename to packages/syncing-server/src/Infra/InversifyExpressUtils/AnnotatedSharedVaultsController.ts index 6cc3ed5fb..9c2e73e6f 100644 --- a/packages/syncing-server/src/Infra/InversifyExpressUtils/InversifyExpressSharedVaultsController.ts +++ b/packages/syncing-server/src/Infra/InversifyExpressUtils/AnnotatedSharedVaultsController.ts @@ -3,7 +3,7 @@ import { inject } from 'inversify' import { MapperInterface } from '@standardnotes/domain-core' import { Request, Response } from 'express' -import { HomeServerSharedVaultsController } from './HomeServer/HomeServerSharedVaultsController' +import { BaseSharedVaultsController } from './Base/BaseSharedVaultsController' import TYPES from '../../Bootstrap/Types' import { SharedVault } from '../../Domain/SharedVault/SharedVault' import { SharedVaultUser } from '../../Domain/SharedVault/User/SharedVaultUser' @@ -15,7 +15,7 @@ import { SharedVaultHttpRepresentation } from '../../Mapping/Http/SharedVaultHtt import { SharedVaultUserHttpRepresentation } from '../../Mapping/Http/SharedVaultUserHttpRepresentation' @controller('/shared-vaults', TYPES.Sync_AuthMiddleware) -export class InversifyExpressSharedVaultsController extends HomeServerSharedVaultsController { +export class AnnotatedSharedVaultsController extends BaseSharedVaultsController { constructor( @inject(TYPES.Sync_GetSharedVaults) override getSharedVaultsUseCase: GetSharedVaults, @inject(TYPES.Sync_CreateSharedVault) override createSharedVaultUseCase: CreateSharedVault, diff --git a/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerItemsController.ts b/packages/syncing-server/src/Infra/InversifyExpressUtils/Base/BaseItemsController.ts similarity index 98% rename from packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerItemsController.ts rename to packages/syncing-server/src/Infra/InversifyExpressUtils/Base/BaseItemsController.ts index b3319dcff..b07b57a02 100644 --- a/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerItemsController.ts +++ b/packages/syncing-server/src/Infra/InversifyExpressUtils/Base/BaseItemsController.ts @@ -12,7 +12,7 @@ import { HttpStatusCode } from '@standardnotes/responses' import { ItemHttpRepresentation } from '../../../Mapping/Http/ItemHttpRepresentation' import { ItemHash } from '../../../Domain/Item/ItemHash' -export class HomeServerItemsController extends BaseHttpController { +export class BaseItemsController extends BaseHttpController { constructor( protected syncItems: SyncItems, protected checkIntegrity: CheckIntegrity, diff --git a/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerMessagesController.ts b/packages/syncing-server/src/Infra/InversifyExpressUtils/Base/BaseMessagesController.ts similarity index 98% rename from packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerMessagesController.ts rename to packages/syncing-server/src/Infra/InversifyExpressUtils/Base/BaseMessagesController.ts index 4c874b8ce..91aec48d5 100644 --- a/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerMessagesController.ts +++ b/packages/syncing-server/src/Infra/InversifyExpressUtils/Base/BaseMessagesController.ts @@ -10,7 +10,7 @@ import { DeleteAllMessagesSentToUser } from '../../../Domain/UseCase/Messaging/D import { DeleteMessage } from '../../../Domain/UseCase/Messaging/DeleteMessage/DeleteMessage' import { GetMessagesSentByUser } from '../../../Domain/UseCase/Messaging/GetMessagesSentByUser/GetMessagesSentByUser' -export class HomeServerMessagesController extends BaseHttpController { +export class BaseMessagesController extends BaseHttpController { constructor( protected getMessageSentToUserUseCase: GetMessagesSentToUser, protected getMessagesSentByUserUseCase: GetMessagesSentByUser, diff --git a/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSharedVaultInvitesController.ts b/packages/syncing-server/src/Infra/InversifyExpressUtils/Base/BaseSharedVaultInvitesController.ts similarity index 99% rename from packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSharedVaultInvitesController.ts rename to packages/syncing-server/src/Infra/InversifyExpressUtils/Base/BaseSharedVaultInvitesController.ts index faf80311f..d43cd777a 100644 --- a/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSharedVaultInvitesController.ts +++ b/packages/syncing-server/src/Infra/InversifyExpressUtils/Base/BaseSharedVaultInvitesController.ts @@ -14,7 +14,7 @@ import { GetSharedVaultInvitesSentByUser } from '../../../Domain/UseCase/SharedV import { DeleteSharedVaultInvitesSentByUser } from '../../../Domain/UseCase/SharedVaults/DeleteSharedVaultInvitesSentByUser/DeleteSharedVaultInvitesSentByUser' import { GetSharedVaultInvitesSentToUser } from '../../../Domain/UseCase/SharedVaults/GetSharedVaultInvitesSentToUser/GetSharedVaultInvitesSentToUser' -export class HomeServerSharedVaultInvitesController extends BaseHttpController { +export class BaseSharedVaultInvitesController extends BaseHttpController { constructor( protected inviteUserToSharedVaultUseCase: InviteUserToSharedVault, protected updateSharedVaultInviteUseCase: UpdateSharedVaultInvite, diff --git a/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSharedVaultUsersController.ts b/packages/syncing-server/src/Infra/InversifyExpressUtils/Base/BaseSharedVaultUsersController.ts similarity index 97% rename from packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSharedVaultUsersController.ts rename to packages/syncing-server/src/Infra/InversifyExpressUtils/Base/BaseSharedVaultUsersController.ts index f6f9ad892..2439c2b00 100644 --- a/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSharedVaultUsersController.ts +++ b/packages/syncing-server/src/Infra/InversifyExpressUtils/Base/BaseSharedVaultUsersController.ts @@ -8,7 +8,7 @@ import { SharedVaultUserHttpRepresentation } from '../../../Mapping/Http/SharedV import { GetSharedVaultUsers } from '../../../Domain/UseCase/SharedVaults/GetSharedVaultUsers/GetSharedVaultUsers' import { RemoveUserFromSharedVault } from '../../../Domain/UseCase/SharedVaults/RemoveUserFromSharedVault/RemoveUserFromSharedVault' -export class HomeServerSharedVaultUsersController extends BaseHttpController { +export class BaseSharedVaultUsersController extends BaseHttpController { constructor( protected getSharedVaultUsersUseCase: GetSharedVaultUsers, protected removeUserFromSharedVaultUseCase: RemoveUserFromSharedVault, diff --git a/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSharedVaultsController.ts b/packages/syncing-server/src/Infra/InversifyExpressUtils/Base/BaseSharedVaultsController.ts similarity index 98% rename from packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSharedVaultsController.ts rename to packages/syncing-server/src/Infra/InversifyExpressUtils/Base/BaseSharedVaultsController.ts index 51cfbf6b5..38e14523c 100644 --- a/packages/syncing-server/src/Infra/InversifyExpressUtils/HomeServer/HomeServerSharedVaultsController.ts +++ b/packages/syncing-server/src/Infra/InversifyExpressUtils/Base/BaseSharedVaultsController.ts @@ -12,7 +12,7 @@ import { SharedVaultUserHttpRepresentation } from '../../../Mapping/Http/SharedV import { DeleteSharedVault } from '../../../Domain/UseCase/SharedVaults/DeleteSharedVault/DeleteSharedVault' import { CreateSharedVaultFileValetToken } from '../../../Domain/UseCase/SharedVaults/CreateSharedVaultFileValetToken/CreateSharedVaultFileValetToken' -export class HomeServerSharedVaultsController extends BaseHttpController { +export class BaseSharedVaultsController extends BaseHttpController { constructor( protected getSharedVaultsUseCase: GetSharedVaults, protected createSharedVaultUseCase: CreateSharedVault, diff --git a/packages/websockets/bin/server.ts b/packages/websockets/bin/server.ts index 81e575b1d..7e6cb8c66 100644 --- a/packages/websockets/bin/server.ts +++ b/packages/websockets/bin/server.ts @@ -1,7 +1,7 @@ import 'reflect-metadata' -import '../src/Infra/InversifyExpressUtils/InversifyExpressHealthCheckController' -import '../src/Infra/InversifyExpressUtils/InversifyExpressWebSocketsController' +import '../src/Infra/InversifyExpressUtils/AnnotatedHealthCheckController' +import '../src/Infra/InversifyExpressUtils/AnnotatedWebSocketsController' import * as cors from 'cors' import { urlencoded, json, Request, Response, NextFunction } from 'express' diff --git a/packages/websockets/src/Infra/InversifyExpressUtils/InversifyExpressHealthCheckController.ts b/packages/websockets/src/Infra/InversifyExpressUtils/AnnotatedHealthCheckController.ts similarity index 76% rename from packages/websockets/src/Infra/InversifyExpressUtils/InversifyExpressHealthCheckController.ts rename to packages/websockets/src/Infra/InversifyExpressUtils/AnnotatedHealthCheckController.ts index 535288409..75216a5f9 100644 --- a/packages/websockets/src/Infra/InversifyExpressUtils/InversifyExpressHealthCheckController.ts +++ b/packages/websockets/src/Infra/InversifyExpressUtils/AnnotatedHealthCheckController.ts @@ -1,7 +1,7 @@ import { controller, httpGet } from 'inversify-express-utils' @controller('/healthcheck') -export class InversifyExpressHealthCheckController { +export class AnnotatedHealthCheckController { @httpGet('/') public async get(): Promise { return 'OK' diff --git a/packages/websockets/src/Infra/InversifyExpressUtils/InversifyExpressWebSocketsController.ts b/packages/websockets/src/Infra/InversifyExpressUtils/AnnotatedWebSocketsController.ts similarity index 96% rename from packages/websockets/src/Infra/InversifyExpressUtils/InversifyExpressWebSocketsController.ts rename to packages/websockets/src/Infra/InversifyExpressUtils/AnnotatedWebSocketsController.ts index a5335fc3f..2bc479376 100644 --- a/packages/websockets/src/Infra/InversifyExpressUtils/InversifyExpressWebSocketsController.ts +++ b/packages/websockets/src/Infra/InversifyExpressUtils/AnnotatedWebSocketsController.ts @@ -14,7 +14,7 @@ import { AddWebSocketsConnection } from '../../Domain/UseCase/AddWebSocketsConne import { RemoveWebSocketsConnection } from '../../Domain/UseCase/RemoveWebSocketsConnection/RemoveWebSocketsConnection' @controller('/sockets') -export class InversifyExpressWebSocketsController extends BaseHttpController { +export class AnnotatedWebSocketsController extends BaseHttpController { constructor( @inject(TYPES.AddWebSocketsConnection) private addWebSocketsConnection: AddWebSocketsConnection, @inject(TYPES.RemoveWebSocketsConnection) private removeWebSocketsConnection: RemoveWebSocketsConnection,