From a91f3c3da0cf245c873c1f9f1da5d506c39c4cf4 Mon Sep 17 00:00:00 2001
From: Larbi Gharib <larbi.gharib@savoirfairelinux.com>
Date: Thu, 15 Oct 2020 17:13:47 -0400
Subject: [PATCH] Public server config no username
Change-Id: Ic2c5e799bf606ad7a85c2add3ad40541857bec95
---
.../src/components/ServerParameters/ServerParameters.js | 1 +
jams-react-client/src/views/Users/Users.js | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/jams-react-client/src/components/ServerParameters/ServerParameters.js b/jams-react-client/src/components/ServerParameters/ServerParameters.js
index a18eb623..819e1cf3 100644
--- a/jams-react-client/src/components/ServerParameters/ServerParameters.js
+++ b/jams-react-client/src/components/ServerParameters/ServerParameters.js
@@ -107,6 +107,7 @@ export default function ServerParameters(props) {
auth.installed = true;
auth.authenticated = true;
auth.admin = true;
+ window.localStorage.setItem('scope', 'true');
auth.checkDirectoryType(() => {
history.push("/admin/users");
});
diff --git a/jams-react-client/src/views/Users/Users.js b/jams-react-client/src/views/Users/Users.js
index ee61dca6..c5a718d5 100644
--- a/jams-react-client/src/views/Users/Users.js
+++ b/jams-react-client/src/views/Users/Users.js
@@ -189,13 +189,13 @@ export default function Users(props) {
const handleChangePage = (e, page) => {
searchUsers(searchValue, page);
};
- if (!auth.hasAdminScope()) {
+ if (!auth.hasAdminScope() && auth.getUsername() != "") {
return (
<div>
<UserProfile username={auth.getUsername()} />
</div>
);
- } else if (selectedProfile && auth.hasAdminScope()) {
+ } else if (selectedProfile && auth.hasAdminScope() && selectedUsername != "") {
return (
<div>
<UserProfile username={selectedUsername} />
--
GitLab