Merge pull request #1291 from MR-MKZ/nonsudo

Feature -> Revoke access of non sudo admin from panel settings
Gozargah · Sep 2, 2024 · b2fa01e · b2fa01e
2 parents 83476f3 + 4d9106c
commit b2fa01e
Show file tree

Hide file tree

Showing 9 changed files with 218 additions and 156 deletions.
diff --git a/app/dashboard/build/404.html b/app/dashboard/build/404.html
@@ -33,9 +33,9 @@
     <meta name="msapplication-TileColor" content="#2b5797" />
     <meta name="msapplication-config" content="/favicon/browserconfig.xml" />
     <meta name="theme-color" content="#3B81F6" />
-    <script type="module" crossorigin src="/dashboard/assets/index.b21d6a54.js"></script>
-    <link rel="modulepreload" crossorigin href="/dashboard/assets/vendor.8aa8dc93.js">
-    <link rel="stylesheet" href="/dashboard/assets/index.59de2328.css">
+    <script type="module" crossorigin src="/dashboard/assets/index.aa165fd5.js"></script>
+    <link rel="modulepreload" crossorigin href="/dashboard/assets/vendor.23e3f149.js">
+    <link rel="stylesheet" href="/dashboard/assets/index.876adee7.css">
   </head>
   <body>
     <div id="root"></div>

diff --git a/...dashboard/build/assets/index.59de2328.css → ...dashboard/build/assets/index.876adee7.css b/...dashboard/build/assets/index.59de2328.css → ...dashboard/build/assets/index.876adee7.css
diff --git a/app/dashboard/build/assets/index.aa165fd5.js b/app/dashboard/build/assets/index.aa165fd5.js
diff --git a/app/dashboard/build/assets/index.b21d6a54.js b/app/dashboard/build/assets/index.b21d6a54.js
diff --git a/...dashboard/build/assets/vendor.8aa8dc93.js → ...dashboard/build/assets/vendor.23e3f149.js b/...dashboard/build/assets/vendor.8aa8dc93.js → ...dashboard/build/assets/vendor.23e3f149.js
diff --git a/app/dashboard/build/index.html b/app/dashboard/build/index.html
@@ -33,9 +33,9 @@
     <meta name="msapplication-TileColor" content="#2b5797" />
     <meta name="msapplication-config" content="/favicon/browserconfig.xml" />
     <meta name="theme-color" content="#3B81F6" />
-    <script type="module" crossorigin src="/dashboard/assets/index.b21d6a54.js"></script>
-    <link rel="modulepreload" crossorigin href="/dashboard/assets/vendor.8aa8dc93.js">
-    <link rel="stylesheet" href="/dashboard/assets/index.59de2328.css">
+    <script type="module" crossorigin src="/dashboard/assets/index.aa165fd5.js"></script>
+    <link rel="modulepreload" crossorigin href="/dashboard/assets/vendor.23e3f149.js">
+    <link rel="stylesheet" href="/dashboard/assets/index.876adee7.css">
   </head>
   <body>
     <div id="root"></div>

diff --git a/app/dashboard/src/components/Header.tsx b/app/dashboard/src/components/Header.tsx
@@ -32,6 +32,7 @@ import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
 import { updateThemeColor } from "utils/themeColor";
 import { Language } from "./Language";
+import useGetUser from "hooks/useGetUser";
 
 type HeaderProps = {
   actions?: ReactNode;
@@ -81,6 +82,15 @@ export const shouldShowDonation = (): boolean => {
 };
 
 export const Header: FC<HeaderProps> = ({ actions }) => {
+  const { userData, getUserIsSuccess, getUserIsPending } = useGetUser();
+
+  const isSudo = () => {
+    if (!getUserIsPending && getUserIsSuccess) {
+      return userData.is_sudo;
+    }
+    return false;
+  };
+
   const {
     onEditingHosts,
     onResetAllUsage,
@@ -131,38 +141,42 @@ export const Header: FC<HeaderProps> = ({ actions }) => {
               position="relative"
             ></MenuButton>
             <MenuList minW="170px" zIndex={99999} className="menuList">
-              <MenuItem
-                maxW="170px"
-                fontSize="sm"
-                icon={<HostsIcon />}
-                onClick={onEditingHosts.bind(null, true)}
-              >
-                {t("header.hostSettings")}
-              </MenuItem>
-              <MenuItem
-                maxW="170px"
-                fontSize="sm"
-                icon={<NodesIcon />}
-                onClick={onEditingNodes.bind(null, true)}
-              >
-                {t("header.nodeSettings")}
-              </MenuItem>
-              <MenuItem
-                maxW="170px"
-                fontSize="sm"
-                icon={<NodesUsageIcon />}
-                onClick={onShowingNodesUsage.bind(null, true)}
-              >
-                {t("header.nodesUsage")}
-              </MenuItem>
-              <MenuItem
-                maxW="170px"
-                fontSize="sm"
-                icon={<ResetUsageIcon />}
-                onClick={onResetAllUsage.bind(null, true)}
-              >
-                {t("resetAllUsage")}
-              </MenuItem>
+              {isSudo() && (
+                <>
+                  <MenuItem
+                    maxW="170px"
+                    fontSize="sm"
+                    icon={<HostsIcon />}
+                    onClick={onEditingHosts.bind(null, true)}
+                  >
+                    {t("header.hostSettings")}
+                  </MenuItem>
+                  <MenuItem
+                    maxW="170px"
+                    fontSize="sm"
+                    icon={<NodesIcon />}
+                    onClick={onEditingNodes.bind(null, true)}
+                  >
+                    {t("header.nodeSettings")}
+                  </MenuItem>
+                  <MenuItem
+                    maxW="170px"
+                    fontSize="sm"
+                    icon={<NodesUsageIcon />}
+                    onClick={onShowingNodesUsage.bind(null, true)}
+                  >
+                    {t("header.nodesUsage")}
+                  </MenuItem>
+                  <MenuItem
+                    maxW="170px"
+                    fontSize="sm"
+                    icon={<ResetUsageIcon />}
+                    onClick={onResetAllUsage.bind(null, true)}
+                  >
+                    {t("resetAllUsage")}
+                  </MenuItem>
+                </>
+              )}
               <Link to={DONATION_URL} target="_blank">
                 <MenuItem
                   maxW="170px"
@@ -185,16 +199,18 @@ export const Header: FC<HeaderProps> = ({ actions }) => {
             </MenuList>
           </Menu>
 
-          <IconButton
-            size="sm"
-            variant="outline"
-            aria-label="core settings"
-            onClick={() => {
-              useDashboard.setState({ isEditingCore: true });
-            }}
-          >
-            <CoreSettingsIcon />
-          </IconButton>
+          {isSudo() && (
+            <IconButton
+              size="sm"
+              variant="outline"
+              aria-label="core settings"
+              onClick={() => {
+                useDashboard.setState({ isEditingCore: true });
+              }}
+            >
+              <CoreSettingsIcon />
+            </IconButton>
+          )}
 
           <Language />
 

diff --git a/app/dashboard/src/hooks/useGetUser.tsx b/app/dashboard/src/hooks/useGetUser.tsx
@@ -0,0 +1,31 @@
+import { getAuthToken } from "utils/authStorage";
+import { fetch } from "service/http";
+import { UserApi, UseGetUserReturn } from "types/User";
+import { useQuery } from "react-query";
+
+const fetchUser = async () => {
+    return await fetch("/admin");
+}
+
+const useGetUser = (): UseGetUserReturn => {
+    const { data, isError, isLoading, isSuccess, error } = useQuery<UserApi, Error>({
+        queryFn: () => fetchUser()
+    })
+
+    const userDataEmpty: UserApi =  {
+        discord_webook: "",
+        is_sudo: false,
+        telegram_id: "",
+        username: ""
+      }
+
+    return {
+        userData: data || userDataEmpty,
+        getUserIsPending: isLoading,
+        getUserIsSuccess: isSuccess,
+        getUserIsError: isError,
+        getUserError: error
+    }
+};
+
+export default useGetUser;
diff --git a/app/dashboard/src/types/User.ts b/app/dashboard/src/types/User.ts
@@ -64,3 +64,18 @@ export type UserCreate = Pick<
   | "status"
   | "note"
 >;
+
+export type UserApi = {
+  discord_webook: string;
+  is_sudo: boolean;
+  telegram_id: number | string;
+  username: string;
+}
+
+export type UseGetUserReturn = {
+  userData: UserApi;
+  getUserIsPending: boolean;
+  getUserIsSuccess: boolean;
+  getUserIsError: boolean;
+  getUserError: Error | null;
+}