Handle undefined api response cases

supertokens · Nov 10, 2023 · 8196a87 · 8196a87
1 parent 3e84cb9
commit 8196a87
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 60 deletions.
diff --git a/build/static/js/bundle.js b/build/static/js/bundle.js
diff --git a/build/static/js/bundle.js.map b/build/static/js/bundle.js.map
diff --git a/src/api/userroles/role/index.ts b/src/api/userroles/role/index.ts
@@ -41,7 +41,7 @@ type GetRolesResponse =
 export const useRolesService = () => {
 	const fetchData = useFetchData();
 
-	const getRoles = async (query?: GetRolesQuery): Promise<GetRolesResponse> => {
+	const getRoles = async (query?: GetRolesQuery): Promise<GetRolesResponse | undefined> => {
 		const response = await fetchData({
 			url: getApiUrl("/api/userroles/roles"),
 			method: "GET",
@@ -53,18 +53,13 @@ export const useRolesService = () => {
 			return body;
 		}
 
-		return {
-			status: "OK",
-			roles: [],
-			rolesCount: 0,
-			totalPages: 0,
-		};
+		return undefined;
 	};
 
 	const createRole = async (
 		role: string,
 		permissions: string[]
-	): Promise<{ status: "OK"; createdNewRole: boolean } | { status: "FEATURE_NOT_ENABLED_ERROR" }> => {
+	): Promise<{ status: "OK"; createdNewRole: boolean } | { status: "FEATURE_NOT_ENABLED_ERROR" } | undefined> => {
 		const response = await fetchData({
 			url: getApiUrl("/api/userroles/role"),
 			method: "PUT",
@@ -81,10 +76,7 @@ export const useRolesService = () => {
 			return body;
 		}
 
-		return {
-			status: "OK",
-			createdNewRole: false,
-		};
+		return undefined;
 	};
 
 	const deleteRole = async (role: string): Promise<void> => {

diff --git a/src/api/userroles/role/permissions.ts b/src/api/userroles/role/permissions.ts
@@ -24,6 +24,7 @@ export const usePermissionsService = () => {
 				permissions: string[];
 		  }
 		| { status: "FEATURE_NOT_ENABLED_ERROR" }
+		| undefined
 	> => {
 		const response = await fetchData({
 			url: getApiUrl("/api/userroles/role/permissions"),
@@ -44,7 +45,7 @@ export const usePermissionsService = () => {
 	const addPermissionsToRole = async (
 		role: string,
 		permissions: string[]
-	): Promise<{ status: "OK"; createdNewRole: boolean } | { status: "FEATURE_NOT_ENABLED_ERROR" }> => {
+	): Promise<{ status: "OK"; createdNewRole: boolean } | { status: "FEATURE_NOT_ENABLED_ERROR" } | undefined> => {
 		const response = await fetchData({
 			url: getApiUrl("/api/userroles/role"),
 			method: "PUT",
@@ -70,9 +71,12 @@ export const usePermissionsService = () => {
 	const removePermissionsFromRole = async (
 		role: string,
 		permissions: string[]
-	): Promise<{
-		status: "OK" | "UNKNOWN_ROLE_ERROR" | "FEATURE_NOT_ENABLED_ERROR";
-	}> => {
+	): Promise<
+		| {
+				status: "OK" | "UNKNOWN_ROLE_ERROR" | "FEATURE_NOT_ENABLED_ERROR";
+		  }
+		| undefined
+	> => {
 		const response = await fetchData({
 			url: getApiUrl("/api/userroles/role/permissions/remove"),
 			method: "PUT",

diff --git a/src/api/userroles/user/roles.ts b/src/api/userroles/user/roles.ts
@@ -21,9 +21,12 @@ export const useUserRolesService = () => {
 	const addRoleToUser = async (
 		userId: string,
 		role: string
-	): Promise<{
-		status: "OK" | "UNKNOWN_ROLE_ERROR";
-	}> => {
+	): Promise<
+		| {
+				status: "OK" | "UNKNOWN_ROLE_ERROR";
+		  }
+		| undefined
+	> => {
 		const response = await fetchData({
 			url: getApiUrl("/api/userroles/user/roles"),
 			method: "PUT",
@@ -55,6 +58,7 @@ export const useUserRolesService = () => {
 		| {
 				status: "FEATURE_NOT_ENABLED_ERROR";
 		  }
+		| undefined
 	> => {
 		const response = await fetchData({
 			url: getApiUrl("/api/userroles/user/roles"),
@@ -85,6 +89,7 @@ export const useUserRolesService = () => {
 		| {
 				status: "UNKNOWN_ROLE_ERROR";
 		  }
+		| undefined
 	> => {
 		const response = await fetchData({
 			url: getApiUrl("/api/userroles/user/roles"),

diff --git a/src/ui/components/userDetail/userDetail.tsx b/src/ui/components/userDetail/userDetail.tsx
@@ -63,15 +63,13 @@ export const UserDetail: React.FC<UserDetailProps> = (props) => {
 	const { getUserMetaData } = useMetadataService();
 	const { getSessionsForUser } = useSessionsForUserService();
 	const { getRolesForUser } = useUserRolesService();
-	const { showModal } = useContext(PopupContentContext);
+	const { showModal, showToast } = useContext(PopupContentContext);
 
 	const loadUserDetail = useCallback(async () => {
 		const userDetailsResponse = await getUser(user);
 		setUserDetail(JSON.parse(JSON.stringify(userDetailsResponse)));
 	}, []);
 
-	const { showToast } = useContext(PopupContentContext);
-
 	const updateUser = useCallback(
 		async (
 			userId: string,
@@ -158,12 +156,20 @@ export const UserDetail: React.FC<UserDetailProps> = (props) => {
 
 	async function fetchUserRoles() {
 		const response = await getRolesForUser(user);
-		if (response.status === "OK") {
-			setUserRoles(response.roles);
-		}
+		if (response !== undefined) {
+			if (response.status === "OK") {
+				setUserRoles(response.roles);
+			}
 
-		if (response.status === "FEATURE_NOT_ENABLED_ERROR") {
-			setIsUserRolesFeatureEnabled(false);
+			if (response.status === "FEATURE_NOT_ENABLED_ERROR") {
+				setIsUserRolesFeatureEnabled(false);
+			}
+		} else {
+			showToast({
+				iconImage: getImageUrl("form-field-error-icon.svg"),
+				toastType: "error",
+				children: <>Something went wrong Please try again!</>,
+			});
 		}
 	}
 

diff --git a/src/ui/components/userroles/components/RolesTable.tsx b/src/ui/components/userroles/components/RolesTable.tsx
@@ -60,18 +60,26 @@ export function RolesTable({ setIsFeatureEnabled }: { setIsFeatureEnabled: (valu
 		try {
 			const response = await getRoles({ limit: PAGINATION_LIMIT.toString(), page: page.toString() });
 
-			if (response.status === "OK" && response.totalPages !== undefined) {
-				if (response.roles.length < 1 && page !== 1) {
-					setPage(page - 1);
-					return;
+			if (response !== undefined) {
+				if (response.status === "OK" && response.totalPages !== undefined) {
+					if (response.roles.length < 1 && page !== 1) {
+						setPage(page - 1);
+						return;
+					}
+					setRoles(response.roles);
+					setTotalPages(response.totalPages);
+					setRolesCount(response.rolesCount);
 				}
-				setRoles(response.roles);
-				setTotalPages(response.totalPages);
-				setRolesCount(response.rolesCount);
-			}
 
-			if (response.status === "FEATURE_NOT_ENABLED_ERROR") {
-				setIsFeatureEnabled(false);
+				if (response.status === "FEATURE_NOT_ENABLED_ERROR") {
+					setIsFeatureEnabled(false);
+				}
+			} else {
+				showToast({
+					iconImage: getImageUrl("form-field-error-icon.svg"),
+					toastType: "error",
+					children: <>Something went wrong Please try again!</>,
+				});
 			}
 		} catch (_) {
 			showToast({

diff --git a/src/ui/components/userroles/components/dialogs/AssignRoles.tsx b/src/ui/components/userroles/components/dialogs/AssignRoles.tsx
@@ -73,11 +73,19 @@ export default function AssignRolesDialog({
 	const fetchRoles = async () => {
 		setIsLoading(true);
 		const response = await getRoles();
-		if (response.status === "OK" && response.totalPages === undefined) {
-			setRoles(response.roles);
-			const normalizedRoles = response.roles.filter((r) => assignedRoles.includes(r) === false);
-			setNormalizedRoles(normalizedRoles);
-			setFilteredRoles(normalizedRoles);
+		if (response !== undefined) {
+			if (response.status === "OK" && response.totalPages === undefined) {
+				setRoles(response.roles);
+				const normalizedRoles = response.roles.filter((r) => assignedRoles.includes(r) === false);
+				setNormalizedRoles(normalizedRoles);
+				setFilteredRoles(normalizedRoles);
+			}
+		} else {
+			showToast({
+				iconImage: getImageUrl("form-field-error-icon.svg"),
+				toastType: "error",
+				children: <>Something went wrong Please try again!</>,
+			});
 		}
 		setIsLoading(false);
 	};

diff --git a/src/ui/components/userroles/components/dialogs/CreateNewRole.tsx b/src/ui/components/userroles/components/dialogs/CreateNewRole.tsx
@@ -51,30 +51,38 @@ export default function CreateNewRoleDialog({
 			setIsLoading(true);
 			const response = await createRole(role, permissions);
 
-			if (response.status === "FEATURE_NOT_ENABLED_ERROR") {
-				showToast({
-					iconImage: getImageUrl("form-field-error-icon.svg"),
-					toastType: "error",
-					children: "This Feature is not enabled.",
-				});
-				closeDialog();
-				return;
-			}
-
-			if (response.status === "OK") {
-				if (response.createdNewRole === false) {
+			if (response !== undefined) {
+				if (response.status === "FEATURE_NOT_ENABLED_ERROR") {
 					showToast({
 						iconImage: getImageUrl("form-field-error-icon.svg"),
 						toastType: "error",
-						children: "Role already exists!",
+						children: "This Feature is not enabled.",
 					});
+					closeDialog();
 					return;
 				}
 
+				if (response.status === "OK") {
+					if (response.createdNewRole === false) {
+						showToast({
+							iconImage: getImageUrl("form-field-error-icon.svg"),
+							toastType: "error",
+							children: "Role already exists!",
+						});
+						return;
+					}
+
+					showToast({
+						iconImage: getImageUrl("checkmark-green.svg"),
+						toastType: "success",
+						children: "Role create successfully!",
+					});
+				}
+			} else {
 				showToast({
-					iconImage: getImageUrl("checkmark-green.svg"),
-					toastType: "success",
-					children: "Role create successfully!",
+					iconImage: getImageUrl("form-field-error-icon.svg"),
+					toastType: "error",
+					children: <>Something went wrong Please try again!</>,
 				});
 			}
 			refetchRoles();