Merge branch 'develop' of github.com:topcoder-platform/u-bahn-app into develop

Author: callmekatootie

client/package-lock.json

@@ -12,6 +12,7 @@
     "form-data": "^3.0.0",
     "history": "^4.10.1",
     "husky": "^4.2.5",
+    "js-cookies": "^1.0.4",
     "lint-staged": "^10.2.6",
     "lodash": "^4.17.15",
     "node-sass": "^4.14.1",

client/package.json

@@ -17,9 +17,11 @@ import { useAuth0 } from "../../react-auth0-spa";
 import * as OrgService from "../../services/user-org";
 import api from "../../services/api";
 
+import Cookies from "js-cookie";
+
 export default function SearchPage() {
   const apiClient = api();
-  const { isLoading, isAuthenticated, user: auth0User } = useAuth0();
+  const { isLoading, isAuthenticated, user: auth0User, loginWithRedirect } = useAuth0();
   const [tab, setTab] = React.useState(TABS.SEARCH);
   const [keyword, setKeyword] = React.useState(null);
   const [selectedOrg, setSelectedOrg] = React.useState(null);
@@ -62,9 +64,16 @@ export default function SearchPage() {
   }, [keyword]);
 
   const onSelectOrg = (org) => {
-    OrgService.setSingleOrg(org);
-    setSelectedOrg(org);
-    setShouldSelectOrg(false);
+    const cookie = Cookies.get('auth0.is.authenticated');
+    if (cookie && cookie === 'true') {
+      OrgService.setSingleOrg(org);
+      setSelectedOrg(org);
+      setShouldSelectOrg(false);
+    } else {
+      loginWithRedirect({
+        redirect_uri: window.location.origin,
+      });
+    }
   };
 
   let mainContent;

client/src/pages/Search/index.jsx

@@ -7,6 +7,8 @@ import axios from "axios";
 
 import { useAuth0 } from "../react-auth0-spa";
 
+import Cookies from "js-cookie";
+
 export default () => {
   const { getTokenSilently, loginWithRedirect } = useAuth0();
   const api = useRef(
@@ -17,6 +19,15 @@ export default () => {
     })
   );
   useEffect(() => {
+    const cookie = Cookies.get('auth0.is.authenticated');
+    if (cookie && cookie === 'true') {
+      // Do nothing
+    } else {
+      loginWithRedirect({
+        redirect_uri: window.location.origin,
+      });
+      return;
+    }
     const currentAPI = api.current;
     currentAPI.interceptors.request.use(async (config) => {
       let token;