Merge pull request #2446 from bluewave-labs/fix/remove-team-and-user-id

ajhollid · web-flow · commit df69d06048dd · 2025-06-13T13:35:36.000+08:00
fix: remove team and user
diff --git a/client/src/Hooks/monitorHooks.js b/client/src/Hooks/monitorHooks.js
@@ -414,10 +414,10 @@ const useDeleteAllMonitors = () => {
 const UseDeleteMonitorStats = () => {
 	const { t } = useTranslation();
 	const [isLoading, setIsLoading] = useState(false);
-	const deleteMonitorStats = async ({ teamId }) => {
+	const deleteMonitorStats = async () => {
 		setIsLoading(true);
 		try {
-			const res = await networkService.deleteChecksByTeamId({ teamId });
+			await networkService.deleteChecksByTeamId();
 			createToast({ body: t("settingsStatsCleared") });
 		} catch (error) {
 			createToast({ body: t("settingsFailedToClearStats") });
diff --git a/client/src/Hooks/useNotifications.js b/client/src/Hooks/useNotifications.js
@@ -2,7 +2,6 @@ import { useState, useEffect, useCallback } from "react";
 import { createToast } from "../Utils/toastUtils";
 import { networkService } from "../main";
 import { useNavigate } from "react-router-dom";
-import { useSelector } from "react-redux";
 import { useTranslation } from "react-i18next";
 import { NOTIFICATION_TYPES } from "../Pages/Notifications/utils";
 
diff --git a/client/src/Pages/Incidents/index.jsx b/client/src/Pages/Incidents/index.jsx
@@ -29,7 +29,7 @@ const Incidents = () => {
 
 	//Utils
 	const theme = useTheme();
-	const [monitors, , isLoading, networkError] = useFetchMonitorsByTeamId();
+	const [monitors, , isLoading, networkError] = useFetchMonitorsByTeamId({});
 
 	useEffect(() => {
 		const monitorLookup = monitors?.reduce((acc, monitor) => {
diff --git a/client/src/Pages/Infrastructure/Create/index.jsx b/client/src/Pages/Infrastructure/Create/index.jsx
@@ -186,8 +186,6 @@ const CreateInfrastructureMonitor = () => {
 			...(isCreate ? {} : { _id: monitorId }),
 			...rest,
 			description: form.name,
-			teamId: user.teamId,
-			userId: user._id,
 			type: "hardware",
 			notifications: infrastructureMonitor.notifications,
 			thresholds,
diff --git a/client/src/Pages/Notifications/create/index.jsx b/client/src/Pages/Notifications/create/index.jsx
@@ -48,8 +48,6 @@ const CreateNotifications = () => {
 
 	// local state
 	const [notification, setNotification] = useState({
-		userId: user._id,
-		teamId: user.teamId,
 		notificationName: "",
 		address: "",
 		type: NOTIFICATION_TYPES[0]._id,
diff --git a/client/src/Pages/PageSpeed/Create/index.jsx b/client/src/Pages/PageSpeed/Create/index.jsx
@@ -86,8 +86,6 @@ const CreatePageSpeed = () => {
 		form = {
 			...form,
 			description: form.name,
-			teamId: user.teamId,
-			userId: user._id,
 			notifications: monitor.notifications,
 		};
 
diff --git a/client/src/Pages/Settings/index.jsx b/client/src/Pages/Settings/index.jsx
@@ -96,7 +96,7 @@ const Settings = () => {
 		}
 
 		if (name === "deleteStats") {
-			await deleteMonitorStats({ teamId: user.teamId });
+			await deleteMonitorStats();
 			return;
 		}
 
diff --git a/client/src/Pages/StatusPage/Create/Hooks/useCreateStatusPage.jsx b/client/src/Pages/StatusPage/Create/Hooks/useCreateStatusPage.jsx
@@ -1,17 +1,14 @@
 import { useState } from "react";
 import { networkService } from "../../../../main";
-import { useSelector } from "react-redux";
 import { createToast } from "../../../../Utils/toastUtils";
 
 const useCreateStatusPage = (isCreate, url) => {
-	const { user } = useSelector((state) => state.auth);
-
 	const [isLoading, setIsLoading] = useState(false);
 	const [networkError, setNetworkError] = useState(false);
 	const createStatusPage = async ({ form }) => {
 		setIsLoading(true);
 		try {
-			await networkService.createStatusPage({ user, form, isCreate, url });
+			await networkService.createStatusPage({ form, isCreate, url });
 			return true;
 		} catch (error) {
 			setNetworkError(true);
diff --git a/client/src/Pages/StatusPage/StatusPages/Hooks/useStatusPagesFetch.jsx b/client/src/Pages/StatusPage/StatusPages/Hooks/useStatusPagesFetch.jsx
@@ -13,9 +13,7 @@ const useStatusPagesFetch = () => {
 	useEffect(() => {
 		const fetchStatusPages = async () => {
 			try {
-				const res = await networkService.getStatusPagesByTeamId({
-					teamId: user.teamId,
-				});
+				const res = await networkService.getStatusPagesByTeamId();
 				setStatusPages(res?.data?.data);
 			} catch (error) {
 				setNetworkError(true);
diff --git a/client/src/Pages/Uptime/Create/index.jsx b/client/src/Pages/Uptime/Create/index.jsx
@@ -18,17 +18,13 @@ import Checkbox from "../../../Components/Inputs/Checkbox";
 // Utils
 import { useTheme } from "@emotion/react";
 import { useState } from "react";
-import { useSelector } from "react-redux";
 import { useTranslation } from "react-i18next";
 import { monitorValidation } from "../../../Validation/validation";
 import { createToast } from "../../../Utils/toastUtils";
 import { useGetNotificationsByTeamId } from "../../../Hooks/useNotifications";
 import { useCreateMonitor } from "../../../Hooks/monitorHooks";
 
 const CreateMonitor = () => {
-	// Redux state
-	const { user } = useSelector((state) => state.auth);
-
 	// Local state
 	const [errors, setErrors] = useState({});
 	const [https, setHttps] = useState(true);
@@ -143,8 +139,6 @@ const CreateMonitor = () => {
 		form = {
 			...form,
 			description: monitor.name || monitor.url,
-			teamId: user.teamId,
-			userId: user._id,
 			notifications: monitor.notifications,
 		};
 
diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
@@ -838,20 +838,17 @@ class NetworkService {
 	}
 
 	async getStatusPagesByTeamId(config) {
-		const { teamId } = config;
-		return this.axiosInstance.get(`/status-page/team/${teamId}`, {
+		return this.axiosInstance.get(`/status-page/team`, {
 			headers: {
 				"Content-Type": "application/json",
 			},
 		});
 	}
 
 	async createStatusPage(config) {
-		const { user, form, isCreate } = config;
+		const { form, isCreate } = config;
 
 		const fd = new FormData();
-		fd.append("teamId", user.teamId);
-		fd.append("userId", user._id);
 		fd.append("type", form.type);
 		form.isPublished !== undefined && fd.append("isPublished", form.isPublished);
 		form.companyName && fd.append("companyName", form.companyName);
diff --git a/server/controllers/monitorController.js b/server/controllers/monitorController.js
@@ -238,7 +238,12 @@ class MonitorController {
 		}
 
 		try {
-			const monitor = await this.db.createMonitor(req.body);
+			const { _id, teamId } = req.user;
+			const monitor = await this.db.createMonitor({
+				body: req.body,
+				teamId,
+				userId: _id,
+			});
 
 			// Add monitor to job queue
 			this.jobQueue.addJob(monitor._id, monitor);
diff --git a/server/controllers/statusPageController.js b/server/controllers/statusPageController.js
@@ -24,7 +24,13 @@ class StatusPageController {
 		}
 
 		try {
-			const statusPage = await this.db.createStatusPage(req.body, req.file);
+			const { _id, teamId } = req.user;
+			const statusPage = await this.db.createStatusPage({
+				statusPageData: req.body,
+				image: req.file,
+				userId: _id,
+				teamId,
+			});
 			return res.success({
 				msg: this.stringService.statusPageCreate,
 				data: statusPage,
@@ -93,7 +99,7 @@ class StatusPageController {
 
 	getStatusPagesByTeamId = async (req, res, next) => {
 		try {
-			const teamId = req.params.teamId;
+			const teamId = req.user.teamId;
 			const statusPages = await this.db.getStatusPagesByTeamId(teamId);
 
 			return res.success({
diff --git a/server/db/mongo/modules/monitorModule.js b/server/db/mongo/modules/monitorModule.js
@@ -665,9 +665,9 @@ const getMonitorsWithChecksByTeamId = async ({
  * @returns {Promise<Monitor>}
  * @throws {Error}
  */
-const createMonitor = async (body) => {
+const createMonitor = async ({ body, teamId, userId }) => {
 	try {
-		const monitor = new Monitor({ ...body });
+		const monitor = new Monitor({ ...body, teamId, userId });
 		const saved = await monitor.save();
 		return saved;
 	} catch (error) {
diff --git a/server/db/mongo/modules/statusPageModule.js b/server/db/mongo/modules/statusPageModule.js
@@ -1,16 +1,19 @@
 import StatusPage from "../../models/StatusPage.js";
-import Monitor from "../../models/Monitor.js";
 import { NormalizeData } from "../../../utils/dataUtils.js";
 import ServiceRegistry from "../../../service/serviceRegistry.js";
 import StringService from "../../../service/stringService.js";
 
 const SERVICE_NAME = "statusPageModule";
 
-const createStatusPage = async (statusPageData, image) => {
+const createStatusPage = async ({ statusPageData, image, userId, teamId }) => {
 	const stringService = ServiceRegistry.get(StringService.SERVICE_NAME);
 
 	try {
-		const statusPage = new StatusPage({ ...statusPageData });
+		const statusPage = new StatusPage({
+			...statusPageData,
+			userId,
+			teamId,
+		});
 		if (image) {
 			statusPage.logo = {
 				data: image.buffer,
diff --git a/server/routes/statusPageRoute.js b/server/routes/statusPageRoute.js
@@ -12,11 +12,7 @@ class StatusPageRoutes {
 
 	initRoutes() {
 		this.router.get("/", this.statusPageController.getStatusPage);
-		this.router.get(
-			"/team/:teamId",
-			verifyJWT,
-			this.statusPageController.getStatusPagesByTeamId
-		);
+		this.router.get("/team", verifyJWT, this.statusPageController.getStatusPagesByTeamId);
 		this.router.get("/:url", this.statusPageController.getStatusPageByUrl);
 
 		this.router.post(
diff --git a/server/validation/joi.js b/server/validation/joi.js
@@ -165,8 +165,6 @@ const getCertificateParamValidation = joi.object({
 
 const createMonitorBodyValidation = joi.object({
 	_id: joi.string(),
-	userId: joi.string().required(),
-	teamId: joi.string().required(),
 	name: joi.string().required(),
 	description: joi.string().required(),
 	type: joi.string().required(),
@@ -424,8 +422,6 @@ const getStatusPageQueryValidation = joi.object({
 });
 
 const createStatusPageBodyValidation = joi.object({
-	userId: joi.string().required(),
-	teamId: joi.string().required(),
 	type: joi.string().valid("uptime").required(),
 	companyName: joi.string().required(),
 	url: joi

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ const Settings = () => {`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`if (name === "deleteStats") {`
`99`		`- await deleteMonitorStats({ teamId: user.teamId });`
	`99`	`+ await deleteMonitorStats();`
`100`	`100`	`return;`
`101`	`101`	`}`
`102`	`102`