Random fixes for trolley widget

Author: vas3a

src/api/payment-providers/trolley.service.ts

@@ -42,15 +42,21 @@ export class TrolleyService {
       user.email,
     );
 
-    if (foundRecipient?.length === 1) {
+    if (
+      foundRecipient?.length === 1 &&
+      // make sure it's same email address
+      foundRecipient[0].email === user.email
+    ) {
       return foundRecipient[0];
     }
 
     const userInfo = await this.tcMembersService.getMemberInfoByUserHandle(
       user.handle,
       { fields: BASIC_MEMBER_FIELDS },
     );
-    const address = userInfo.addresses?.[0] ?? {};
+    const address = (userInfo.addresses?.[0] ?? {}) as unknown as {
+      [key: string]: string;
+    };
 
     const recipientPayload = {
       type: 'individual' as const,
@@ -148,7 +154,7 @@ export class TrolleyService {
     const recipient = await this.getPayeeRecipient(user);
     const link = this.trolley.getRecipientPortalUrl({
       email: user.email,
-      trolleyId: recipient.trolley_id,
+      userId: user.id,
     });
 
     return { link, recipientId: recipient.trolley_id };

src/dto/adminWinning.dto.ts

@@ -471,6 +471,7 @@ export class WinningCreateRequestDto {
         grossAmount: 15.0,
         installmentNumber: 1,
         currency: 'string',
+        billingAccount: '1234',
       },
     ],
   })

src/shared/global/trolley.service.ts

@@ -29,13 +29,13 @@ export class TrolleyService {
    * @throws This function assumes that `TROLLEY_WIDGET_BASE_URL`, `TROLLEY_ACCESS_KEY`,
    * and `TROLLEY_SECRET_KEY` are defined and valid. Ensure these constants are properly set.
    */
-  getRecipientPortalUrl(recipient: { email: string; trolleyId: string }) {
+  getRecipientPortalUrl(recipient: { email: string; userId: string }) {
     const widgetBaseUrl = new url.URL(TROLLEY_WIDGET_BASE_URL as string);
     const querystring = new url.URLSearchParams({
       ts: `${Math.floor(new Date().getTime() / 1000)}`,
       key: TROLLEY_ACCESS_KEY,
       email: recipient.email,
-      refid: recipient.trolleyId,
+      refid: recipient.userId,
       hideEmail: 'false',
       roEmail: 'true',
       locale: 'en',