github/zero-ui
1
0
Fork 0
mirror of https://github.com/dec0dOS/zero-ui.git synced 2025-07-06 21:11:41 -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

2
backend/app.js
View file

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

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

@ -21,6 +21,7 @@ import LogIn from "components/LogIn";
function Bar() { function Bar() {
const [loggedIn, setLoggedIn] = useLocalStorage("loggedIn", false); const [loggedIn, setLoggedIn] = useLocalStorage("loggedIn", false);
const [disabledAuth] = useLocalStorage("disableAuth", false);
const [anchorEl, setAnchorEl] = useState(null); const [anchorEl, setAnchorEl] = useState(null);
const history = useHistory(); const history = useHistory();
@ -46,7 +47,7 @@ function Bar() {
// name: "Settings", // name: "Settings",
// to: "/settings", // to: "/settings",
// }, // },
{ !disabledAuth && {
name: "Log out", name: "Log out",
divide: true, divide: true,
onClick: onLogOutClick, onClick: onLogOutClick,
@ -72,8 +73,9 @@ function Bar() {
</Link> </Link>
</Typography> </Typography>
</Box> </Box>
{/* The filter removes all elements that are "true" or "false" */}
{loggedIn && ( {loggedIn &&
menuItems.filter((e) => typeof e !== "boolean").length > 0 && (
<> <>
<Button color="inherit" onClick={openMenu}> <Button color="inherit" onClick={openMenu}>
<MenuIcon></MenuIcon> <MenuIcon></MenuIcon>

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

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

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

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