Merge branch 'develop' into feat/logger

This commit is contained in:
Alexander Holliday authored and GitHub committed 2024-08-19 19:02:30 -07:00
commit 3a01e3096e
20 files changed
+568 -267

No files matched your search

+3 -3
View File
@@ -7,7 +7,7 @@ import { login } from "../../Features/Auth/authSlice";
import { useDispatch, useSelector } from "react-redux";
import { createToast } from "../../Utils/toastUtils";
import Button from "../../Components/Button";
import axiosInstance from "../../Utils/axiosConfig";
import { networkService } from "../../main";
import Field from "../../Components/Inputs/Field";
import background from "../../assets/Images/background_pattern_decorative.png";
import Logo from "../../assets/icons/bwu-icon.svg?react";
@@ -276,8 +276,8 @@ const Login = () => {
navigate("/monitors");
return;
}
axiosInstance
.get("/auth/users/admin")
networkService
.doesAdminExist()
.then((response) => {
if (response.data.data === false) {
navigate("/register");
+2 -4
View File
@@ -15,7 +15,7 @@ import ArrowBackRoundedIcon from "@mui/icons-material/ArrowBackRounded";
import Check from "../../../Components/Check/Check";
import Button from "../../../Components/Button";
import Field from "../../../Components/Inputs/Field";
import axiosInstance from "../../../Utils/axiosConfig";
import { networkService } from "../../../main";
import "../index.css";
import { logger } from "../../../Utils/Logger";
@@ -398,9 +398,7 @@ const Register = ({ isAdmin }) => {
const fetchInvite = async () => {
if (token !== undefined) {
try {
const res = await axiosInstance.post(`/auth/invite/verify`, {
token,
});
const res = await networkService.verifyInvitationToken(token);
const { role, email } = res.data.data;
setForm({ ...form, email, role });
} catch (error) {