Verify Reddit identity before Matrix capture

src/bootstrap.ts

@@ -31,7 +31,11 @@ import { MediaSyncService } from './services/media-sync.js';
 import { RateLimiter } from './utils/rate-limiter.js';
 import { fetchWithTimeout } from './utils/fetch-with-timeout.js';
 import { WebServer } from './web/server.js';
-import { AccountAuthContext, type AuthenticatedAccount } from './services/account-auth-context.js';
+import {
+  AccountAuthContext,
+  authenticateCurrentAccount,
+  type AuthenticatedAccount,
+} from './services/account-auth-context.js';
 
 export interface AppContainer {
   config: Config;
@@ -184,18 +188,14 @@ export async function bootstrap(config: Config, logger: Logger): Promise<AppCont
     },
   );
 
-  accountAuth.setAuthenticator(async (): Promise<AuthenticatedAccount | null> => {
-    credentialState.latest = null;
-    await tokenRefresher.refresh();
-    const redditUsername = await browserClient.getAuthenticatedUsername();
-    const freshCredentials = credentialState.latest as MatrixCredentials | null;
-    if (!redditUsername || !freshCredentials?.userId) return null;
-    return {
-      accountId: freshCredentials.userId,
-      redditUsername,
-      matrixUserId: freshCredentials.userId,
-    };
-  });
+  accountAuth.setAuthenticator(() => authenticateCurrentAccount({
+    getRedditUsername: () => browserClient.getAuthenticatedUsername(),
+    refreshMatrixCredentials: async () => {
+      credentialState.latest = null;
+      await tokenRefresher.refresh();
+      return credentialState.latest as MatrixCredentials | null;
+    },
+  }));
 
   if (loggedIn) {
     logger.info('Verifying full Reddit and Matrix account authentication...');