Merge remote-tracking branch 'origin/main'

Author: weblate

src/server/api/routers/bankTransactions.ts

@@ -28,8 +28,8 @@ export const bankTransactionsRouter = createTRPCRouter({
       if (provider === 'GOCARDLESS') {
         // Deprecated
         const res = await bankTransactionService
-          .getProvider()
-          .connectToBank(institutionId, ctx.session.user.preferredLanguage);
+          ?.getProvider()
+          ?.connectToBank(institutionId, ctx.session.user.preferredLanguage);
 
         if (!res) {
           throw new TRPCError({ code: 'INTERNAL_SERVER_ERROR', message: 'Failed to link to bank' });
@@ -68,7 +68,7 @@ export const bankTransactionsRouter = createTRPCRouter({
     )
     .mutation(async ({ input: publicToken, ctx }) => {
       if (whichBankConnectionConfigured() === 'PLAID') {
-        const res = await bankTransactionService.getProvider().exchangePublicToken?.(publicToken);
+        const res = await bankTransactionService?.getProvider()?.exchangePublicToken?.(publicToken);
 
         if (!res) {
           throw new TRPCError({

src/server/api/services/bankTransactions/bankTransactionService.ts

@@ -28,27 +28,32 @@ export class BankTransactionService {
         : this.connectedProvider === 'PLAID'
           ? new PlaidService()
           : null;
-
-    if (!this.provider) {
-      throw new TRPCError({ code: 'INTERNAL_SERVER_ERROR', message: 'Provider not found' });
-    }
   }
 
-  getProvider(): AbstractBankTransactionService {
+  getProvider(): AbstractBankTransactionService | null {
     if (!this.provider) {
-      throw new TRPCError({ code: 'INTERNAL_SERVER_ERROR', message: 'Provider not found' });
+      return null;
     }
+
     return this.provider;
   }
 
   async getTransactions(userId: number, token?: string): Promise<TransactionOutput | undefined> {
+    if (!this.provider) {
+      return;
+    }
+
     return this.provider?.getTransactions(userId, token);
   }
 
   async connectToBank(
     id?: string,
     preferredLanguage?: string,
   ): Promise<{ institutionId: string; authLink: string } | undefined> {
+    if (!this.provider) {
+      return;
+    }
+
     const res = this.provider?.connectToBank(id, preferredLanguage);
     if (!res) {
       throw new TRPCError({ code: 'INTERNAL_SERVER_ERROR', message: 'Failed to link to bank' });