PM-1100 - PR feedback

Author: vas3a

package.json

@@ -26,7 +26,6 @@
     "@nestjs/platform-express": "^11.0.1",
     "@nestjs/swagger": "^11.0.3",
     "@prisma/client": "^6.5.0",
-    "axios": "^1.8.4",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "cors": "^2.8.5",

pnpm-lock.yaml

@@ -3,12 +3,12 @@ import crypto from 'crypto';
 import trolley from 'trolleyhq';
 import { Injectable } from '@nestjs/common';
 
-const { TORLLEY_ACCESS_KEY, TORLLEY_SECRET_KEY, TROLLEY_WIDGET_BASE_URL } =
+const { TROLLEY_ACCESS_KEY, TROLLEY_SECRET_KEY, TROLLEY_WIDGET_BASE_URL } =
   process.env;
 
 const client = trolley({
-  key: TORLLEY_ACCESS_KEY as string,
-  secret: TORLLEY_SECRET_KEY as string,
+  key: TROLLEY_ACCESS_KEY as string,
+  secret: TROLLEY_SECRET_KEY as string,
 });
 
 @Injectable()
@@ -23,14 +23,14 @@ export class TrolleyService {
    * @param recipient - recipient's details
    * @returns A string representing the fully constructed and signed URL for the Trolley widget.
    *
-   * @throws This function assumes that `TROLLEY_WIDGET_BASE_URL`, `TORLLEY_ACCESS_KEY`,
-   * and `TORLLEY_SECRET_KEY` are defined and valid. Ensure these constants are properly set.
+   * @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 }) {
     const widgetBaseUrl = new url.URL(TROLLEY_WIDGET_BASE_URL as string);
     const querystring = new url.URLSearchParams({
       ts: `${Math.floor(new Date().getTime() / 1000)}`,
-      key: TORLLEY_ACCESS_KEY,
+      key: TROLLEY_ACCESS_KEY,
       email: recipient.email,
       refid: recipient.trolleyId,
       hideEmail: 'false',
@@ -41,7 +41,7 @@ export class TrolleyService {
       .toString()
       .replace(/\+/g, '%20');
 
-    const hmac = crypto.createHmac('sha256', TORLLEY_SECRET_KEY as string);
+    const hmac = crypto.createHmac('sha256', TROLLEY_SECRET_KEY as string);
     hmac.update(querystring);
 
     // Signature is only valid for 30 seconds

src/shared/global/trolley.service.ts

@@ -1 +1 @@
-export * from './member.types'
+export * from './member.types';

src/shared/topcoder/index.ts

@@ -1,4 +1,3 @@
-import axios from 'axios';
 import { chunk } from 'lodash';
 import { Injectable } from '@nestjs/common';
 import { MEMBER_FIELDS } from './member.types';
@@ -23,9 +22,10 @@ export class TopcoderMembersService {
     // Split the unique user IDs into chunks of 100 to comply with API request limits
     const requests = chunk(uniqUserIds, 30).map((chunk) => {
       const requestUrl = `${process.env.TOPCODER_API_BASE_URL}/members?${chunk.map((id) => `userIds[]=${id}`).join('&')}&fields=handle,userId`;
-      return axios
-        .get(requestUrl)
-        .then(({ data }) => data as { handle: string; userId: string });
+      return fetch(requestUrl).then(
+        async (response) =>
+          (await response.json()) as { handle: string; userId: string },
+      );
     });
 
     try {
@@ -57,13 +57,22 @@ export class TopcoderMembersService {
     options = {} as { fields: MEMBER_FIELDS[] },
   ) {
     const { fields } = options;
-    const m2mToken = await this.m2MService.getToken();
+
+    let m2mToken: string | undefined;
+    try {
+      m2mToken = await this.m2MService.getToken();
+    } catch (e) {
+      console.error(
+        'Failed to fetch m2m token for fetching member details!',
+        e.message ?? e,
+      );
+    }
     const requestUrl = `${process.env.TOPCODER_API_BASE_URL}/members/${handle}${fields ? `?fields=${fields.join(',')}` : ''}`;
 
     try {
-      const response = await axios
-        .get(requestUrl, { headers: { Authorization: `Bearer ${m2mToken}` } })
-        .then(({ data }) => data as { [key: string]: string });
+      const response: { [key: string]: string } = await fetch(requestUrl, {
+        headers: { Authorization: `Bearer ${m2mToken}` },
+      }).then((r) => r.json());
       return response;
     } catch (e) {
       console.error(

src/shared/topcoder/members.service.ts

@@ -38,7 +38,7 @@ export class TopcoderM2MService {
       return m2mToken;
     } catch (error) {
       // eslint-disable-next-line no-console
-      console.log('Failed fetching TC M2M Token!', error);
+      console.error('Failed fetching TC M2M Token!', error);
       return undefined;
     }
   }