From fc923a637e29b4ac5f036c123057b0494f3150d1 Mon Sep 17 00:00:00 2001 From: Sachin Maheshwari Date: Wed, 23 Sep 2020 18:14:34 +0530 Subject: [PATCH 1/8] RS256 token changes --- __tests__/reducers/auth.js | 2 +- __tests__/reducers/challenge.js | 2 +- config/jest/setup.js | 2 +- config/webpack/default.js | 2 +- package.json | 4 ++-- src/actions/auth.js | 2 +- src/actions/challenge.js | 2 +- src/reducers/auth.js | 2 +- src/reducers/direct.js | 2 +- src/services/challenges.js | 2 +- src/services/members.js | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/__tests__/reducers/auth.js b/__tests__/reducers/auth.js index 6861d5b4..6abeecb0 100644 --- 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 index b35324c1..1e698a95 100644 --- 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 index fc594f0f..de4e7b17 100644 --- 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 index 4872dd72..7389aac2 100644 --- 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 index 20f49c6f..636b699a 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,6 @@ "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" @@ -104,6 +103,7 @@ "webpack-dev-middleware": "^3.1.3", "webpack-hot-middleware": "^2.22.2", "webpack-merge": "^4.1.3", - "webpack-stats-plugin": "^0.2.1" + "webpack-stats-plugin": "^0.2.1", + "@topcoder-platform/tc-auth-lib": "^1.0.0" } } diff --git a/src/actions/auth.js b/src/actions/auth.js index f758d9ed..f81b62f9 100644 --- a/src/actions/auth.js +++ b/src/actions/auth.js @@ -4,7 +4,7 @@ */ import { createActions } from 'redux-actions'; -import { decodeToken } from 'tc-accounts'; +import { decodeToken } from '@topcoder-platform/tc-auth-lib'; import { getApiV3, getApiV5 } from '../services/api'; /** diff --git a/src/actions/challenge.js b/src/actions/challenge.js index f600bdc9..a2d538ab 100644 --- 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'; diff --git a/src/reducers/auth.js b/src/reducers/auth.js index 9a5adee5..d16f93f0 100644 --- 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/direct.js b/src/reducers/direct.js index f0122611..a86e73ac 100644 --- 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 index 5dc24d7f..95e72d59 100644 --- 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 index a5b32a51..d1cd5b09 100644 --- 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'; From 7d121b0f0cf3fe943bcc64458c540817a83f4044 Mon Sep 17 00:00:00 2001 From: Sachin Maheshwari Date: Wed, 23 Sep 2020 18:18:45 +0530 Subject: [PATCH 2/8] typo --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 636b699a..30128733 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,8 @@ "redux-actions": "^2.4.0", "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": "^1.0.0" }, "devDependencies": { "autoprefixer": "^8.6.4", @@ -103,7 +104,6 @@ "webpack-dev-middleware": "^3.1.3", "webpack-hot-middleware": "^2.22.2", "webpack-merge": "^4.1.3", - "webpack-stats-plugin": "^0.2.1", - "@topcoder-platform/tc-auth-lib": "^1.0.0" + "webpack-stats-plugin": "^0.2.1" } } From cdbe5cdb69c5d8bf1b7ed20857ad7104a60a153f Mon Sep 17 00:00:00 2001 From: Sachin Maheshwari Date: Fri, 25 Sep 2020 11:07:38 +0530 Subject: [PATCH 3/8] changes in auth-lib detail --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 30128733..fe088acc 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "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-platform/tc-auth-lib": "^1.0.0" + "@topcoder-platform/tc-auth-lib": "git+https://github.com/topcoder-platform/tc-auth-lib.git#1.0.1" }, "devDependencies": { "autoprefixer": "^8.6.4", From 952d3535356b9de10c0f74aa79bee19ae04ffb85 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Fri, 25 Sep 2020 12:48:27 -0300 Subject: [PATCH 4/8] Auth0 Test release https://github.com/topcoder-platform/community-app/issues/4937 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fe088acc..08461fbd 100644 --- 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": "1.0.5", + "version": "1000.23.0", "dependencies": { "auth0-js": "^6.8.4", "config": "^3.2.0", From fc887f00243424292b30e26ca249a131d687dca2 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Fri, 25 Sep 2020 12:49:07 -0300 Subject: [PATCH 5/8] ci: Added dist tag --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0e161844..e8eac28e 100644 --- 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 + - run: npm publish --tag test-release # dont change anything workflows: version: 2 From 927c663c67f427371f45bc5703137d69463b0d22 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Tue, 13 Oct 2020 06:40:50 -0300 Subject: [PATCH 6/8] Fix conflicts --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 08461fbd..81b82d95 100644 --- 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.23.0", + "version": "1000.24.6", "dependencies": { "auth0-js": "^6.8.4", "config": "^3.2.0", From 90c6b6b504a6cb1da1a08a5cb675fe43b80d0e75 Mon Sep 17 00:00:00 2001 From: Luiz Ricardo Rodrigues Date: Tue, 13 Oct 2020 06:43:08 -0300 Subject: [PATCH 7/8] Sync feature/auth0-RS256 with develop Issue: https://github.com/topcoder-platform/community-app/issues/4997 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 81b82d95..052476fd 100644 --- 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.24.6", + "version": "1000.23.1", "dependencies": { "auth0-js": "^6.8.4", "config": "^3.2.0", From c8ea4524ab2658d7fd105fc33b05bd1ad86f6b63 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Thu, 15 Oct 2020 13:49:24 +0530 Subject: [PATCH 8/8] ci: merged with develop branch --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 052476fd..f71524eb 100644 --- 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.23.1", + "version": "1000.23.2", "dependencies": { "auth0-js": "^6.8.4", "config": "^3.2.0",