Issue4380 : Removed proxyApi and TEMP fix to registrants

__tests__/__snapshots__/index.js.snap

@@ -291,7 +291,6 @@ Object {
       "getApiV4": [Function],
       "getApiV5": [Function],
       "getTcM2mToken": [Function],
-      "proxyApi": [Function],
     },
     "billing": Object {
       "default": [Function],

src/services/api.js

@@ -290,21 +290,3 @@ export async function getTcM2mToken() {
   const token = await m2m.getMachineToken(TC_M2M.CLIENT_ID, TC_M2M.CLIENT_SECRET);
   return token;
 }
-
-/**
- * Call API via proxy
- *
- * @param {String} url  to API endpoint
- */
-export async function proxyApi(endpoint) {
-  let domain = '';
-  if (isomorphy.isServerSide()) {
-    domain = `http://${config.ENV.HOST || 'localhost'}:${config.ENV.PORT || 3000}`;
-  }
-  const url = `${domain}/community-app-assets/api${endpoint}`;
-  let res = await fetch(url);
-  if (!res.ok) throw new Error(res.statusText);
-  res = (await res.json());
-  if (res.message) throw new Error(res.message);
-  return res;
-}

src/services/challenges.js

@@ -11,7 +11,7 @@ import { decodeToken } from 'tc-accounts';
 import logger from '../utils/logger';
 import { setErrorIcon, ERROR_ICON_TYPES } from '../utils/errors';
 import { COMPETITION_TRACKS, getApiResponsePayload } from '../utils/tc';
-import { getApi, proxyApi } from './api';
+import { getApi } from './api';
 import { getService as getMembersService } from './members';
 
 export const ORDER_BY = {
@@ -200,7 +200,6 @@ class ChallengesService {
       apiV3: getApi('V3', tokenV3),
       getChallenges,
       getMemberChallenges,
-      proxyApi,
       tokenV2,
       tokenV3,
       memberService: getMembersService(),
@@ -326,8 +325,10 @@ class ChallengesService {
    * @return {Promise} Resolves to the challenge object.
    */
   async getChallengeDetails(challengeId) {
+    const user = decodeToken(this.private.tokenV3);
     let challenge = {};
     let isLegacyChallenge = false;
+    let isRegistered = false;
     // condition based on ROUTE used for Review Opportunities, change if needed
     if (/^[\d]{5,8}$/.test(challengeId)) {
       isLegacyChallenge = true;
@@ -338,10 +339,22 @@ class ChallengesService {
         .then(res => res.challenges);
     }
 
-    const registrants = await this.getChallengeRegistrants(challenge.id);
-    challenge.registrants = registrants;
+    // TEMP FIX until API was fixed
+    try {
+      const registrants = await this.getChallengeRegistrants(challenge.id);
+      challenge.registrants = registrants;
+    } catch (err) {
+      challenge.registrants = [];
+    }
+
+    if (user) {
+      const userChallenges = await this.private.apiV5.get(`/resources/${user.userId}/challenges`)
+        .then(checkErrorV5).then(res => res.result);
+      isRegistered = _.includes(userChallenges, challengeId);
+    }
 
     challenge.isLegacyChallenge = isLegacyChallenge;
+    challenge.isRegistered = isRegistered;
 
     challenge.events = _.map(challenge.events, e => ({
       eventName: e.key,
@@ -360,7 +373,19 @@ class ChallengesService {
    * @return {Promise} Resolves to the challenge registrants array.
    */
   async getChallengeRegistrants(challengeId) {
-    const registrants = await this.private.proxyApi(`/challenges/${challengeId}/registrants`);
+    const roleId = await this.getRoleId('Submitter');
+    const params = {
+      challengeId,
+      roleId,
+    };
+
+    const registrants = await this.private.apiV5.get(`/resources?${qs.stringify(params)}`)
+      .then(checkErrorV5).then(res => res.result);
+
+    if (_.isEmpty(registrants)) {
+      throw new Error('Resource Role not found!');
+    }
+
     return registrants || [];
   }
 
@@ -526,8 +551,10 @@ class ChallengesService {
   async getRoleId(roleName) {
     const params = {
       name: roleName,
+      isActive: true,
     };
-    const roles = await this.private.proxyApi(`/challenges/roleId?${qs.stringify(params)}`);
+    const roles = await this.private.apiV5.get(`/resource-roles?${qs.stringify(params)}`)
+      .then(checkErrorV5).then(res => res.result);
 
     if (_.isEmpty(roles)) {
       throw new Error('Resource Role not found!');