diff --git a/install/main.go b/install/main.go index 4f2deb3..2f1a0b5 100644 --- a/install/main.go +++ b/install/main.go @@ -19,9 +19,9 @@ import ( // DO NOT EDIT THIS FUNCTION; IT MATCHED BY REGEX IN CICD func loadVersions(config *Config) { - config.PangolinVersion = "replaceme" - config.GerbilVersion = "replaceme" - config.BadgerVersion = "replaceme" + config.PangolinVersion = "1.0.0-beta.9" + config.GerbilVersion = "1.0.0-beta.3" + config.BadgerVersion = "v1.0.0-beta.3" } //go:embed fs/* diff --git a/server/routers/internal.ts b/server/routers/internal.ts index 2d68b36..ead70d1 100644 --- a/server/routers/internal.ts +++ b/server/routers/internal.ts @@ -1,12 +1,11 @@ import { Router } from "express"; import * as gerbil from "@server/routers/gerbil"; import * as traefik from "@server/routers/traefik"; +import * as resource from "./resource"; +import * as badger from "./badger"; import * as auth from "@server/routers/auth"; import HttpCode from "@server/types/HttpCode"; import { verifyResourceAccess, verifySessionUserMiddleware } from "@server/middlewares"; -import { getExchangeToken } from "./resource/getExchangeToken"; -import { verifyResourceSession } from "./badger"; -import { exchangeSession } from "./badger/exchangeSession"; // Root routes const internalRouter = Router(); @@ -26,7 +25,7 @@ internalRouter.post( `/resource/:resourceId/get-exchange-token`, verifySessionUserMiddleware, verifyResourceAccess, - getExchangeToken + resource.getExchangeToken ); // Gerbil routes @@ -40,7 +39,7 @@ gerbilRouter.post("/receive-bandwidth", gerbil.receiveBandwidth); const badgerRouter = Router(); internalRouter.use("/badger", badgerRouter); -badgerRouter.post("/verify-session", verifyResourceSession); -badgerRouter.post("/exchange-session", exchangeSession); +badgerRouter.post("/verify-session", badger.verifyResourceSession); +badgerRouter.post("/exchange-session", badger.exchangeSession); export default internalRouter;