Payment tool updates

__tests__/__snapshots__/index.js.snap

@@ -294,6 +294,10 @@ Object {
       "default": undefined,
       "getService": [Function],
     },
+    "resource": Object {
+      "default": undefined,
+      "getService": [Function],
+    },
     "reviewOpportunities": Object {
       "default": undefined,
       "getReviewOpportunitiesService": [Function],

__tests__/actions/auth.js

@@ -1,17 +1,18 @@
-const MOCK_GROUPS_REQ_URL = 'https://api.topcoder-dev.com/v3/groups?memberId=12345&membershipType=user';
+const MOCK_GROUPS_REQ_URL = 'https://api.topcoder-dev.com/v5/groups?memberId=12345&membershipType=user';
 const MOCK_PROFILE_REQ_URL = 'https://api.topcoder-dev.com/v3/members/username12345';
 
 jest.mock('isomorphic-fetch', () => jest.fn(url => Promise.resolve({
   json: () => {
     let content;
     switch (url) {
-      case MOCK_GROUPS_REQ_URL: content = ['Group1', 'Group2']; break;
-      case MOCK_PROFILE_REQ_URL: content = { userId: 12345 }; break;
+      case MOCK_GROUPS_REQ_URL: content = ['Group1', 'Group2'];
+        return content;
+      case MOCK_PROFILE_REQ_URL: content = { userId: 12345 };
+        return {
+          result: { content, status: 200 },
+        };
       default: throw new Error('Unexpected URL!');
     }
-    return {
-      result: { content, status: 200 },
-    };
   },
 })));
 

config/test.js

@@ -2,6 +2,8 @@ module.exports = {
   API: {
     V2: 'https://api.topcoder-dev.com/v2',
     V3: 'https://api.topcoder-dev.com/v3',
+    V4: 'https://api.topcoder-dev.com/v4',
+    V5: 'https://api.topcoder-dev.com/v5',
   },
   dummyConfigKey: 'Dummy config value',
 };

src/actions/auth.js

@@ -17,11 +17,12 @@ function loadProfileDone(userTokenV3) {
   if (!userTokenV3) return Promise.resolve(null);
   const user = decodeToken(userTokenV3);
   const api = getApi('V3', userTokenV3);
+  const apiV5 = getApi('V5', userTokenV3);
   return Promise.all([
     api.get(`/members/${user.handle}`)
       .then(res => res.json()).then(res => (res.result.status === 200 ? res.result.content : {})),
-    api.get(`/groups?memberId=${user.userId}&membershipType=user`)
-      .then(res => res.json()).then(res => (res.result.status === 200 ? res.result.content : [])),
+    apiV5.get(`/groups?memberId=${user.userId}&membershipType=user`)
+      .then(res => res.json()).then(res => (res && res.length ? res : [])),
   ]).then(([profile, groups]) => ({ ...profile, groups }));
 }
 

src/actions/direct.js

@@ -79,15 +79,15 @@ function getUserProjectsInit(tokenV3) {
  * @static
  * @desc Creates an action that loads projects related to a user.
  * @param {String} tokenV3 Topcoder auth token v3.
- * @param {Boolean} hasActiveBillingAccount Optional. Defaults to false.
- *  Whether only projects with active billing accounts should be included
- *  into the results.
  * @return {Action}
  */
-async function getUserProjectsDone(tokenV3, hasActiveBillingAccount) {
-  const params = {};
-  if (hasActiveBillingAccount) params.hasActiveBillingAccount = true;
-  const projects = await getService(tokenV3).getUserProjects(params);
+async function getUserProjectsDone(tokenV3) {
+  // Fetches Member's only Active projects
+  const projects = await getService(tokenV3).getUserProjects({
+    memberOnly: true,
+    sort: 'lastActivityAt desc',
+    status: 'active',
+  });
   return { tokenV3, projects };
 }
 

src/actions/member-tasks.js

@@ -59,11 +59,12 @@ function getInit(uuid, pageNum) {
  */
 function getDone(uuid, projectId, pageNum, tokenV3) {
   return getService(tokenV3).getChallenges({
-    isTask: 1,
+    isTask: true,
     projectId,
-  }, {
-    limit: PAGE_SIZE,
-    offset: pageNum * PAGE_SIZE,
+    sortBy: 'updated',
+    sortOrder: 'desc',
+    perPage: PAGE_SIZE,
+    page: pageNum + 1,
   }).then(({ challenges, totalCount }) => ({
     projectId,
     tasks: challenges,

src/reducers/direct.js

@@ -54,7 +54,7 @@ function onGetProjectDetailsDone(state, { error, payload }) {
     logger.error('Failed to load project details', payload);
     throw payload;
   }
-  if (payload.project.projectId !== state.loadingProjectDetailsForId) {
+  if (payload.id !== state.loadingProjectDetailsForId) {
     return state;
   }
   return {

src/services/direct.js

@@ -21,7 +21,7 @@ class Direct {
    */
   constructor(tokenV3) {
     this.private = {
-      api: getApi('V3', tokenV3),
+      api: getApi('V5', tokenV3),
       tokenV3,
     };
   }
@@ -32,11 +32,9 @@ class Direct {
    * @return {Promise} Resolves to the project details object.
    */
   async getProjectDetails(projectId) {
-    let res = await this.private.api.get(`/direct/projects/${projectId}`);
+    const res = await this.private.api.get(`/projects/${projectId}`);
     if (!res.ok) throw new Error(res.statusText);
-    res = (await res.json()).result;
-    if (res.status !== 200) throw new Error(res.content);
-    return res.content;
+    return res.json();
   }
 
   /**
@@ -46,12 +44,10 @@ class Direct {
    * @return {Promise} Resolves to the user permissions data.
    */
   async getProjectPermissions(projectId) {
-    const URL = `/direct/projects/${projectId}/permissions`;
-    let res = await this.private.api.get(URL);
+    const URL = `/projects/${projectId}/permissions`;
+    const res = await this.private.api.get(URL);
     if (!res.ok) throw new Error(res.statusText);
-    res = (await res.json()).result;
-    if (res.status !== 200) throw new Error(res.content);
-    return res.content;
+    return res.json();
   }
 
   /**
@@ -60,13 +56,11 @@ class Direct {
    * @return {Promise} Resolves to an array of project objects.
    */
   async getUserProjects(query) {
-    let url = '/direct/projects/user';
+    let url = '/projects';
     if (query) url += `?${qs.stringify(query)}`;
-    let res = await this.private.api.get(url);
+    const res = await this.private.api.get(url);
     if (!res.ok) throw new Error(res.statusText);
-    res = (await res.json()).result;
-    if (res.status !== 200) throw new Error(res.content);
-    return res.content;
+    return res.json();
   }
 }
 

src/services/index.js

@@ -15,6 +15,7 @@ import * as user from './user';
 import * as lookup from './lookup';
 import * as userTraits from './user-traits';
 import * as submissions from './submissions';
+import * as resource from './resources';
 
 export const services = {
   api,
@@ -26,6 +27,7 @@ export const services = {
   groups,
   members,
   user,
+  resource,
   userSetting,
   reviewOpportunities,
   lookup,

src/services/resources.js

@@ -0,0 +1,79 @@
+/**
+ * @module "services.resources"
+ * @desc The Resources service takes care about communication with Direct APIs:
+ */
+
+import qs from 'qs';
+
+import { getApi } from './api';
+
+/**
+ * Resources service class.
+ */
+class ResourcesService {
+  /**
+   * Creates a new {@link module:services.resources~ResourcesService} instance.
+   * @param {String} tokenV3 Optional. Topcoder auth token v3. Though optional,
+   *  most probably most, if not all, of the service functionality won't work
+   *  for non-authenticated visitors.
+   */
+  constructor(tokenV3) {
+    this.private = {
+      api: getApi('V5', tokenV3),
+      tokenV3,
+    };
+  }
+
+  /**
+   * Gets Resource roles.
+   * @return {Promise} Resolves to the Resource roles.
+   */
+  async getResourceRoles() {
+    const res = await this.private.api.get('/resource-roles');
+    if (!res.ok) throw new Error(res.statusText);
+    const result = await res.json();
+    return result;
+  }
+
+  /**
+   * Gets Resource roles on the specified Challenge.
+   * @param {Object} query
+   * @return {Promise} Resolves to the Resource roles.
+   */
+  async getChallengeResourceRoles(query) {
+    let url = '/resources';
+    if (query) url += `?${qs.stringify(query)}`;
+    const res = await this.private.api.get(url);
+    if (!res.ok) throw new Error(res.statusText);
+    const result = await res.json();
+    return result;
+  }
+
+  /**
+   * Post New Resource for a challenge
+   * @param {Object} body. Body for the request.
+   * @return {Promise} Resolves to Resource object.
+   */
+  async createChallengeResource(body) {
+    const url = '/resources';
+    const res = await this.private.api.postJson(url, body);
+    if (!res.ok) throw new Error(res.statusText);
+    const result = await res.json();
+    return result;
+  }
+}
+
+let lastInstance = null;
+/**
+ * Returns a new or existing {@link module:services.resource~ResourcesService} service.
+ * @param {String} tokenV3 Optional. Topcoder auth token v3.
+ * @return {ResourcesService} ResourcesService service object.
+ */
+export function getService(tokenV3) {
+  if (!lastInstance || lastInstance.private.tokenV3 !== tokenV3) {
+    lastInstance = new ResourcesService(tokenV3);
+  }
+  return lastInstance;
+}
+
+export default undefined;