github/zero-ui
1
0
Fork 0
mirror of https://github.com/dec0dOS/zero-ui.git synced 2025-07-05 20:41:43 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: disable authentication properly

Browse source
This commit is contained in:
Sambhav Saggi 2022-05-31 18:29:50 -04:00
parent 5096a99f75
commit 75933d7e59
No known key found for this signature in database
GPG key ID: 8F731DA8AFBAE35D
4 changed files with 74 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

12
backend/app.js
View file

@ -18,11 +18,13 @@ const app = express();
app.use(logger("dev"));
app.use(express.json());
app.use(express.urlencoded({ extended: false }));
app.use(
bearerToken({
headerKey: "Bearer",
})
);
if (process.env.ZU_DISABLE_AUTH === "true") {
app.use(
bearerToken({
headerKey: "Bearer",
})
);
}
if (
process.env.NODE_ENV === "production" &&

116
frontend/src/components/Bar/Bar.jsx
View file

@ -21,6 +21,7 @@ import LogIn from "components/LogIn";
function Bar() {
const [loggedIn, setLoggedIn] = useLocalStorage("loggedIn", false);
const [disabledAuth] = useLocalStorage("disableAuth", false);
const [anchorEl, setAnchorEl] = useState(null);
const history = useHistory();
@ -46,7 +47,7 @@ function Bar() {
// name: "Settings",
// to: "/settings",
// },
{
!disabledAuth && {
name: "Log out",
divide: true,
onClick: onLogOutClick,
@ -72,69 +73,70 @@ function Bar() {
</Link>
</Typography>
</Box>
{/* The filter removes all elements that are "true" or "false" */}
{loggedIn &&
menuItems.filter((e) => typeof e !== "boolean").length > 0 && (
<>
<Button color="inherit" onClick={openMenu}>
<MenuIcon></MenuIcon>
</Button>
{loggedIn && (
<>
<Button color="inherit" onClick={openMenu}>
<MenuIcon></MenuIcon>
</Button>
<Menu
anchorEl={anchorEl}
open={Boolean(anchorEl)}
onClose={closeMenu}
>
{menuItems.map((menuItem, index) => {
if (
menuItem.hasOwnProperty("condition") &&
!menuItem.condition
) {
return null;
}
<Menu
anchorEl={anchorEl}
open={Boolean(anchorEl)}
onClose={closeMenu}
>
{menuItems.map((menuItem, index) => {
if (
menuItem.hasOwnProperty("condition") &&
!menuItem.condition
) {
return null;
}
let component = null;
let component = null;
if (menuItem.to) {
component = (
<MenuItem
key={index}
component={RouterLink}
to={menuItem.to}
onClick={closeMenu}
>
{menuItem.name}
</MenuItem>
);
} else {
component = (
<MenuItem
key={index}
onClick={() => {
closeMenu();
if (menuItem.to) {
component = (
<MenuItem
key={index}
component={RouterLink}
to={menuItem.to}
onClick={closeMenu}
>
{menuItem.name}
</MenuItem>
);
} else {
component = (
<MenuItem
key={index}
onClick={() => {
closeMenu();
menuItem.onClick();
}}
>
{menuItem.name}
</MenuItem>
);
}
menuItem.onClick();
}}
>
{menuItem.name}
</MenuItem>
);
}
if (menuItem.divide) {
return (
<span key={index}>
<Divider />
if (menuItem.divide) {
return (
<span key={index}>
<Divider />
{component}
</span>
);
}
{component}
</span>
);
}
return component;
})}
</Menu>
</>
)}
return component;
})}
</Menu>
</>
)}
{!loggedIn && LogIn()}
</Toolbar>
</AppBar>

2
frontend/src/components/HomeLoggedOut/HomeLoggedOut.jsx
View file

@ -6,10 +6,12 @@ import { useHistory } from "react-router-dom";
function HomeLoggedOut() {
const [, setLoggedIn] = useLocalStorage("loggedIn", false);
const [, setToken] = useLocalStorage("token", null);
const [, setDisableAuth] = useLocalStorage("disableAuth", false);
const history = useHistory();
axios.get("/auth/login").then(function (response) {
if (!response.data.enabled) {
setLoggedIn(true);
setDisableAuth(true);
setToken("");
history.go(0);
}

9
frontend/src/utils/API.js
View file

@ -5,7 +5,10 @@ const baseURL = "/api/";
export default axios.create({
baseURL: baseURL,
responseType: "json",
headers: {
Authorization: `Bearer ${JSON.parse(localStorage.getItem("token"))}`,
},
headers:
localStorage.getItem("disableAuth") === "true"
? {}
: {
Authorization: `Bearer ${JSON.parse(localStorage.getItem("token"))}`,
},
});