refactor: combine messages and messageDelivery

Makes for a simpler interface in the targets, reduces duplication between the different targets.

Might be able to move the deliveryDestination selection logic later?

integration-tests/aws-sdk/setup.ts

@@ -5,6 +5,7 @@ import type { Logger } from "pino";
 import { promisify } from "util";
 import { createServer } from "../../src";
 import { MockLogger } from "../../src/__tests__/mockLogger";
+import { newMockMessageDelivery } from "../../src/__tests__/mockMessageDelivery";
 import { DefaultConfig } from "../../src/server/config";
 import {
   Clock,
@@ -59,10 +60,7 @@ export const withCognitoSdk =
         clock,
         cognito: cognitoClient,
         config: DefaultConfig,
-        messageDelivery: {
-          deliver: jest.fn(),
-        },
-        messages: new MessagesService(triggers),
+        messages: new MessagesService(triggers, newMockMessageDelivery()),
         otp,
         triggers,
         tokenGenerator: new JwtTokenGenerator(

src/__tests__/mockMessageDelivery.ts

@@ -1,4 +1,4 @@
-import { MessageDelivery } from "../services";
+import { MessageDelivery } from "../services/messageDelivery/messageDelivery";
 
 export const newMockMessageDelivery = (): jest.Mocked<MessageDelivery> => ({
   deliver: jest.fn(),

src/__tests__/mockMessages.ts

@@ -1,5 +1,5 @@
 import { Messages } from "../services";
 
 export const newMockMessages = (): jest.Mocked<Messages> => ({
-  create: jest.fn(),
+  deliver: jest.fn(),
 });

src/server/defaults.ts

@@ -66,8 +66,10 @@ export const createDefaultServer = async (
       clock,
       cognito: cognitoClient,
       config,
-      messageDelivery: new MessageDeliveryService(new ConsoleMessageSender()),
-      messages: new MessagesService(triggers),
+      messages: new MessagesService(
+        triggers,
+        new MessageDeliveryService(new ConsoleMessageSender())
+      ),
       otp,
       tokenGenerator: new JwtTokenGenerator(
         clock,

src/services/index.ts

@@ -3,22 +3,19 @@ import { Clock } from "./clock";
 import { Messages } from "./messages";
 import { TokenGenerator } from "./tokenGenerator";
 import { Triggers } from "./triggers";
-import { MessageDelivery } from "./messageDelivery/messageDelivery";
 import { CognitoService } from "./cognitoService";
 
 export { Clock, DateClock } from "./clock";
 export { CognitoService, CognitoServiceImpl } from "./cognitoService";
 export { UserPoolService, UserPoolServiceImpl } from "./userPoolService";
 export { Triggers, TriggersService } from "./triggers";
 export { Lambda, LambdaService } from "./lambda";
-export { MessageDelivery } from "./messageDelivery/messageDelivery";
 export { Messages, MessagesService } from "./messages";
 
 export interface Services {
   clock: Clock;
   cognito: CognitoService;
   config: Config;
-  messageDelivery: MessageDelivery;
   messages: Messages;
   otp: () => string;
   tokenGenerator: TokenGenerator;