Fix verify email misused promises

Author: Lan2u

src/authentication/verify-email/landing-page.ts

@@ -18,7 +18,7 @@ const invalidLink = () => oopsPage(
     <a href=/me>homepage</a>.`
 );
 
-export const verificationSuccessful = pipe(
+const verificationSuccessful = pipe(
   html`
     <div class="container">
       <div class="max-w-md mx-auto">
@@ -48,14 +48,15 @@ export const verificationSuccessful = pipe(
 
 export const landing = 
     (deps: Dependencies, conf: Config) =>
-    async (req: Request, res: Response<CompleteHtmlDocument>) => {
+    async (req: Request, res: Response<CompleteHtmlDocument>): Promise<void> => {
       const decoded = decodeEmailVerificationLink(deps.logger, conf)(req);
       if (E.isLeft(decoded)) {
         deps.logger.error(
           decoded.left,
           'Failed to decode verification link'
         );
-        return res.send(invalidLink());
+        res.send(invalidLink());
+        return;
       }
       const resource = verifyEmail.resource(decoded.right);
       const resourceEvents = await deps.getResourceEvents(resource)();
@@ -64,7 +65,8 @@ export const landing =
           resourceEvents.left,
           'Failed to get resource events for email verification link'
         );
-        return res.send(invalidLink());
+        res.send(invalidLink());
+        return;
       }
 
       // Note that we don't need to check isAuthorized here because we are authorised
@@ -85,9 +87,11 @@ export const landing =
             commitEvent.left,
             'Failed to commit verification link event'
           );
-          return res.send(invalidLink());
+          res.send(invalidLink());
+          return;
         }
       }
       deps.logger.info(`Successfully verified email %o`, decoded.right);
-      return res.send(verificationSuccessful);
+      res.send(verificationSuccessful);
+      return;
     };

src/authentication/verify-email/routes.ts

@@ -2,12 +2,13 @@ import {Dependencies} from '../../dependencies';
 import {Config} from '../../configuration';
 import {Route, get} from '../../types/route';
 import {landing} from './landing-page';
+import expressAsyncHandler from 'express-async-handler';
 
 export const routes = (
   deps: Dependencies,
   conf: Config
 ): ReadonlyArray<Route> => {
   return [
-    get('/auth/verify-email/landing', landing(deps, conf)),
+    get('/auth/verify-email/landing', expressAsyncHandler(landing(deps, conf))),
   ];
 };

src/http/api-to-handlers.ts

@@ -4,10 +4,11 @@ import {Command} from '../commands';
 import expressAsyncHandler from 'express-async-handler';
 import {flow} from 'fp-ts/lib/function';
 import {apiPost} from './api-post';
+import { Route } from '../types/route';
 
 export const apiToHandlers =
   (deps: Dependencies, conf: Config) =>
-  <C>(noun: string, verb: string, cmd: Command<C>) => [
+  <C>(noun: string, verb: string, cmd: Command<C>): Route[] => [
     {
       path: `/api/${noun}/${verb}`,
       handler: flow(apiPost, expressAsyncHandler)(deps, conf, cmd),

src/http/command-to-handlers.ts

@@ -7,10 +7,11 @@ import {flow} from 'fp-ts/lib/function';
 import {formPost} from './form-post';
 import {formGet} from './form-get';
 import {apiToHandlers} from './api-to-handlers';
+import { Route } from '../types/route';
 
 export const commandToHandlers =
   (deps: Dependencies, conf: Config) =>
-  <C, V>(noun: string, verb: string, cmd: Command<C> & Form<V>) => [
+  <C, V>(noun: string, verb: string, cmd: Command<C> & Form<V>): Route[] => [
     {
       path: `/${noun}/${verb}`,
       handler: flow(formPost, expressAsyncHandler)(deps, cmd, `/${noun}`),

src/http/email-handler.ts

@@ -15,6 +15,7 @@ import {html, CompleteHtmlDocument, safe, sanitizeString} from '../types/html';
 import {SendEmail} from '../commands';
 import {Config} from '../configuration';
 import {isolatedPageTemplate} from '../templates/page-template';
+import { Route } from '../types/route';
 
 const getActorFrom = (session: unknown, deps: Dependencies) =>
   pipe(
@@ -88,7 +89,7 @@ const emailPost =
 
 export const emailHandler =
   (conf: Config, deps: Dependencies) =>
-  <T>(path: string, command: SendEmail<T>) => ({
+  <T>(path: string, command: SendEmail<T>): Route => ({
     path: `/send-email/${path}`,
     handler: flow(emailPost, expressAsyncHandler)(conf, deps, command),
     method: 'post' as const,

src/http/query-to-handler.ts

@@ -3,9 +3,10 @@ import {Dependencies} from '../dependencies';
 import * as queries from '../queries';
 import {flow} from 'fp-ts/lib/function';
 import {queryGet} from './query-get';
+import { Route } from '../types/route';
 
 export const queryToHandler =
-  (deps: Dependencies) => (path: string, query: queries.Query) => ({
+  (deps: Dependencies) => (path: string, query: queries.Query): Route => ({
     path,
     handler: flow(queryGet, expressAsyncHandler)(deps, query),
     method: 'get' as const,

src/index.ts

@@ -18,6 +18,7 @@ import {initDependencies} from './init-dependencies';
 import * as libsqlClient from '@libsql/client';
 import cookieSession from 'cookie-session';
 import {initRoutes} from './routes';
+import { startVerifyEmailPubSub } from './authentication/verify-email/start-verify-email-pub-sub';
 
 // Dependencies and Config
 const conf = loadConfig();
@@ -62,6 +63,7 @@ setInterval(() => {
 
 // Start application
 startMagicLinkEmailPubSub(deps, conf);
+startVerifyEmailPubSub(deps, conf);
 const server = http.createServer(app);
 createTerminus(server);