Jun 12, 2020 · Jun 12, 2020 · Jun 12, 2020 · Jun 12, 2020
diff --git a/__tests__/__snapshots__/index.js.snap b/__tests__/__snapshots__/index.js.snap
      "getApiV4": [Function],
      "getApiV5": [Function],
      "getTcM2mToken": [Function],
      "proxyApi": [Function],
    },
    "billing": Object {
      "default": [Function],
diff --git a/src/services/api.js b/src/services/api.js
  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;
 }
diff --git a/src/services/challenges.js b/src/services/challenges.js
 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 = {
      apiV3: getApi('V3', tokenV3),
      getChallenges,
      getMemberChallenges,
      proxyApi,
      tokenV2,
      tokenV3,
      memberService: getMembersService(),
   * @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;
        .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,
   * @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 || [];
  }

  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!');
Original file line number	Diff line number	Diff line change
Expand Up		@@ -291,7 +291,6 @@ Object {
		"getApiV4": [Function],
		"getApiV5": [Function],
		"getTcM2mToken": [Function],
		"proxyApi": [Function],
		},
		"billing": Object {
		"default": [Function],
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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;
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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 = {
Expand DownExpand Up		@@ -200,7 +200,6 @@ class ChallengesService {
		apiV3: getApi('V3', tokenV3),
		getChallenges,
		getMemberChallenges,
		proxyApi,
		tokenV2,
		tokenV3,
		memberService: getMembersService(),
Expand DownExpand Up		@@ -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;
Expand All		@@ -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,
Expand All		@@ -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 \|\| [];
		}

Expand DownExpand Up		@@ -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!');
Expand Down