From ef9ed764560b05f5c699a3c3c5c0786e7a73f465 Mon Sep 17 00:00:00 2001 From: Sachin Maheshwari Date: Mon, 28 Sep 2020 20:32:29 +0530 Subject: [PATCH 1/8] new login flow changes --- config/constants/development.js | 4 ++-- config/constants/production.js | 4 ++-- package.json | 2 +- src/actions/auth.js | 2 +- src/routes.js | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/constants/development.js b/config/constants/development.js index 89dba60d..1cd8efdc 100644 --- a/config/constants/development.js +++ b/config/constants/development.js @@ -2,8 +2,8 @@ const DOMAIN = 'topcoder-dev.com' const DEV_API_HOSTNAME = `https://api.${DOMAIN}` module.exports = { - ACCOUNTS_APP_CONNECTOR_URL: `https://accounts.${DOMAIN}/connector.html`, - ACCOUNTS_APP_LOGIN_URL: `https://accounts.${DOMAIN}/member`, + ACCOUNTS_APP_CONNECTOR_URL: `https://accounts-auth0.${DOMAIN}`, + ACCOUNTS_APP_LOGIN_URL: `https://accounts-auth0.${DOMAIN}`, COMMUNITY_APP_URL: `https://www.${DOMAIN}`, MEMBER_API_URL: `${DEV_API_HOSTNAME}/v4/members`, MEMBER_API_V3_URL: `${DEV_API_HOSTNAME}/v3/members`, diff --git a/config/constants/production.js b/config/constants/production.js index f7f7e18b..96a47509 100644 --- a/config/constants/production.js +++ b/config/constants/production.js @@ -2,8 +2,8 @@ const DOMAIN = 'topcoder.com' const PROD_API_HOSTNAME = `https://api.${DOMAIN}` module.exports = { - ACCOUNTS_APP_CONNECTOR_URL: process.env.ACCOUNTS_APP_CONNECTOR_URL || `https://accounts.${DOMAIN}/connector.html`, - ACCOUNTS_APP_LOGIN_URL: `https://accounts.${DOMAIN}/member`, + ACCOUNTS_APP_CONNECTOR_URL: process.env.ACCOUNTS_APP_CONNECTOR_URL || `https://accounts-auth0.${DOMAIN}`, + ACCOUNTS_APP_LOGIN_URL: `https://accounts-auth0.${DOMAIN}`, COMMUNITY_APP_URL: `https://www.${DOMAIN}`, MEMBER_API_URL: `${PROD_API_HOSTNAME}/v4/members`, MEMBER_API_V3_URL: `${PROD_API_HOSTNAME}/v3/members`, diff --git a/package.json b/package.json index 3635e879..4b1684c9 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "sass-loader": "7.1.0", "simplemde": "^1.11.2", "style-loader": "0.23.0", - "tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git", + "tc-auth-lib": "topcoder-platform/tc-auth-lib#1.0.1", "terser": "^3.16.1", "terser-webpack-plugin": "1.1.0", "topcoder-healthcheck-dropin": "^1.0.3", diff --git a/src/actions/auth.js b/src/actions/auth.js index 448576ea..6ed70d57 100644 --- a/src/actions/auth.js +++ b/src/actions/auth.js @@ -1,4 +1,4 @@ -import { configureConnector, decodeToken } from 'tc-accounts' +import { configureConnector, decodeToken } from 'tc-auth-lib' import { fetchProfile } from '../services/user' import { LOAD_USER_SUCCESS, diff --git a/src/routes.js b/src/routes.js index f0c20d00..3386e8a8 100644 --- a/src/routes.js +++ b/src/routes.js @@ -11,7 +11,7 @@ import TopBarContainer from './containers/TopbarContainer' import Sidebar from './containers/Sidebar' import ChallengeList from './containers/Challenges' import ChallengeEditor from './containers/ChallengeEditor' -import { getFreshToken } from 'tc-accounts' +import { getFreshToken } from 'tc-auth-lib' import { saveToken } from './actions/auth' import { loadChallengeDetails } from './actions/challenges' import { connect } from 'react-redux' From ac54363ab29e1287ebf9654a47b6c6591b79a1a1 Mon Sep 17 00:00:00 2001 From: Sachin Maheshwari Date: Tue, 6 Oct 2020 16:10:37 +0530 Subject: [PATCH 2/8] deploying new auth flow changes --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 475a2cf2..562a14e7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -73,7 +73,7 @@ workflows: filters: branches: only: - - develop + - "feature/Auth0-RS256-Token" # Production builds are exectuted only on tagged commits to the # master branch. @@ -81,4 +81,4 @@ workflows: context : org-global filters: branches: - only: master \ No newline at end of file + only: master From 758fc41e62db3ccfd513699a0f6008c585d772ca Mon Sep 17 00:00:00 2001 From: Sachin Maheshwari Date: Tue, 6 Oct 2020 16:23:14 +0530 Subject: [PATCH 3/8] typo --- src/services/axiosWithAuth.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/axiosWithAuth.js b/src/services/axiosWithAuth.js index 75eb5eef..6f587e40 100644 --- a/src/services/axiosWithAuth.js +++ b/src/services/axiosWithAuth.js @@ -1,6 +1,6 @@ import axios from 'axios' import store from '../config/store' -import { getFreshToken, isTokenExpired } from 'tc-accounts' +import { getFreshToken, isTokenExpired } from 'tc-auth-lib' const { ACCOUNTS_APP_LOGIN_URL } = process.env /** From c20679fd739a0b1f95be299f4576162a92cf45ac Mon Sep 17 00:00:00 2001 From: Sachin Maheshwari Date: Tue, 6 Oct 2020 16:55:50 +0530 Subject: [PATCH 4/8] fixing decode token issue --- src/routes.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes.js b/src/routes.js index 3386e8a8..55cac7fe 100644 --- a/src/routes.js +++ b/src/routes.js @@ -4,7 +4,7 @@ import React from 'react' import PropTypes from 'prop-types' import { Redirect, Route, Switch, withRouter } from 'react-router-dom' -import jwtDecode from 'jwt-decode' +import { decodeToken } from 'tc-auth-lib' import _ from 'lodash' import renderApp from './components/App' import TopBarContainer from './containers/TopbarContainer' @@ -78,7 +78,7 @@ class Routes extends React.Component { return null } - let isAllowed = checkAllowedRoles(_.get(jwtDecode(this.props.token), 'roles')) + let isAllowed = checkAllowedRoles(_.get(decodeToken(this.props.token), 'roles')) if (!isAllowed) { let warnMessage = 'You are not authorized to use this application' From 2c21a41ff2d58c0cbbae40ccfa1768718fb620f4 Mon Sep 17 00:00:00 2001 From: Sachin Maheshwari Date: Tue, 6 Oct 2020 17:04:33 +0530 Subject: [PATCH 5/8] fixing duplicate import --- src/routes.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/routes.js b/src/routes.js index 55cac7fe..2dad9624 100644 --- a/src/routes.js +++ b/src/routes.js @@ -4,14 +4,13 @@ import React from 'react' import PropTypes from 'prop-types' import { Redirect, Route, Switch, withRouter } from 'react-router-dom' -import { decodeToken } from 'tc-auth-lib' import _ from 'lodash' import renderApp from './components/App' import TopBarContainer from './containers/TopbarContainer' import Sidebar from './containers/Sidebar' import ChallengeList from './containers/Challenges' import ChallengeEditor from './containers/ChallengeEditor' -import { getFreshToken } from 'tc-auth-lib' +import { getFreshToken, decodeToken } from 'tc-auth-lib' import { saveToken } from './actions/auth' import { loadChallengeDetails } from './actions/challenges' import { connect } from 'react-redux' From 32a8e7edbef2ae934eaa3c0800dbbf37c2c8f04d Mon Sep 17 00:00:00 2001 From: James Cori Date: Wed, 28 Oct 2020 14:19:39 -0400 Subject: [PATCH 6/8] Changing default terms to the latest --- config/constants/development.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/constants/development.js b/config/constants/development.js index 4619d647..fe119d82 100644 --- a/config/constants/development.js +++ b/config/constants/development.js @@ -24,7 +24,7 @@ module.exports = { CONNECT_APP_URL: `https://connect.${DOMAIN}`, DIRECT_PROJECT_URL: `https://www.${DOMAIN}/direct`, ONLINE_REVIEW_URL: `https://software.${DOMAIN}`, - DEFAULT_TERM_UUID: 'b11da5cd-713f-478d-90f4-f679ef53ee95', // Terms & Conditions of Use at TopCoder + DEFAULT_TERM_UUID: '64d6e249-d7a5-4591-8ff5-e872f8a051f9', // Terms & Conditions of Use at TopCoder DEFAULT_NDA_UUID: '77f558c1-56fb-427c-b974-61ea0a060ca7', // Appirio NDA v2.0 SUBMITTER_ROLE_UUID: '732339e7-8e30-49d7-9198-cccf9451e221', DEV_TRACK_ID: '9b6fc876-f4d9-4ccb-9dfd-419247628825', From c5fbe0fdb3d6ba483d26e44ad951c7ea534084be Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Thu, 29 Oct 2020 17:10:59 +0530 Subject: [PATCH 7/8] fix: added back the develop branch to the list of branches to be build and deployed to dev env. --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 737c0e49..ed9f79f1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -71,7 +71,7 @@ workflows: filters: branches: only: - - "feature/Auth0-RS256-Token" + - develop # Production builds are exectuted only on tagged commits to the # master branch. From e2745edc8908a55db369007cab55e9460743c348 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Thu, 29 Oct 2020 17:22:54 +0530 Subject: [PATCH 8/8] fix: one more instance of jet decoding --- src/util/tc.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/tc.js b/src/util/tc.js index 9b732949..d22f7da8 100644 --- a/src/util/tc.js +++ b/src/util/tc.js @@ -3,7 +3,7 @@ */ import { MARATHON_MATCH_SUBTRACKS, CHALLENGE_TRACKS, ALLOWED_USER_ROLES, ADMIN_ROLES } from '../config/constants' import _ from 'lodash' -import jwtDecode from 'jwt-decode' +import { decodeToken } from 'tc-auth-lib' export const RATING_COLORS = [{ color: '#9D9FA0' /* Grey */, @@ -56,6 +56,6 @@ export const checkAllowedRoles = (roles) => roles.some(val => ALLOWED_USER_ROLES * @param token */ export const checkAdmin = (token) => { - const roles = _.get(jwtDecode(token), 'roles') + const roles = _.get(decodeToken(token), 'roles') return roles.some(val => ADMIN_ROLES.indexOf(val.toLowerCase()) > -1) }