diff --git a/LogisticsSupportTool_API_DOCS/app/admin/server/Update Server.bru b/LogisticsSupportTool_API_DOCS/app/admin/server/Update Server.bru index a3c22b4..56bc909 100644 --- a/LogisticsSupportTool_API_DOCS/app/admin/server/Update Server.bru +++ b/LogisticsSupportTool_API_DOCS/app/admin/server/Update Server.bru @@ -16,8 +16,7 @@ params:path { body:json { { - "zipcode": 45247 - + "zipcode": 45245 } } diff --git a/app/src/internal/admin/routes/servers/addServer.ts b/app/src/internal/admin/routes/servers/addServer.ts index d0e5411..ff43e98 100644 --- a/app/src/internal/admin/routes/servers/addServer.ts +++ b/app/src/internal/admin/routes/servers/addServer.ts @@ -50,7 +50,7 @@ router.post("/", async (req: Request, res: Response) => { withCredentials: true, }); - const loginRes = await axiosInstance.post( + const loginRes = (await axiosInstance.post( `${process.env.MAIN_SERVER}/lst/api/auth/sign-in/username`, { username: process.env.MAIN_SERVER_USERNAME, @@ -59,8 +59,8 @@ router.post("/", async (req: Request, res: Response) => { { headers: { "Content-Type": "application/json" }, } - ); - const setCookie = loginRes.headers["set-cookie"]; + )) as any; + const setCookie = loginRes.headers["set-cookie"][0]; if (!setCookie) { throw new Error("Did not receive a Set-Cookie header from login"); @@ -73,7 +73,7 @@ router.post("/", async (req: Request, res: Response) => { { headers: { "Content-Type": "application/json", - Cookie: setCookie.join("; "), + Cookie: setCookie.split(";")[0], }, withCredentials: true, } diff --git a/app/src/internal/admin/routes/servers/serverRoutes.ts b/app/src/internal/admin/routes/servers/serverRoutes.ts index b6a0bfe..fa1e3d5 100644 --- a/app/src/internal/admin/routes/servers/serverRoutes.ts +++ b/app/src/internal/admin/routes/servers/serverRoutes.ts @@ -12,8 +12,8 @@ router.use( "/", requireAuth("user", ["systemAdmin", "admin"]), restrictToHosts([ - "usmcd1vms036", - "USMCD1VMS036", + "usmcd1vms036.alpla.net", + "USMCD1VMS036.alpla.net", "https://usmcd1vms036.alpla.net", ]), addServer @@ -22,8 +22,8 @@ router.use( "/", requireAuth("user", ["systemAdmin", "admin"]), restrictToHosts([ - "usmcd1vms036", - "USMCD1VMS036", + "usmcd1vms036.alpla.net", + "USMCD1VMS036.alpla.net", "https://usmcd1vms036.alpla.net", ]), updateServer diff --git a/app/src/internal/admin/routes/servers/updateServer.ts b/app/src/internal/admin/routes/servers/updateServer.ts index a7dac57..74e27f7 100644 --- a/app/src/internal/admin/routes/servers/updateServer.ts +++ b/app/src/internal/admin/routes/servers/updateServer.ts @@ -82,7 +82,7 @@ router.patch("/:token", async (req: Request, res: Response) => { withCredentials: true, }); - const loginRes = await axiosInstance.post( + const loginRes = (await axiosInstance.post( `${process.env.MAIN_SERVER}/lst/api/auth/sign-in/username`, { username: process.env.MAIN_SERVER_USERNAME, @@ -91,8 +91,11 @@ router.patch("/:token", async (req: Request, res: Response) => { { headers: { "Content-Type": "application/json" }, } - ); - const setCookie = loginRes.headers["set-cookie"]; + )) as any; + + const setCookie = loginRes?.headers["set-cookie"][0]; + + //console.log(setCookie.split(";")[0].replace("__Secure-", "")); if (!setCookie) { throw new Error( @@ -101,13 +104,13 @@ router.patch("/:token", async (req: Request, res: Response) => { } const { data, error } = await tryCatch( - axios.post( + axios.patch( `${process.env.MAIN_SERVER}/lst/api/admin/server/${token}`, updates, { headers: { "Content-Type": "application/json", - Cookie: setCookie.join("; "), + Cookie: setCookie.split(";")[0], }, withCredentials: true, } @@ -115,6 +118,7 @@ router.patch("/:token", async (req: Request, res: Response) => { ); if (error) { + console.log(error); log.error( { stack: error }, "There was an error adding the server to Main Server"