wip

Author: apdavison

apps/model_catalog/src/AuthWidget.jsx

@@ -7,34 +7,17 @@ import PersonIcon from '@material-ui/icons/Person';
 import Tooltip from "@material-ui/core/Tooltip";
 import ContextMain from "./ContextMain";
 
-import { corsProxy } from "./globals";
-
-
-async function getUserInfo(auth) {
-    const config = {
-        headers: {
-            'Authorization': 'Bearer ' + auth.token,
-        }
-    }
-    return axios.get(corsProxy + "https://idm.ebrains.eu/users/userinfo", config);
-}
-
 
 function AuthWidget(props) {
 
     const context = React.useContext(ContextMain);
     const [auth] = context.auth;
 
-    if (auth.authenticated || props.currentUser) {
-        if (!props.currentUser) {
-            getUserInfo(auth).then((userInfo) => {
-                console.log(userInfo);
-                props.setCurrentUser(userInfo.preferred_username);
-            });
-        };
+    React.useEffect(() => {}, [props, auth]);
 
+    if (props.currentUser) {
         return (
-            <Tooltip title={props.currentUser || "anonymous"}>
+            <Tooltip title={props.currentUser}>
                 <IconButton variant="outlined">
                     <PersonIcon />
                 </IconButton>

apps/model_catalog/src/ValidationFramework.jsx

@@ -42,7 +42,8 @@ import {
     displayValid,
     queryValid,
     updateHash,
-    baseUrl
+    baseUrl,
+    corsProxy
 } from "./globals";
 import { isUUID, showNotification } from "./utils";
 import ContextMain from "./ContextMain";
@@ -51,6 +52,17 @@ import { withSnackbar } from "notistack";
 import WarningBox from "./WarningBox";
 import AuthWidget from "./AuthWidget";
 
+
+async function getUserInfo(auth) {
+    const config = {
+        headers: {
+            'Authorization': 'Bearer ' + auth.token,
+        }
+    }
+    return axios.get(corsProxy + "https://idm.ebrains.eu/users/userinfo", config);
+}
+
+
 // if working on the appearance/layout set globals.DevMode=true
 // to avoid loading the models and tests over the network every time;
 // instead we use the local sample_data_models and sample_data_tests files
@@ -409,6 +421,11 @@ class ValidationFramework extends React.Component {
             setStatus(response.data.status)
         });
 
+        getUserInfo(this.props.auth).then((userInfo) => {
+            console.log(userInfo);
+            this.setState({currentUser: userInfo.preferred_username})
+        });
+
         datastore
             .getValidFilterValues()
             .then((vocab) => {
@@ -1223,7 +1240,6 @@ class ValidationFramework extends React.Component {
                                 </Tooltip>
                                 <AuthWidget
                                     currentUser={this.state.currentUser}
-                                    setCurrentUser={(user) => this.setState({currentUser: user})}
                                 />
                             </div>
                         </div>