From b499b2879cbd4e024c3555eb4712b0a09f986942 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 13 Jun 2025 13:29:03 +0800
Subject: [PATCH] remove teamId from status pages

---
 client/src/Pages/Incidents/index.jsx                        | 2 +-
 .../StatusPage/StatusPages/Hooks/useStatusPagesFetch.jsx    | 4 +---
 client/src/Utils/NetworkService.js                          | 3 +--
 server/controllers/statusPageController.js                  | 2 +-
 server/routes/statusPageRoute.js                            | 6 +-----
 server/validation/joi.js                                    | 2 --
 6 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/client/src/Pages/Incidents/index.jsx b/client/src/Pages/Incidents/index.jsx
index 80a7db702..011961503 100644
--- 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/StatusPage/StatusPages/Hooks/useStatusPagesFetch.jsx b/client/src/Pages/StatusPage/StatusPages/Hooks/useStatusPagesFetch.jsx
index db7a33396..b236368c8 100644
--- 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/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index 03225c440..ecde44a9e 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -838,8 +838,7 @@ 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",
 			},
diff --git a/server/controllers/statusPageController.js b/server/controllers/statusPageController.js
index 842eb657a..577cf4997 100755
--- a/server/controllers/statusPageController.js
+++ b/server/controllers/statusPageController.js
@@ -99,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/routes/statusPageRoute.js b/server/routes/statusPageRoute.js
index 4e6a4d248..98b3a3433 100755
--- 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
index e43f6233f..60f462280 100755
--- 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(),