fix api url defs in config file

Author: awzilkie

config/constants/development.js

@@ -1,12 +1,18 @@
+const DEV_API_HOSTNAME = 'https://api.topcoder-dev.com' // 'http://localhost:3000
+
 module.exports = {
   ACCOUNTS_APP_CONNECTOR_URL: 'https://accounts.topcoder-dev.com/connector.html',
   ACCOUNTS_APP_LOGIN_URL: 'https://accounts.topcoder-dev.com/member',
   COMMUNITY_APP_URL: 'https://www.topcoder-dev.com',
-  MEMBER_API_URL: 'https://api.topcoder-dev.com/v4/members',
-  MEMBER_API_V3_URL: 'https://api.topcoder-dev.com/v3/members',
-  DEV_APP_URL: 'https://local.topcoder-dev.com',
-  CHALLENGE_API_URL: 'https://api.topcoder-dev.com/v5',
-  PROJECT_API_URL: 'https://api.topcoder-dev.com/v4',
-  API_V4_URL: 'https://api.topcoder-dev.com/v4',
-  API_V3_URL: 'https://api.topcoder-dev.com/v3'
+  MEMBER_API_URL: `${DEV_API_HOSTNAME}/v4/members`,
+  MEMBER_API_V3_URL: `${DEV_API_HOSTNAME}/v3/members`,
+  DEV_APP_URL: 'http://local.topcoder-dev.com',
+  CHALLENGE_API_URL: `${DEV_API_HOSTNAME}/v5/challenges`,
+  CHALLENGE_TIMELINE_TEMPLATES_URL: `${DEV_API_HOSTNAME}/v5/timelinetemplates`,
+  CHALLENGE_TYPES_URL: `${DEV_API_HOSTNAME}/v5/challengetypes`,
+  CHALLENGE_PHASES_URL: `${DEV_API_HOSTNAME}/v5/challengephases`,
+  PROJECT_API_URL: `${DEV_API_HOSTNAME}/v5/projects`,
+  GROUPS_API_URL: `${DEV_API_HOSTNAME}/v5/groups`,
+  PLATFORMS_V4_API_URL: `${DEV_API_HOSTNAME}/v4/platforms`,
+  TECHNOLOGIES_V4_API_URL: `${DEV_API_HOSTNAME}/v4/technologies`
 }

src/App.js

@@ -1,6 +1,8 @@
 /**
  * Constants used across the app
  */
+export const { COMMUNITY_APP_URL, CHALLENGE_API_URL } = process.env
+
 // Actions
 export const LOAD_PROJECTS_SUCCESS = 'LOAD_PROJECTS_SUCCESS'
 export const LOAD_PROJECTS_PENDING = 'LOAD_PROJECTS_PENDING'
@@ -22,18 +24,6 @@ export const LOAD_CHALLENGE_SUBMISSIONS_SUCCESS = 'LOAD_CHALLENGE_SUBMISSIONS_SU
 export const LOAD_CHALLENGE_SUBMISSIONS_PENDING = 'LOAD_CHALLENGE_SUBMISSIONS_PENDING'
 export const LOAD_CHALLENGE_SUBMISSIONS_FAILURE = 'LOAD_CHALLENGE_SUBMISSIONS_FAILURE'
 
-export const LOAD_CHALLENGE_TYPES_SUCCESS = 'LOAD_CHALLENGE_TYPES_SUCCESS'
-export const LOAD_CHALLENGE_TYPES_PENDING = 'LOAD_CHALLENGE_TYPES_PENDING'
-export const LOAD_CHALLENGE_TYPES_FAILURE = 'LOAD_CHALLENGE_TYPES_FAILURE'
-
-export const LOAD_SUBMISSION_DETAILS_SUCCESS = 'LOAD_SUBMISSION_DETAILS_SUCCESS'
-export const LOAD_SUBMISSION_DETAILS_PENDING = 'LOAD_SUBMISSION_DETAILS_PENDING'
-export const LOAD_SUBMISSION_DETAILS_FAILURE = 'LOAD_SUBMISSION_DETAILS_FAILURE'
-
-export const LOAD_SUBMISSION_ARTIFACTS_SUCCESS = 'LOAD_SUBMISSION_ARTIFACTS_SUCCESS'
-export const LOAD_SUBMISSION_ARTIFACTS_PENDING = 'LOAD_SUBMISSION_ARTIFACTS_PENDING'
-export const LOAD_SUBMISSION_ARTIFACTS_FAILURE = 'LOAD_SUBMISSION_ARTIFACTS_FAILURE'
-
 export const LOAD_CHALLENGE_MEMBERS_SUCCESS = 'LOAD_CHALLENGE_MEMBERS'
 export const LOAD_CHALLENGE_METADATA_SUCCESS = 'LOAD_CHALLENGE_METADATA_SUCCESS'
 
@@ -75,20 +65,6 @@ export const CHALLENGE_STATUS = {
   COMPLETED: 'COMPLETED'
 }
 
-export const PROJECT_API_URL = process.env.PROJECT_API_URL
-export const API_V3_URL = process.env.API_V3_URL
-export const API_V4_URL = process.env.API_V4_URL
-
-export const ACCOUNTS_APP_CONNECTOR_URL = process.env.ACCOUNTS_APP_CONNECTOR_URL
-export const ACCOUNTS_APP_LOGIN_URL = process.env.ACCOUNTS_APP_LOGIN_URL
-
-export const COMMUNITY_APP_URL = process.env.COMMUNITY_APP_URL
-
-export const CHALLENGE_API_URL = process.env.CHALLENGE_API_URL
-
-export const MEMBER_API_URL = process.env.MEMBER_API_URL
-export const MEMBER_API_V3_URL = process.env.MEMBER_API_V3_URL
-
 export const getTCMemberURL = (handle) => `${COMMUNITY_APP_URL}/members/${handle}`
 
 export const SYSTEM_USERS = [
@@ -114,13 +90,7 @@ export const ALLOWED_USER_ROLES = [
   'Connect Copilot'
 ]
 
-export const COMPETITION_TRACKS = {
-  DATA_SCIENCE: 'data_science',
-  DESIGN: 'design',
-  DEVELOP: 'develop'
-}
-
 export const downloadAttachmentURL = (challengeId, attachmentId, token) =>
-  `${CHALLENGE_API_URL}/challenges/${challengeId}/attachments/${attachmentId}?token=${token}`
+  `${CHALLENGE_API_URL}/${challengeId}/attachments/${attachmentId}?token=${token}`
 
 export const PAGE_SIZE = 50

src/config/constants.js

@@ -12,11 +12,12 @@ import Sidebar from './containers/Sidebar'
 import ChallengeList from './containers/Challenges'
 import ChallengeEditor from './containers/ChallengeEditor'
 import { getFreshToken } from 'tc-accounts'
-import { ACCOUNTS_APP_LOGIN_URL } from './config/constants'
 import { saveToken } from './actions/auth'
 import { connect } from 'react-redux'
 import { checkAllowedRoles } from './util/tc'
 
+const { ACCOUNTS_APP_LOGIN_URL } = process.env
+
 class Routes extends React.Component {
   componentWillMount () {
     this.checkAuth()

src/routes.js

@@ -1,7 +1,7 @@
 import axios from 'axios'
 import store from '../config/store'
 import { getFreshToken, isTokenExpired } from 'tc-accounts'
-import { ACCOUNTS_APP_LOGIN_URL } from '../config/constants'
+const { ACCOUNTS_APP_LOGIN_URL } = process.env
 
 /**
  * Create an axios instance that can make authenticated requests

src/services/axiosWithAuth.js

@@ -2,34 +2,22 @@ import _ from 'lodash'
 import qs from 'qs'
 import { axiosInstance } from './axiosWithAuth'
 import FormData from 'form-data'
-import { MEMBER_API_URL, CHALLENGE_API_URL, PROJECT_API_URL, API_V3_URL, API_V4_URL } from '../config/constants'
-
-/**
- * Api request for fetching member's active challenges
- * @returns {Promise<*>}
- */
-export async function fetchMemberChallenges (handle) {
-  const response = await axiosInstance.get(`${MEMBER_API_URL}/${handle}/challenges?filter=status=ACTIVE`)
-  return _.get(response, 'data.result.content')
-}
-
-/**
- * Api request for fetching member's challenge (it includes member roles)
- * @param {String} handle
- * @param challengeId
- * @returns {Promise<*>}
- */
-export async function fetchMemberChallenge (handle, challengeId) {
-  const response = await axiosInstance.get(`${CHALLENGE_API_URL}/members/${handle}/challenges?filter=id=${challengeId}`)
-  return _.get(response, 'data.result.content[0]')
-}
+const {
+  CHALLENGE_API_URL,
+  CHALLENGE_TYPES_URL,
+  CHALLENGE_TIMELINE_TEMPLATES_URL,
+  CHALLENGE_PHASES_URL,
+  GROUPS_API_URL,
+  PLATFORMS_V4_API_URL,
+  TECHNOLOGIES_V4_API_URL
+} = process.env
 
 /**
  * Api request for fetching challenge types
  * @returns {Promise<*>}
  */
 export async function fetchChallengeTypes () {
-  const response = await axiosInstance.get(`${CHALLENGE_API_URL}/challengetypes?isActive=true`)
+  const response = await axiosInstance.get(`${CHALLENGE_TYPES_URL}?isActive=true`)
   return _.get(response, 'data', [])
 }
 
@@ -38,8 +26,8 @@ export async function fetchChallengeTypes () {
  * @returns {Promise<*>}
  */
 export async function fetchChallengeTags () {
-  const platforms = await axiosInstance.get(`${API_V4_URL}/platforms`)
-  const technologies = await axiosInstance.get(`${API_V4_URL}/technologies`)
+  const platforms = await axiosInstance.get(PLATFORMS_V4_API_URL)
+  const technologies = await axiosInstance.get(TECHNOLOGIES_V4_API_URL)
   return [
     ..._.map(_.get(platforms, 'data.result.content', []), tag => _.pick(tag, 'name')),
     ..._.map(_.get(technologies, 'data.result.content', []), tag => _.pick(tag, 'name'))
@@ -51,7 +39,7 @@ export async function fetchChallengeTags () {
  * @returns {Promise<*>}
  */
 export async function fetchGroups () {
-  const response = await axiosInstance.get(`${API_V3_URL}/groups`)
+  const response = await axiosInstance.get(GROUPS_API_URL)
   return _.get(response, 'data.result.content', [])
 }
 
@@ -60,7 +48,7 @@ export async function fetchGroups () {
  * @returns {Promise<*>}
  */
 export async function fetchTimelineTemplates () {
-  const response = await axiosInstance.get(`${CHALLENGE_API_URL}/timelinetemplates`)
+  const response = await axiosInstance.get(CHALLENGE_TIMELINE_TEMPLATES_URL)
   return _.get(response, 'data', [])
 }
 
@@ -69,7 +57,7 @@ export async function fetchTimelineTemplates () {
  * @returns {Promise<*>}
  */
 export async function fetchChallengePhases () {
-  const response = await axiosInstance.get(`${CHALLENGE_API_URL}/challengephases`)
+  const response = await axiosInstance.get(CHALLENGE_PHASES_URL)
   return _.get(response, 'data', [])
 }
 
@@ -79,37 +67,17 @@ export async function fetchChallengePhases () {
  * @returns {Promise<*>}
  */
 export async function fetchChallenge (challengeId) {
-  const response = await axiosInstance.get(`${CHALLENGE_API_URL}/challenges/${challengeId}`)
+  const response = await axiosInstance.get(`${CHALLENGE_API_URL}/${challengeId}`)
   return _.get(response, 'data')
 }
 
-/**
- * Api request for fetching project's challenges
- * @param projectId Project id
- * @param status Challenge status
- * @returns {Promise<*>}
- */
-export async function fetchProjectChallenges (projectId, status) {
-  let filters = []
-  if (_.isEmpty(projectId)) {
-    status = 'ACTIVE'
-  } else {
-    filters.push(`projectId=${projectId}`)
-  }
-  if (!_.isEmpty(status)) {
-    filters.push(`status=${status}`)
-  }
-  const response = await axiosInstance.get(`${PROJECT_API_URL}/challenges${filters.length > 0 ? `?filter=${encodeURIComponent(filters.join('&'))}` : ''}`)
-  return _.get(response, 'data.result.content')
-}
-
 /**
  * Api request for creating new challenge
  * @param challenge challenge data
  * @returns {Promise<*>}
  */
 export function createChallenge (challenge) {
-  return axiosInstance.post(`${CHALLENGE_API_URL}/challenges`, challenge)
+  return axiosInstance.post(CHALLENGE_API_URL, challenge)
 }
 
 /**
@@ -119,13 +87,13 @@ export function createChallenge (challenge) {
  * @returns {Promise<*>}
  */
 export function updateChallenge (challenge, challengeId) {
-  return axiosInstance.put(`${CHALLENGE_API_URL}/challenges/${challengeId}`, challenge)
+  return axiosInstance.put(`${CHALLENGE_API_URL}/${challengeId}`, challenge)
 }
 
 export function uploadAttachment (challengeId, file) {
   const data = new FormData()
   data.append('attachment', file)
-  return axiosInstance.post(`${CHALLENGE_API_URL}/challenges/${challengeId}/attachments`, data)
+  return axiosInstance.post(`${CHALLENGE_API_URL}/${challengeId}/attachments`, data)
 }
 
 /**
@@ -138,7 +106,8 @@ export function fetchChallenges (filters, params) {
     ...filters,
     ...params
   }
-  return axiosInstance.get(`${CHALLENGE_API_URL}/challenges?${qs.stringify(query, { encode: false })}`)
+  console.log({ query })
+  return axiosInstance.get(`${CHALLENGE_API_URL}?${qs.stringify(query, { encode: false })}`)
 }
 
 /**
@@ -147,5 +116,5 @@ export function fetchChallenges (filters, params) {
  * @param params
  */
 export function patchChallenge (challengeId, params) {
-  return axiosInstance.patch(`${CHALLENGE_API_URL}/challenges/${challengeId}`, params)
+  return axiosInstance.patch(`${CHALLENGE_API_URL}/${challengeId}`, params)
 }

src/services/challenges.js

@@ -1,13 +1,13 @@
 import _ from 'lodash'
 import { axiosInstance } from './axiosWithAuth'
-import { MEMBER_API_V3_URL, PROJECT_API_URL } from '../config/constants'
+const { MEMBER_API_V3_URL, PROJECT_API_URL } = process.env
 
 /**
  * Api request for fetching member's projects
  * @returns {Promise<*>}
  */
 export async function fetchMemberProjects () {
-  const response = await axiosInstance.get(`${PROJECT_API_URL}/projects?limit=1000`)
+  const response = await axiosInstance.get(`${PROJECT_API_URL}?limit=1000`)
   return _.get(response, 'data.result.content')
 }
 
@@ -17,7 +17,7 @@ export async function fetchMemberProjects () {
  * @returns {Promise<*>}
  */
 export async function fetchProjectById (id) {
-  const response = await axiosInstance.get(`${PROJECT_API_URL}/projects/${id}`)
+  const response = await axiosInstance.get(`${PROJECT_API_URL}/${id}`)
   return _.get(response, 'data.result.content')
 }
 

src/services/projects.js

@@ -1,6 +1,6 @@
 import _ from 'lodash'
 import { axiosInstance } from './axiosWithAuth'
-import { MEMBER_API_V3_URL } from '../config/constants'
+const { MEMBER_API_V3_URL } = process.env
 
 /**
  * Api request for fetching user profile