Merge branch 'develop' into stats-history-v4

luizrrodrigues · web-flow · commit 23f25b24a1b4 · 2020-11-10T03:10:10.000-03:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -28,7 +28,7 @@ jobs:
       - attach_workspace:
           at: .
       - run: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
-      - run: npm publish --tag test-release
+      - run: npm publish
 # dont change anything
 workflows:
   version: 2
diff --git a/__tests__/reducers/auth.js b/__tests__/reducers/auth.js
@@ -20,7 +20,7 @@ const mockActions = {
 jest.setMock(require.resolve('actions/auth'), mockActions);
 jest.setMock(require.resolve('actions/profile'), mockActions);
 
-jest.setMock('tc-accounts', {
+jest.setMock('@topcoder-platform/tc-auth-lib', {
   decodeToken: () => 'User object',
   isTokenExpired: () => false,
 });
diff --git a/__tests__/reducers/challenge.js b/__tests__/reducers/challenge.js
@@ -44,7 +44,7 @@ const mockSmpActions = {
 };
 _.merge(actions, mockSmpActions);
 
-jest.setMock('tc-accounts', {
+jest.setMock('@topcoder-platform/tc-auth-lib', {
   decodeToken: () => 'User object',
   isTokenExpired: () => false,
 });
diff --git a/config/jest/setup.js b/config/jest/setup.js
@@ -1,7 +1,7 @@
 /* global jest */
 require('topcoder-react-utils/config/jest/setup');
 
-jest.setMock('tc-accounts', {
+jest.setMock('@topcoder-platform/tc-auth-lib', {
   decodeToken: token => (token ? {
     handle: 'username12345',
     userId: '12345',
diff --git a/config/webpack/default.js b/config/webpack/default.js
@@ -22,7 +22,7 @@ module.exports = {
     'redux',
     'redux-actions',
     'isomorphic-fetch',
-    'tc-accounts',
+    '@topcoder-platform/tc-auth-lib',
     'to-capital-case',
     'topcoder-react-utils',
     'tc-core-library-js',
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
     "lint:js": "./node_modules/.bin/eslint --ext .js,.jsx .",
     "test": "npm run lint && npm run jest"
   },
-  "version": "1000.25.0",
+  "version": "1000.25.7",
   "dependencies": {
     "auth0-js": "^6.8.4",
     "config": "^3.2.0",
@@ -47,10 +47,10 @@
     "react-redux": "^6.0.1",
     "redux": "^3.7.2",
     "redux-actions": "^2.4.0",
-    "tc-accounts": "https://github.com/appirio-tech/accounts-app.git#dev",
     "tc-core-library-js": "appirio-tech/tc-core-library-js.git#v2.6",
     "to-capital-case": "^1.0.0",
-    "topcoder-react-utils": "0.7.5"
+    "topcoder-react-utils": "0.7.5",
+    "@topcoder-platform/tc-auth-lib": "git+https://github.com/topcoder-platform/tc-auth-lib.git#1.0.1"
   },
   "devDependencies": {
     "autoprefixer": "^8.6.4",
diff --git a/src/actions/auth.js b/src/actions/auth.js
@@ -4,8 +4,32 @@
  */
 
 import { createActions } from 'redux-actions';
-import { decodeToken } from 'tc-accounts';
+import { decodeToken } from '@topcoder-platform/tc-auth-lib';
 import { getApiV3, getApiV5 } from '../services/api';
+import { setErrorIcon, ERROR_ICON_TYPES } from '../utils/errors';
+
+/**
+ * Helper method that checks for HTTP error response v5 and throws Error in this case.
+ * @param {Object} res HTTP response object
+ * @return {Object} API JSON response object
+ * @private
+ */
+async function checkErrorV5(res) {
+  if (!res.ok) {
+    if (res.status === 403) {
+      setErrorIcon(ERROR_ICON_TYPES.API, 'Auth0', res.statusText);
+    }
+    throw new Error(res.statusText);
+  }
+  const jsonRes = (await res.json());
+  if (jsonRes.message) {
+    throw new Error(res.message);
+  }
+  return {
+    result: jsonRes,
+    headers: res.headers,
+  };
+}
 
 /**
  * @static
@@ -22,8 +46,7 @@ function loadProfileDone(userTokenV3) {
     apiV3.get(`/members/${user.handle}`)
       .then(res => res.json()).then(res => (res.result.status === 200 ? res.result.content : {})),
     apiV5.get(`/groups?memberId=${user.userId}&membershipType=user`)
-      .then(res => (res.ok ? res.json() : new Error(res.statusText)))
-      .then(res => (res.message ? new Error(res.message) : res)),
+      .then(checkErrorV5).then(res => res.result || []),
   ]).then(([profile, groups]) => ({ ...profile, groups }));
 }
 
diff --git a/src/actions/challenge.js b/src/actions/challenge.js
@@ -7,7 +7,7 @@
 import _ from 'lodash';
 import { config } from 'topcoder-react-utils';
 import { createActions } from 'redux-actions';
-import { decodeToken } from 'tc-accounts';
+import { decodeToken } from '@topcoder-platform/tc-auth-lib';
 import { getService as getChallengesService } from '../services/challenges';
 import { getService as getSubmissionService } from '../services/submissions';
 import { getApi } from '../services/api';
@@ -248,7 +248,7 @@ function loadResultsInit(challengeId) {
  * @return {Action}
  */
 function loadResultsDone(auth, challengeId, type) {
-  return getApi('V2', auth.tokenV2)
+  return getApi('V2')
     .fetch(`/${type}/challenges/result/${challengeId}`)
     .then(response => response.json())
     .then(response => ({
@@ -273,7 +273,7 @@ function fetchCheckpointsInit() {}
  */
 function fetchCheckpointsDone(tokenV2, challengeId) {
   const endpoint = `/design/challenges/checkpoint/${challengeId}`;
-  return getApi('V2', tokenV2).fetch(endpoint)
+  return getApi('V2').fetch(endpoint)
     .then((response) => {
       if (response.status !== 200) {
         throw response.status;
diff --git a/src/reducers/auth.js b/src/reducers/auth.js
@@ -13,7 +13,7 @@
  */
 
 import _ from 'lodash';
-import { decodeToken } from 'tc-accounts';
+import { decodeToken } from '@topcoder-platform/tc-auth-lib';
 import { redux } from 'topcoder-react-utils';
 import actions from '../actions/auth';
 import profileActions from '../actions/profile';
diff --git a/src/reducers/challenge.js b/src/reducers/challenge.js
@@ -173,7 +173,7 @@ function onFetchCheckpointsDone(state, action) {
       loadingCheckpoints: false,
     };
   }
-  if (state.details && state.details.legacyId === action.payload.challengeId) {
+  if (state.details && `${state.details.legacyId}` === `${action.payload.challengeId}`) {
     return {
       ...state,
       checkpoints: action.payload.checkpoints,
diff --git a/src/reducers/direct.js b/src/reducers/direct.js
@@ -6,7 +6,7 @@
 
 import _ from 'lodash';
 import { handleActions } from 'redux-actions';
-import { decodeToken } from 'tc-accounts';
+import { decodeToken } from '@topcoder-platform/tc-auth-lib';
 import actions from '../actions/direct';
 import logger from '../utils/logger';
 import { fireErrorMessage } from '../utils/errors';
diff --git a/src/services/challenges.js b/src/services/challenges.js
@@ -7,7 +7,7 @@
 import _ from 'lodash';
 import moment from 'moment';
 import qs from 'qs';
-import { decodeToken } from 'tc-accounts';
+import { decodeToken } from '@topcoder-platform/tc-auth-lib';
 import logger from '../utils/logger';
 import { setErrorIcon, ERROR_ICON_TYPES } from '../utils/errors';
 import { COMPETITION_TRACKS, getApiResponsePayload } from '../utils/tc';
diff --git a/src/services/members.js b/src/services/members.js
@@ -7,7 +7,7 @@
 /* global XMLHttpRequest */
 import _ from 'lodash';
 import qs from 'qs';
-import { decodeToken } from 'tc-accounts';
+import { decodeToken } from '@topcoder-platform/tc-auth-lib';
 import logger from '../utils/logger';
 import { getApiResponsePayload } from '../utils/tc';
 import { getApi } from './api';

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ function onFetchCheckpointsDone(state, action) {`
`173`	`173`	`loadingCheckpoints: false,`
`174`	`174`	`};`
`175`	`175`	`}`
`176`		`- if (state.details && state.details.legacyId === action.payload.challengeId) {`
	`176`	+ if (state.details && `${state.details.legacyId}` === `${action.payload.challengeId}`) {
`177`	`177`	`return {`
`178`	`178`	`...state,`
`179`	`179`	`checkpoints: action.payload.checkpoints,`