[FEATURE] Allow folder uploads

.forgejo/workflows/deploy-edge-proxy.yml

@@ -1,31 +0,0 @@
-# name: Deploy Edge Proxy
-# run-name: ${{ gitea.actor }} Deploy Edge Proxy
-# on:
-#  push:
-#    branches: [ master ]
-
-# env:
-#   GARDEN_DEPLOY_ACTION: minecluster-proxy
-
-# jobs:
-#   deploy-edge:
-#     steps:
-#       # Setup Oasis
-#       - name: Oasis Setup
-#         uses: https://gitea.dunemask.dev/elysium/elysium-actions@oasis-setup-auto
-#         with:
-#           deploy-env: edge
-#           infisical-token: ${{ secrets.INFISICAL_ELYSIUM_EDGE_READ_TOKEN }}
-#         # Deploy to Edge Cluster
-#       - name: Deploy to Edge Cluster
-#         run: garden deploy $GARDEN_DEPLOY_ACTION --force --force-build --env usw-edge
-#         working-directory: ${{ env.OASIS_WORKSPACE }}
-#       # Alert via Discord
-#       - name: Discord Alert
-#         if: always()
-#         uses: https://gitea.dunemask.dev/elysium/elysium-actions@discord-status
-#         with:
-#           status: ${{ job.status }}
-#           channel: deployments
-#           header: DEPLOY EDGE
-#           additional-content: "Minecluster Proxy"

.forgejo/workflows/qa-api-tests.yml

@@ -1,42 +0,0 @@
-# name: QA API Tests
-# run-name: ${{ gitea.actor }} QA API Test
-# on:
-#   pull_request:
-#     branches: [ master ]
-
-# env:
-#   REPO_DIR: ${{ gitea.workspace }}/minecluster
-#   GARDEN_LINK_ACTION: build.minecluster-image
-
-# jobs:
-#   qa-api-tests:
-#     steps:
-#       # Setup Oasis
-#       - name: Oasis Setup
-#         uses: https://gitea.dunemask.dev/elysium/elysium-actions@oasis-setup-auto
-#         with:
-#           deploy-env: ci
-#           infisical-token: ${{ secrets.INFISICAL_ELYSIUM_CI_READ_TOKEN }}
-#       # Test Code
-#       - name: Checkout repository
-#         uses: actions/checkout@v3
-#         with:
-#           path: ${{ env.REPO_DIR }}  
-#       # Garden link
-#       - name: Link Repo code to Garden
-#         run: garden link action $GARDEN_LINK_ACTION $REPO_DIR --env usw-ci --var cubit-projects=cairo,minecluster
-#         working-directory: ${{ env.OASIS_WORKSPACE }}
-#       # Cubit CI Tests
-#       - name: Run Cubit tests in CI env
-#         run: garden workflow qa-api-tests --env usw-ci --var ci-ttl=25m
-#         working-directory: ${{ env.OASIS_WORKSPACE }}
-#       # Discord Alert
-#       - name: Discord Alert
-#         if: always()
-#         uses: https://gitea.dunemask.dev/elysium/elysium-actions@discord-status
-#         with:
-#           status: ${{ job.status }}
-#           channel: ci
-#           header: QA API Tests
-#           additional-content: "CI Namespace: `${{env.CI_NAMESPACE}}`"
-          

.forgejo/workflows/s3-repo-backup.yml

@@ -1,17 +0,0 @@
-name: S3 Repo Backup
-run-name: ${{ forgejo.actor }} S3 Repo Backup
-on:
- push:
-   branches: [ master ]
-
-jobs:
-  s3-repo-backup:
-    steps:
-      - name: S3 Backup
-        uses: https://forgejo.dunemask.dev/elysium/elysium-actions@s3-backup
-        with:
-          infisical-token: ${{ secrets.INFISICAL_ELYSIUM_EDGE_READ_TOKEN }}
-          infisical-project: ${{ vars.INFISICAL_DEPLOYMENTS_PROJECT_ID }}
-      - name: Status Alert
-        if: always()
-        run: echo "The Job ended with status ${{ job.status }}."

.gitea/workflows/deploy-edge-proxy.yml

@@ -0,0 +1,31 @@
+name: Deploy Edge Proxy
+run-name: ${{ gitea.actor }} Deploy Edge Proxy
+on:
+ push:
+   branches: [ master ]
+
+env:
+  GARDEN_DEPLOY_ACTION: minecluster-proxy
+
+jobs:
+  deploy-edge:
+    steps:
+      # Setup Oasis
+      - name: Oasis Setup
+        uses: https://gitea.dunemask.dev/elysium/elysium-actions@oasis-setup-auto
+        with:
+          deploy-env: edge
+          infisical-token: ${{ secrets.INFISICAL_ELYSIUM_EDGE_READ_TOKEN }}
+        # Deploy to Edge Cluster
+      - name: Deploy to Edge Cluster
+        run: garden deploy $GARDEN_DEPLOY_ACTION --force --force-build --env usw-edge
+        working-directory: ${{ env.OASIS_WORKSPACE }}
+      # Alert via Discord
+      - name: Discord Alert
+        if: always()
+        uses: https://gitea.dunemask.dev/elysium/elysium-actions@discord-status
+        with:
+          status: ${{ job.status }}
+          channel: deployments
+          header: DEPLOY EDGE
+          additional-content: "Minecluster Proxy"

.gitea/workflows/deploy-edge.yml

@@ -1,8 +1,8 @@
 name: Deploy USW-MC
-run-name: ${{ forgejo.actor }} Deploy USW-MC
+run-name: ${{ gitea.actor }} Deploy USW-MC
 on:
-  push:
-    branches: [master]
+ push:
+   branches: [ master ]
 
 env:
   GARDEN_DEPLOY_ACTION: minecluster
@@ -10,33 +10,32 @@ env:
 jobs:
   deploy-edge:
     steps:
-      # Configure proper kubeconfig (Used when cluster does not match the edge environment)
+      # Configure proper kubeconfig
       - name: Get usw-mc deployment kubeconfig
-        uses: https://forgejo.dunemask.dev/elysium/elysium-actions@infisical-env
+        uses: https://gitea.dunemask.dev/elysium/elysium-actions@infisical-env
         with:
           infisical-token: ${{ secrets.INFISICAL_ELYSIUM_EDGE_READ_TOKEN }}
-          project-id: ${{ vars.INFISICAL_DEPLOYMENTS_PROJECT_ID }}
           secret-envs: edge
-          secret-paths: /kubernetes/usw-mc
+          secret-paths: /kubernetes
       # Setup Oasis
       - name: Oasis Setup
-        uses: https://forgejo.dunemask.dev/elysium/elysium-actions@oasis-setup-auto
+        uses: https://gitea.dunemask.dev/elysium/elysium-actions@oasis-setup-auto
         with:
           deploy-env: edge
           infisical-token: ${{ secrets.INFISICAL_ELYSIUM_EDGE_READ_TOKEN }}
-          infisical-project: ${{ vars.INFISICAL_DEPLOYMENTS_PROJECT_ID }}
-          extra-secret-paths: /dashboard
+          extra-secret-paths: /alexandria 
           extra-secret-envs: edge
+          kubeconfig: ${{ env.KUBERNETES_CONFIG_USW_MC }}
       # Deploy to Edge
       - name: Deploy to Edge env
-        run: garden deploy $GARDEN_DEPLOY_ACTION --force --force-build --env usw-edge
+        run: garden deploy $GARDEN_DEPLOY_ACTION --force --force-build --env usw-mc
         working-directory: ${{ env.OASIS_WORKSPACE }}
-        env: # (Used when cluster does not match the edge environment)
-          MCL_KUBECONFIG: ${{ env.KUBERNETES_CONFIG_USW_MC }}
+        env:
+            MCL_KUBECONFIG: ${{ secrets.KUBECONFIG_USW_MC }}
       # Alert via Discord
       - name: Discord Alert
         if: always()
-        uses: https://forgejo.dunemask.dev/elysium/elysium-actions@discord-status
+        uses: https://gitea.dunemask.dev/elysium/elysium-actions@discord-status
         with:
           status: ${{ job.status }}
           channel: deployments

.gitea/workflows/qa-api-tests.yml

@@ -0,0 +1,42 @@
+name: QA API Tests
+run-name: ${{ gitea.actor }} QA API Test
+on:
+  pull_request:
+    branches: [ master ]
+
+env:
+  REPO_DIR: ${{ gitea.workspace }}/minecluster
+  GARDEN_LINK_ACTION: build.minecluster-image
+
+jobs:
+  qa-api-tests:
+    steps:
+      # Setup Oasis
+      - name: Oasis Setup
+        uses: https://gitea.dunemask.dev/elysium/elysium-actions@oasis-setup-auto
+        with:
+          deploy-env: ci
+          infisical-token: ${{ secrets.INFISICAL_ELYSIUM_CI_READ_TOKEN }}
+      # Test Code
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          path: ${{ env.REPO_DIR }}  
+      # Garden link
+      - name: Link Repo code to Garden
+        run: garden link action $GARDEN_LINK_ACTION $REPO_DIR --env usw-ci --var cubit-projects=cairo,minecluster
+        working-directory: ${{ env.OASIS_WORKSPACE }}
+      # Cubit CI Tests
+      - name: Run Cubit tests in CI env
+        run: garden workflow qa-api-tests --env usw-ci --var ci-ttl=25m
+        working-directory: ${{ env.OASIS_WORKSPACE }}
+      # Discord Alert
+      - name: Discord Alert
+        if: always()
+        uses: https://gitea.dunemask.dev/elysium/elysium-actions@discord-status
+        with:
+          status: ${{ job.status }}
+          channel: ci
+          header: QA API Tests
+          additional-content: "CI Namespace: `${{env.CI_NAMESPACE}}`"
+          

.gitea/workflows/s3-repo-backup.yml

@@ -0,0 +1,31 @@
+name: S3 Repo Backup
+run-name: ${{ gitea.actor }} S3 Repo Backup
+on:
+ push:
+   branches: [ master ]
+
+env:
+  S3_BACKUP_ENDPOINT: https://s3.dunemask.dev
+  S3_BACKUP_KEY_ID: gitea-repo-backup
+  S3_BACKUP_KEY: ${{ secrets.S3_REPO_BACKUP_KEY }}
+  REPO_DIR: ${{ gitea.workspace }}/${{ gitea.respository }}
+jobs:
+  s3-repo-backup:
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          path: ${{ env.REPO_DIR }}
+      - name: S3 Backup
+        uses: peter-evans/s3-backup@v1
+        env:
+          ACCESS_KEY_ID: ${{ env.S3_BACKUP_KEY_ID }}
+          SECRET_ACCESS_KEY: ${{ env.S3_BACKUP_KEY }}
+          MIRROR_SOURCE: ${{ env.REPO_DIR }}
+          MIRROR_TARGET: backups/gitea-repositories/${{ gitea.repository }}
+          STORAGE_SERVICE_URL: ${{env.S3_BACKUP_ENDPOINT}}
+        with:
+          args: --overwrite --remove
+      - name: Status Alert
+        if: always()
+        run: echo "The Job ended with status ${{ job.status }}."

.gitignore

@@ -1,3 +1,2 @@
 node_modules/
-.env
 

lib/controllers/s3-controller.js

@@ -1,84 +0,0 @@
-import { S3, GetObjectCommand } from "@aws-sdk/client-s3";
-import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
-import { basename } from "node:path";
-import { getServerEntry } from "../database/queries/server-queries.js";
-import { ERR } from "../util/logging.js";
-import { checkAuthorization } from "../database/queries/server-queries.js";
-const s3Region = "us-east-1";
-
-async function getS3BackupData(serverId) {
-  const serverEntry = await getServerEntry(serverId);
-  if (!serverEntry?.backupHost) return undefined;
-  const s3Config = {
-    credentials: {
-      accessKeyId: serverEntry.backupId,
-      secretAccessKey: serverEntry.backupKey,
-    },
-    endpoint: `https://${serverEntry.backupHost}`,
-    forcePathStyle: true,
-    region: s3Region,
-  };
-  const pathParts = serverEntry.backupPath.split("/");
-  if (pathParts[0] === "") pathParts.shift();
-  const bucket = pathParts.shift();
-  const backupPrefix = pathParts.join("/");
-  return { s3Config, bucket, backupPrefix };
-}
-
-export async function listS3Backups(req, res) {
-  const serverSpec = req.body;
-  if (!serverSpec.id) return res.status(400).send("Server id missing!");
-  const authorized = await checkAuthorization(serverSpec.id, req.cairoId);
-  if (!authorized)
-    return res
-      .status(403)
-      .send("You do not have permission to access that server!");
-  const s3Data = await getS3BackupData(serverSpec.id);
-  if (!s3Data) return res.status(409).send("Backup not configured!");
-  const { s3Config, bucket, backupPrefix } = s3Data;
-  const s3Client = new S3(s3Config);
-  try {
-    const listResponse = await s3Client.listObjectsV2({
-      Bucket: bucket,
-      Prefix: backupPrefix,
-    });
-    const files =
-      listResponse.Contents?.map((f) => ({
-        name: basename(f.Key),
-        lastModified: f.LastModified,
-        path: f.Key,
-        size: f.Size,
-      })) ?? [];
-    res.json(files);
-  } catch (e) {
-    ERR("S3", e);
-    res.sendStatus(500);
-  }
-}
-
-export async function getS3BackupUrl(req, res) {
-  const serverSpec = req.body;
-  if (!serverSpec.id) return res.status(400).send("Server id missing!");
-  if (!serverSpec.backupPath)
-    return res.status(400).send("Backup path missing!");
-  const authorized = await checkAuthorization(serverSpec.id, req.cairoId);
-  if (!authorized)
-    return res
-      .status(403)
-      .send("You do not have permission to access that server!");
-  const s3Data = await getS3BackupData(serverSpec.id);
-  if (!s3Data) return res.status(409).send("Backup not configured!");
-  const { s3Config, bucket } = s3Data;
-  const s3Client = new S3(s3Config);
-  try {
-    const command = new GetObjectCommand({
-      Bucket: bucket,
-      Key: serverSpec.backupPath,
-    });
-    const url = await getSignedUrl(s3Client, command, { expiresIn: 3600 });
-    res.json({ url });
-  } catch (e) {
-    ERR("S3", e);
-    res.sendStatus(500);
-  }
-}

lib/database/migrations/1_create_servers_table.sql

@@ -1,7 +1,7 @@
 CREATE SEQUENCE servers_id_seq;
 CREATE TABLE servers (
   id bigint NOT NULL DEFAULT nextval('servers_id_seq') PRIMARY KEY,
-  owner_cairo_id varchar(63),
+  owner_cairo_id bigint,
   host varchar(255) DEFAULT NULL,
   name varchar(255) DEFAULT NULL,
   version varchar(63) DEFAULT 'latest',

lib/database/queries/server-queries.js

@@ -16,10 +16,6 @@ const getMclName = (host, id) =>
   `${host.toLowerCase().replaceAll(".", "-")}-${id}`;
 
 export async function checkAuthorization(serverId, cairoId) {
-  console.log(
-    `Checking Authorization for user ${cairoId} for serverId ${serverId}`,
-  );
-  if (!cairoId) return false;
   const q = selectWhereAllQuery(table, {
     id: serverId,
     owner_cairo_id: cairoId,

lib/k8s/configs/containers/ftp-server.yml

@@ -6,7 +6,7 @@ env:
 image: garethflowers/ftp-server
 imagePullPolicy: IfNotPresent
 livenessProbe:
-  exec: { command: ["/bin/sh", "-c", "netstat -a | grep -q ftp"] }
+  exec: { command: ["echo"] }
   failureThreshold: 20
   initialDelaySeconds: 0
   periodSeconds: 5
@@ -15,7 +15,7 @@ livenessProbe:
 name: changeme-name-ftp
 ports: [] # Programatically add all the ports for easier readability, Ports include: 20,21,40000-400009
 readinessProbe:
-  exec: { command: ["/bin/sh", "-c", "netstat -a | grep -q ftp"] }
+  exec: { command: ["echo"] }
   failureThreshold: 20
   initialDelaySeconds: 0
   periodSeconds: 5

lib/k8s/k8s-config.js

@@ -9,6 +9,4 @@ try {
 } catch (e) {
   kc.loadFromDefault();
 }
-if(kc.contexts.length === 1) kc.setCurrentContext(kc.contexts[0].name);
-if(!kc.currentContext) throw new Error("Could not infer current context! Please set it manually in the Kubeconfig!");
 export default kc;

lib/routes/auth-route.js

@@ -2,14 +2,11 @@ import { Router } from "express";
 import cairoAuthMiddleware from "./middlewares/auth-middleware.js";
 const router = Router();
 
-const cairoProjectId = process.env.MCL_CAIRO_PROJECT;
-if(!cairoProjectId) throw Error("Cairo Project Required!");
-
 const ok = (_r, res) => res.sendStatus(200);
 
 function cairoRedirect(req, res) {
   res.redirect(
-    `${process.env.MCL_CAIRO_URL}/cairo/authenticate?redirectUri=${req.query.redirectUri}&projectId=${cairoProjectId}`,
+    `${process.env.MCL_CAIRO_URL}/cairo/auth?redirectUri=${req.query.redirectUri}`,
   );
 }
 

lib/routes/middlewares/auth-middleware.js

@@ -4,36 +4,21 @@ import bearerTokenMiddleware from "express-bearer-token";
 import { ERR, VERB } from "../../util/logging.js";
 
 // Constants
-const { MCL_CAIRO_URL, MCL_CAIRO_PROJECT } = process.env;
+const { MCL_CAIRO_URL } = process.env;
 const cairoAuthMiddleware = Router();
 
 const cairoAuthenticate = async (token) => {
   const config = { headers: { Authorization: `Bearer ${token}` } };
-  return fetch(`${MCL_CAIRO_URL}/api/${MCL_CAIRO_PROJECT}/auth/credentials`, config).then(async (res) => {
-    if (res.status >= 300) {
-      const errorMessage = await res
-        .json()
-        .then((data) => JSON.stringify(data))
-        .catch(() => res.statusText);
-      throw Error(
-        `Could not authenticate with user, receieved message: ${errorMessage}`,
-      );
-    }
-
-    return res.json();
-  });
+  return fetch(`${MCL_CAIRO_URL}/api/user/info`, config).then((res) =>
+    res.json(),
+  );
 };
 
 // Middleware
 const cairoAuthHandler = (req, res, next) => {
   if (!req.token) return res.status(401).send("Cairo auth required!");
   cairoAuthenticate(req.token)
-    .then((authData) => {
-      console.log(authData);
-      if (!authData?.user?.id)
-        throw Error(`Cairo didn't return the expected data! ${authData?.user?.id}`);
-      req.cairoId = authData?.user?.id;
-    })
+    .then((authData) => (req.cairoId = authData.id))
     .then(() => next())
     .catch((err) => {
       ERR("AUTH", err.response ? err.response.data : err.message);

lib/routes/s3-route.js

@@ -1,11 +0,0 @@
-import { Router, json as jsonMiddleware } from "express";
-import { getS3BackupUrl, listS3Backups } from "../controllers/s3-controller.js";
-import cairoAuthMiddleware from "./middlewares/auth-middleware.js";
-
-const router = Router();
-router.use([cairoAuthMiddleware, jsonMiddleware()]);
-
-router.post("/backups", listS3Backups);
-router.post("/backup-url", getS3BackupUrl);
-
-export default router;

lib/server/router.js

@@ -8,7 +8,6 @@ import systemRoute from "../routes/system-route.js";
 import serverRoute from "../routes/server-route.js";
 import filesRoute from "../routes/files-route.js";
 import reactRoute from "../routes/react-route.js";
-import s3Route from "../routes/s3-route.js";
 import {
   logErrors,
   clientErrorHandler,
@@ -28,7 +27,6 @@ export default function buildRoutes(pg, skio) {
   router.use("/api/system", systemRoute);
   router.use("/api/server", serverRoute);
   router.use("/api/files", filesRoute);
-  router.use("/api/s3", s3Route);
   router.use(["/mcl", "/mcl/*"], reactRoute); // Static Build Route
   /*router.use(logErrors);
   router.use(clientErrorHandler);

package.json

@@ -42,9 +42,8 @@
     "vite": "^5.1.1"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.529.1",
-    "@aws-sdk/s3-request-presigner": "^3.529.1",
     "@kubernetes/client-node": "^0.20.0",
+    "aws-sdk": "^2.1555.0",
     "basic-ftp": "^5.0.4",
     "bcrypt": "^5.1.1",
     "chalk": "^5.3.0",

src/components/servers/BackupsDialog.jsx

@@ -1,88 +0,0 @@
-import { useEffect, useState } from "react";
-import useMediaQuery from "@mui/material/useMediaQuery";
-import { useTheme } from "@mui/material/styles";
-import Button from "@mui/material/Button";
-import DialogTitle from "@mui/material/DialogTitle";
-import DialogContent from "@mui/material/DialogContent";
-import DialogActions from "@mui/material/DialogActions";
-import Dialog from "@mui/material/Dialog";
-import IconButton from "@mui/material/IconButton";
-import Toolbar from "@mui/material/Toolbar";
-import Typography from "@mui/material/Typography";
-import Stack from "@mui/material/Stack";
-import DownloadIcon from "@mui/icons-material/Download";
-import { getBackupUrl, getServerBackups } from "../../util/queries";
-
-export function useBackupDialog(isOpen = false) {
-  const [open, setOpen] = useState(isOpen);
-  const dialogToggle = () => setOpen(!open);
-  return [open, dialogToggle];
-}
-
-export default function BackupDialog(props) {
-  const { serverId, open, dialogToggle } = props;
-  const theme = useTheme();
-  const fullScreen = useMediaQuery(theme.breakpoints.down("md"));
-  const [backups, setBackups] = useState([]);
-
-  function refreshUpdateList() {
-    getServerBackups(serverId).then(setBackups);
-  }
-  useEffect(() => {
-    if (!serverId) return;
-    refreshUpdateList();
-  }, [serverId, open]);
-
-  function normalizeLastModified(lastModified) {
-    const d = new Date(Date.parse(lastModified));
-    return `${d.getFullYear()}-${d.getMonth()}-${d.getDate()} ${d.getHours()}:${d.getMinutes()}`;
-  }
-
-  const downloadBackup = (backup) =>
-    async function openBackupLink() {
-      const { url } = await getBackupUrl(serverId, backup.path);
-      window.open(url, "_blank").focus();
-    };
-
-  const normalizedSize = (size) => `${(size / Math.pow(1024, 3)).toFixed(2)}GB`;
-
-  return (
-    <Dialog
-      fullWidth
-      maxWidth="lg"
-      open={open}
-      fullScreen={fullScreen}
-      PaperProps={!fullScreen ? { sx: { height: "60%" } } : undefined}
-    >
-      <Toolbar sx={{ display: { md: "none" } }} />
-      <DialogTitle>Backups</DialogTitle>
-      <DialogContent sx={{ height: "100%" }}>
-        {backups.map((backup, i) => (
-          <Stack key={i} sx={{ width: "100%" }} direction="row">
-            <Typography variant="subtitle2" sx={{ m: "auto 0", width: "40%" }}>
-              {backup.name}
-            </Typography>
-            <Typography variant="subtitle2" sx={{ m: "auto 0", width: "20%" }}>
-              {normalizeLastModified(backup.lastModified)}
-            </Typography>
-            <Typography variant="subtitle2" sx={{ m: "auto 0", width: "40%" }}>
-              {normalizedSize(backup.size)}
-            </Typography>
-
-            <IconButton
-              sx={{ marginLeft: "auto" }}
-              onClick={downloadBackup(backup)}
-            >
-              <DownloadIcon />
-            </IconButton>
-          </Stack>
-        ))}
-      </DialogContent>
-      <DialogActions>
-        <Button autoFocus onClick={dialogToggle}>
-          Close
-        </Button>
-      </DialogActions>
-    </Dialog>
-  );
-}

src/components/servers/RconView.jsx

@@ -61,7 +61,6 @@ export default function RconView(props) {
           color: "white",
           borderRadius: "4px",
           width: "100%",
-          height: "100%",
         }}
       >
         {logs.length === 0 &&

src/components/servers/ServerCard.jsx

@@ -14,11 +14,10 @@ import PlayArrowIcon from "@mui/icons-material/PlayArrow";
 import DeleteForeverIcon from "@mui/icons-material/DeleteForever";
 import EditIcon from "@mui/icons-material/Edit";
 import FolderIcon from "@mui/icons-material/Folder";
-import BackupIcon from "@mui/icons-material/Backup";
 import { Link } from "react-router-dom";
 
 export default function ServerCard(props) {
-  const { server, openRcon, openBackups } = props;
+  const { server, openRcon } = props;
   const { name, id, metrics, ftpAvailable, serverAvailable, services } = server;
   const startServer = useStartServer(id);
   const stopServer = useStopServer(id);
@@ -118,14 +117,6 @@ export default function ServerCard(props) {
           >
             <EditIcon />
           </IconButton>
-          <IconButton
-            color="info"
-            aria-label="Backups"
-            size="large"
-            onClick={openBackups}
-          >
-            <BackupIcon />
-          </IconButton>
           <IconButton
             color="info"
             aria-label="Files"

src/pages/Home.jsx

@@ -12,16 +12,12 @@ import SpeedDialIcon from "@mui/material/SpeedDialIcon";
 import "@mcl/css/server-card.css";
 import "@mcl/css/overview.css";
 import { useServerInstances } from "@mcl/queries";
-import BackupDialog, {
-  useBackupDialog,
-} from "../components/servers/BackupsDialog";
 
 export default function Home() {
   const clusterMetrics = { cpu: 0, memory: 0 };
   const [server, setServer] = useState();
   const [servers, setServers] = useState([]);
   const [rdOpen, rconToggle] = useRconDialog();
-  const [bkOpen, backupsToggle] = useBackupDialog();
   const { isLoading, data: serversData } = useServerInstances();
   const serverInstances = serversData ?? [];
   useEffect(() => {
@@ -35,11 +31,6 @@ export default function Home() {
     rconToggle();
   };
 
-  const openBackups = (s) => () => {
-    setServer(s);
-    backupsToggle();
-  };
-
   return (
     <Box className="home">
       <Overview clusterMetrics={clusterMetrics} />
@@ -60,20 +51,10 @@ export default function Home() {
       <Box className="servers">
         {!isLoading &&
           servers.map((s, k) => (
-            <ServerCard
-              key={k}
-              server={s}
-              openRcon={openRcon(s)}
-              openBackups={openBackups(s)}
-            />
+            <ServerCard key={k} server={s} openRcon={openRcon(s)} />
           ))}
       </Box>
       <RconDialog open={rdOpen} dialogToggle={rconToggle} server={server} />
-      <BackupDialog
-        open={bkOpen}
-        dialogToggle={backupsToggle}
-        serverId={server?.id}
-      />
       <Button
         component={Link}
         to="/mcl/create"

src/util/auth.js

@@ -1,8 +1,8 @@
 import { useState, useEffect } from "react";
 import { useSearchParams } from "react-router-dom";
 
-const tokenStorageName = "cairoUserToken";
-const tokenQuery = "cairoUserToken";
+const tokenStorageName = "cairoAuthToken";
+const tokenQuery = "cairoAuthToken";
 
 const verifyAuth = (authToken) =>
   fetch("/api/auth/verify", {

src/util/queries.js

@@ -54,11 +54,6 @@ export const useGetServer = (serverId) =>
     queryFn: fetchApiPost("/server/blueprint", { id: serverId }),
   });
 
-export const getServerBackups = (serverId) =>
-  fetchApiCore("/s3/backups", { id: serverId }, "POST", true);
-export const getBackupUrl = (serverId, backupPath) =>
-  fetchApiCore("/s3/backup-url", { id: serverId, backupPath }, "POST", true);
-
 export const getServerFiles = async (serverId, path) =>
   fetchApiCore("/files/list", { id: serverId, path }, "POST", true);
 export const createServerFolder = async (serverId, path) =>