Remove V2 API from Dashboard and Profile Page

Author: Huan Li

__tests__/__snapshots__/index.js.snap

@@ -69,6 +69,7 @@ Object {
       "dropAll": [Function],
       "getAchievementsDone": [Function],
       "getAchievementsInit": [Function],
+      "getAchievementsV3Done": [Function],
       "getActiveChallengesDone": [Function],
       "getActiveChallengesInit": [Function],
       "getFinancesDone": [Function],
@@ -98,6 +99,7 @@ Object {
       "deleteWebLinkInit": [Function],
       "getAchievementsDone": [Function],
       "getAchievementsInit": [Function],
+      "getAchievementsV3Done": [Function],
       "getCredentialDone": [Function],
       "getCredentialInit": [Function],
       "getEmailPreferencesDone": [Function],
@@ -206,14 +208,17 @@ Object {
     "countReset": [Function],
     "debug": [Function],
     "dir": [Function],
+    "dirxml": [Function],
     "error": [Function],
     "group": [Function],
     "groupCollapsed": [Function],
     "groupEnd": [Function],
     "info": [Function],
     "log": [Function],
+    "table": [Function],
     "time": [Function],
     "timeEnd": [Function],
+    "timeLog": [Function],
     "trace": [Function],
     "warn": [Function],
   },
@@ -318,6 +323,7 @@ Object {
       "Spec Review": "Specification Review",
     },
     "getApiResponsePayload": [Function],
+    "getApiResponsePayloadV3": [Function],
     "getLookerApiResponsePayload": [Function],
   },
   "time": Object {

__tests__/actions/__snapshots__/profile.js.snap

@@ -14,6 +14,7 @@ Object {
     "deleteWebLinkInit": [Function],
     "getAchievementsDone": [Function],
     "getAchievementsInit": [Function],
+    "getAchievementsV3Done": [Function],
     "getCredentialDone": [Function],
     "getCredentialInit": [Function],
     "getEmailPreferencesDone": [Function],

package-lock.json

@@ -57,6 +57,23 @@ async function getAchievementsDone(handle, uuid) {
   return { data, handle, uuid };
 }
 
+/**
+ * @static
+ * @desc Creates an action that loads member achievements from v3 API.
+ * @param {String} handle Member handle.
+ * @param {String} uuid Loading operation
+ * @return {Action}
+ */
+async function getAchievementsV3Done(handle, uuid) {
+  let data;
+  try {
+    data = await getUserService().getAchievementsV3(handle);
+  } catch (e) {
+    data = [];
+  }
+  return { data, handle, uuid };
+}
+
 /**
  * @static
  * @desc Creates an action that signals beginning of loading the member's
@@ -344,6 +361,7 @@ export default createActions({
     DROP_ALL: dropAll,
     GET_ACHIEVEMENTS_INIT: getAchievementsInit,
     GET_ACHIEVEMENTS_DONE: getAchievementsDone,
+    GET_ACHIEVEMENTS_V3_DONE: getAchievementsV3Done,
     GET_FINANCES_INIT: getFinancesInit,
     GET_FINANCES_DONE: getFinancesDone,
     GET_STATS_INIT: getStatsInit,

src/actions/members.js

@@ -31,7 +31,7 @@ function getAchievementsInit() {}
 
 /**
  * @static
- * @desc Creates an action that loads user achievements.
+ * @desc Creates an action that loads user achievements from API v2.
  * @todo This duplicates similar action in {@link actions.members.md}!
  * @param {String} handle User handle.
  * @return {Action}
@@ -40,6 +40,17 @@ function getAchievementsDone(handle) {
   return getUserService().getUserPublic(handle);
 }
 
+/**
+ * @static
+ * @desc Creates an action that loads user achievements from API v3.
+ * @todo This duplicates similar action in {@link actions.members.md}!
+ * @param {String} handle User handle.
+ * @return {Action}
+ */
+function getAchievementsV3Done(handle) {
+  return getUserService().getUserPublicV3(handle);
+}
+
 /**
  * @static
  * @todo To be documented.
@@ -450,6 +461,7 @@ export default createActions({
     CLEAR_PROFILE: _.noop,
     GET_ACHIEVEMENTS_INIT: getAchievementsInit,
     GET_ACHIEVEMENTS_DONE: getAchievementsDone,
+    GET_ACHIEVEMENTS_V3_DONE: getAchievementsV3Done,
     GET_EXTERNAL_ACCOUNTS_INIT: getExternalAccountsInit,
     GET_EXTERNAL_ACCOUNTS_DONE: getExternalAccountsDone,
     GET_EXTERNAL_LINKS_INIT: getExternalLinksInit,

src/actions/profile.js

@@ -10,11 +10,10 @@ import { getService } from '../services/user-traits';
 /**
  * @static
  * @desc Creates an action that loads user's all traits.
- * @param {String} uuid Operation UUID.
+ * @param {String} handle the topcoder member handle
  * @param {String} tokenV3 v3 auth token.
  * @return {Action}
  */
-
 async function getAllUserTraits(handle, tokenV3) {
   const data = await getService(tokenV3).getAllUserTraits(handle);
   return { data, handle };

src/actions/settings.js

@@ -438,6 +438,7 @@ function create(initialState = {}) {
     [a.dropAll]: onDropAll,
     [a.getAchievementsInit]: onGetAchievementsInit,
     [a.getAchievementsDone]: onGetAchievementsDone,
+    [a.getAchievementsV3Done]: onGetAchievementsDone,
     [a.getFinancesInit]: onGetFinancesInit,
     [a.getFinancesDone]: onGetFinancesDone,
     [a.getStatsInit]: onGetStatsInit,

src/reducers/members.js

@@ -29,6 +29,26 @@ function onGetAchievementsDone(state, { payload, error }) {
   });
 }
 
+/**
+ * Handles PROFILE/GET_ACHIEVEMENTS_V3_DONE action.
+ * @param {Object} state
+ * @param {Object} action Payload will be JSON from api call
+ * @return {Object} New state
+ */
+function onGetAchievementsV3Done(state, { payload, error }) {
+  if (error) {
+    return { ...state, loadingError: true };
+  }
+
+  return ({
+    ...state,
+    achievements: payload.achievements || [],
+    copilot: payload.copilot,
+    country: payload.country,
+    loadingError: false,
+  });
+}
+
 /**
  * Handles PROFILE/GET_EXTERNAL_ACCOUNTS_DONE action.
  * @param {Object} state
@@ -490,6 +510,7 @@ function create(initialState) {
     [a.loadProfile]: (state, action) => ({ ...state, profileForHandle: action.payload }),
     [a.getAchievementsInit]: state => state,
     [a.getAchievementsDone]: onGetAchievementsDone,
+    [a.getAchievementsV3Done]: onGetAchievementsV3Done,
     [a.getExternalAccountsInit]: state => state,
     [a.getExternalAccountsDone]: onGetExternalAccountsDone,
     [a.getExternalLinksInit]: state => state,

src/reducers/profile.js

@@ -6,7 +6,7 @@
 import { config, isomorphy } from 'topcoder-react-utils';
 
 import logger from '../utils/logger';
-import { getApiResponsePayload } from '../utils/tc';
+import { getApiResponsePayload, getApiResponsePayloadV3 } from '../utils/tc';
 import { getApi } from './api';
 
 let auth0;
@@ -141,6 +141,16 @@ class User {
     return res.json() || null;
   }
 
+  /**
+   * Gets public user info from v3 API. Does not need auth.
+   * @param {String} username
+   * @return {Object}
+   */
+  async getUserPublicV3(username) {
+    const res = await this.private.api.get(`/members/${username}`);
+    return getApiResponsePayloadV3(res);
+  }
+
   /**
    * Gets user data object for the specified username.
    *

src/services/user.js

@@ -38,6 +38,18 @@ export async function getApiResponsePayload(res) {
   return x.content;
 }
 
+/**
+ * Gets payload from a standard success response from TC API v3; or throws
+ * an error in case of a failure response.
+ * @param {Object} res
+ * @return {Promise} Resolves to the payload.
+ */
+export async function getApiResponsePayloadV3(res) {
+  if (!res.ok) throw new Error(res.statusText);
+  const x = (await res.json()).result;
+  if (!x.success) throw new Error(x.content);
+  return x.content;
+}
 
 /**
  * Gets payload from a standard success response from TC LOOKER API; or throws