#630 - cleanup code

Author: callmekatootie

.gitignore

@@ -1,7 +1,6 @@
 node_modules
 .idea
 **/.DS_Store
-upload
 scripts/generate
 .nyc_output
 .env

client/README.md

@@ -16,8 +16,15 @@ REACT_APP_ATTRIBUTE_ID_COMPANY
 REACT_APP_ATTRIBUTE_ID_TITLE
 REACT_APP_ATTRIBUTE_ID_ISAVAILABLE
   => All 4 of the above are the ids of the attributes with name "location", "company", "title" and "isAvailable" respectively. These are used to filter attributes for display under a dedicated section named company attributes. Since these already have UI elements of their own, they are filtered from the list of company attributes
-REACT_APP_AUTH0_DOMAIN => The Auth0 login domain
-REACT_APP_AUTH0_CLIENTID => The Auth0 clientId
+REACT_APP_ACCOUNTS_APP_CONNECTOR
+REACT_APP_TC_AUTH_URL
+  => The connection parameters to authenticate with Topcoder
+REACT_APP_APP_URL
+  => The app's url. ex. http://localhost:3000. This is used to redirect the user after they have logged in
+REACT_APP_AUTH0_CLAIMS_HANDLE
+  => The property name in decoded token object to read the nickname from
+REACT_APP_TC_COOKIE_NAME
+  => The topcoder cookie name. App uses this to detect if the user has token or not
 ```
 
 You can create a `.env.local` file and provide the above configuration. Note that there's more configuration that you can change and you can find this under `src/config.js`. The above configurations are the minimum ones, that you need to launch the app successfully.

client/src/Router.jsx

@@ -24,16 +24,19 @@ configureConnector({
 export default function AppRouter() {
   const [loading, setLoading] = React.useState(true);
 
+  /**
+   * The auth checks would ideally be under Private Routes
+   * However, our app does not have any routes (only / route)
+   * and thus adding the code on the ROOT route itself...
+   */
   React.useEffect(() => {
     if (!loading) {
       return;
     }
 
     (async () => {
-      console.log("Getting token in router");
       try {
         await getFreshToken();
-        console.log("Received token in router");
 
         setLoading(false);
       } catch (error) {

client/src/components/Upload/index.jsx

@@ -14,7 +14,6 @@ import style from "./style.module.scss";
 import config from "../../config";
 import api from "../../services/api";
 import { getSingleOrg } from "../../services/user-org";
-import { ConsoleTransportOptions } from "winston/lib/winston/transports";
 
 const UPLOAD_STATES = {
   INITIAL: "INITIAL",

client/src/config.js

@@ -32,17 +32,14 @@ export default {
     isAvailable: process.env.REACT_APP_ATTRIBUTE_ID_ISAVAILABLE,
   },
 
-  // TODO - Search and remove references before deleting below code
-  // AUTH0: {
-  //   domain: process.env.REACT_APP_AUTH0_DOMAIN,
-  //   clientId: process.env.REACT_APP_AUTH0_CLIENTID,
-  //   audience: process.env.REACT_APP_AUTH0_AUDIENCE,
-  //   handleClaims: process.env.REACT_APP_AUTH0_CLAIMS_HANDLE,
-  // },
   AUTH: {
     ACCOUNTS_APP_CONNECTOR: process.env.REACT_APP_ACCOUNTS_APP_CONNECTOR,
     TC_AUTH_URL: process.env.REACT_APP_TC_AUTH_URL,
+    // redirect to url after login
     APP_URL: process.env.REACT_APP_APP_URL,
+    // property name in decoded token object to read the nickname from
     handleClaims: process.env.REACT_APP_AUTH0_CLAIMS_HANDLE,
+    // cookie name which contains the TC token
+    cookieName: process.env.REACT_APP_TC_COOKIE_NAME || "v3jwt",
   },
 };

client/src/lib/common.js

@@ -15,6 +15,6 @@ export async function getNickname() {
       "An error occurred trying to retrieve the nickname of the logged in user"
     );
     console.log(error);
-    alert("You are not logged in");
+    alert("An error occurred. Try logging out and then log back in");
   }
 }

client/src/pages/Search/index.jsx

@@ -57,7 +57,7 @@ export default function SearchPage() {
   }, [keyword]);
 
   const onSelectOrg = (org) => {
-    const cookie = Cookies.get("v3jwt");
+    const cookie = Cookies.get(config.AUTH.cookieName);
     if (cookie) {
       OrgService.setSingleOrg(org);
       setSelectedOrg(org);

client/src/services/api.js

@@ -4,8 +4,7 @@
 
 import { useRef, useEffect } from "react";
 import axios from "axios";
-import { getFreshToken, isTokenExpired } from "@topcoder-platform/tc-auth-lib";
-import Cookies from "js-cookie";
+import { getFreshToken } from "@topcoder-platform/tc-auth-lib";
 
 import config from "../config";
 
@@ -24,23 +23,13 @@ export default () => {
     })
   );
   useEffect(() => {
-    const cookie = Cookies.get("v3jwt");
-    if (cookie) {
-      // Do nothing
-    } else {
-      console.log("Inside api, cookie not found. Forcing login");
-      forceLogin();
-      return;
-    }
     const currentAPI = api.current;
     currentAPI.interceptors.request.use(async (config) => {
       let token;
       if (process.env.REACT_APP_DEV_TOKEN) {
         token = process.env.REACT_APP_DEV_TOKEN;
       } else {
-        console.log("Inside api. Request intercepted. Attaching token");
         token = await getFreshToken();
-        console.log("Is token expired:", isTokenExpired(token));
       }
       config.headers.authorization = `Bearer ${token}`;
       return config;