From 91787b616effa9a0b03f40b8cdc48d4f2ae1f720 Mon Sep 17 00:00:00 2001 From: Alex <$(pass /github/email)> Date: Sat, 1 Mar 2025 09:56:38 +0100 Subject: [PATCH] finalized routes --- frontend/.env.template | 2 +- frontend/Dockerfile | 2 +- frontend/src/hooks.server.js | 6 +-- .../routes/auth/about/[id]/+page.server.js | 2 +- .../routes/auth/admin/users/+layout.server.js | 2 +- .../routes/auth/admin/users/+page.server.js | 8 ++-- .../src/routes/auth/logout/+page.server.js | 2 +- go-backend/internal/routes/routes.go | 44 ++++++------------- 8 files changed, 26 insertions(+), 42 deletions(-) diff --git a/frontend/.env.template b/frontend/.env.template index c5af520..142e49d 100644 --- a/frontend/.env.template +++ b/frontend/.env.template @@ -1,2 +1,2 @@ -VITE_BASE_API_URI_DEV=http://127.0.0.1:8080 +VITE_BASE_API_URI_DEV=http://127.0.0.1:8080/api VITE_BASE_API_URI_PROD= diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 551e743..dfecefd 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -1,4 +1,4 @@ -FROM node:latest-alpine AS deploy-node +FROM node:23-alpine AS deploy-node WORKDIR /app diff --git a/frontend/src/hooks.server.js b/frontend/src/hooks.server.js index 0ba835e..763044c 100644 --- a/frontend/src/hooks.server.js +++ b/frontend/src/hooks.server.js @@ -16,7 +16,7 @@ export async function handle({ event, resolve }) { // if there is no jwt load page as normal return await resolve(event); } - const response = await fetch(`${BASE_API_URI}/backend/users/current`, { + const response = await fetch(`${BASE_API_URI}/auth/users/current`, { credentials: 'include', headers: { Cookie: `jwt=${jwt}` @@ -37,11 +37,11 @@ export async function handle({ event, resolve }) { userDatesFromRFC3339(data.user); const [subscriptionsResponse, licenceCategoriesResponse] = await Promise.all([ - fetch(`${BASE_API_URI}/backend/membership/subscriptions`, { + fetch(`${BASE_API_URI}/auth/subscriptions`, { credentials: 'include', headers: { Cookie: `jwt=${jwt}` } }), - fetch(`${BASE_API_URI}/backend/licence/categories`, { + fetch(`${BASE_API_URI}/auth/licence/categories`, { credentials: 'include', headers: { Cookie: `jwt=${jwt}` } }) diff --git a/frontend/src/routes/auth/about/[id]/+page.server.js b/frontend/src/routes/auth/about/[id]/+page.server.js index 4c4941c..d00b653 100644 --- a/frontend/src/routes/auth/about/[id]/+page.server.js +++ b/frontend/src/routes/auth/about/[id]/+page.server.js @@ -34,7 +34,7 @@ export const actions = { // const isCreating = !processedData.user.id || processedData.user.id === 0; // console.log('Is creating: ', isCreating); - const apiURL = `${BASE_API_URI}/backend/users/`; + const apiURL = `${BASE_API_URI}/auth/users/`; /** @type {RequestInit} */ const requestUpdateOptions = { diff --git a/frontend/src/routes/auth/admin/users/+layout.server.js b/frontend/src/routes/auth/admin/users/+layout.server.js index 0970cf1..325dc6b 100644 --- a/frontend/src/routes/auth/admin/users/+layout.server.js +++ b/frontend/src/routes/auth/admin/users/+layout.server.js @@ -6,7 +6,7 @@ import { userDatesFromRFC3339, refreshCookie } from '$lib/utils/helpers'; export async function load({ cookies, fetch, locals }) { const jwt = cookies.get('jwt'); try { - const response = await fetch(`${BASE_API_URI}/backend/users/all`, { + const response = await fetch(`${BASE_API_URI}/auth/users/`, { credentials: 'include', headers: { Cookie: `jwt=${jwt}` diff --git a/frontend/src/routes/auth/admin/users/+page.server.js b/frontend/src/routes/auth/admin/users/+page.server.js index dd0e4d4..29933f4 100644 --- a/frontend/src/routes/auth/admin/users/+page.server.js +++ b/frontend/src/routes/auth/admin/users/+page.server.js @@ -41,7 +41,7 @@ export const actions = { console.dir(processedData.user.membership); const isCreating = !processedData.user.id || processedData.user.id === 0; console.log('Is creating: ', isCreating); - const apiURL = `${BASE_API_URI}/backend/users`; + const apiURL = `${BASE_API_URI}/auth/users`; /** @type {RequestInit} */ const requestOptions = { @@ -85,7 +85,7 @@ export const actions = { const isCreating = !processedData.subscription.id || processedData.subscription.id === 0; console.log('Is creating: ', isCreating); - const apiURL = `${BASE_API_URI}/backend/membership/subscriptions`; + const apiURL = `${BASE_API_URI}/auth/subscriptions`; /** @type {RequestInit} */ const requestOptions = { @@ -125,7 +125,7 @@ export const actions = { const rawData = formDataToObject(formData); const processedData = processUserFormData(rawData); - const apiURL = `${BASE_API_URI}/backend/users`; + const apiURL = `${BASE_API_URI}/auth/users`; /** @type {RequestInit} */ const requestOptions = { @@ -165,7 +165,7 @@ export const actions = { const rawData = formDataToObject(formData); const processedData = processSubscriptionFormData(rawData); - const apiURL = `${BASE_API_URI}/backend/membership/subscriptions`; + const apiURL = `${BASE_API_URI}/auth/subscriptions`; /** @type {RequestInit} */ const requestOptions = { diff --git a/frontend/src/routes/auth/logout/+page.server.js b/frontend/src/routes/auth/logout/+page.server.js index de54396..3fcc9be 100644 --- a/frontend/src/routes/auth/logout/+page.server.js +++ b/frontend/src/routes/auth/logout/+page.server.js @@ -22,7 +22,7 @@ export const actions = { } }; - const res = await fetch(`${BASE_API_URI}/backend/logout/`, requestInitOptions); + const res = await fetch(`${BASE_API_URI}/auth/logout/`, requestInitOptions); if (!res.ok) { const response = await res.json(); diff --git a/go-backend/internal/routes/routes.go b/go-backend/internal/routes/routes.go index db270c7..021ef76 100644 --- a/go-backend/internal/routes/routes.go +++ b/go-backend/internal/routes/routes.go @@ -8,43 +8,27 @@ import ( ) func RegisterRoutes(router *gin.Engine, userController *controllers.UserController, membershipcontroller *controllers.MembershipController, contactController *controllers.ContactController, licenceController *controllers.LicenceController) { - router.GET("/users/verify", userController.VerifyMailHandler) - router.POST("/users/register", userController.RegisterUser) - router.POST("/users/contact", contactController.RelayContactRequest) - router.POST("/users/password/request-change", userController.RequestPasswordChangeHandler) - router.PATCH("/users/password/change/:id", userController.ChangePassword) - router.POST("/users/login", userController.LoginHandler) - router.POST("/csp-report", middlewares.CSPReportHandling) + router.GET("/api/users/verify", userController.VerifyMailHandler) + router.POST("/api/users/register", userController.RegisterUser) + router.POST("/api/users/contact", contactController.RelayContactRequest) + router.POST("/api/users/password/request-change", userController.RequestPasswordChangeHandler) + router.PATCH("/api/users/password/change/:id", userController.ChangePassword) + router.POST("/api/users/login", userController.LoginHandler) + router.POST("/api/csp-report", middlewares.CSPReportHandling) - // apiRouter := router.Group("/api") - // apiRouter.Use(middlewares.APIKeyMiddleware()) - // { - // apiRouter.POST("/v1/subscription", membershipcontroller.RegisterSubscription) - // } - - userRouter := router.Group("/backend") + userRouter := router.Group("/api/auth") userRouter.Use(middlewares.AuthMiddleware()) { userRouter.GET("/users/current", userController.CurrentUserHandler) userRouter.POST("/logout", userController.LogoutHandler) userRouter.PUT("/users", userController.UpdateHandler) userRouter.POST("/users", userController.RegisterUser) - userRouter.GET("/users/all", userController.GetAllUsers) + userRouter.GET("/users", userController.GetAllUsers) userRouter.DELETE("/users", userController.DeleteUser) - } - - membershipRouter := router.Group("/backend/membership") - membershipRouter.Use(middlewares.AuthMiddleware()) - { - membershipRouter.GET("/subscriptions", membershipcontroller.GetSubscriptions) - membershipRouter.PUT("/subscriptions", membershipcontroller.UpdateHandler) - membershipRouter.POST("/subscriptions", membershipcontroller.RegisterSubscription) - membershipRouter.DELETE("/subscriptions", membershipcontroller.DeleteSubscription) - } - - licenceRouter := router.Group("/backend/licence") - licenceRouter.Use(middlewares.AuthMiddleware()) - { - licenceRouter.GET("/categories", licenceController.GetAllCategories) + userRouter.GET("/subscriptions", membershipcontroller.GetSubscriptions) + userRouter.PUT("/subscriptions", membershipcontroller.UpdateHandler) + userRouter.POST("/subscriptions", membershipcontroller.RegisterSubscription) + userRouter.DELETE("/subscriptions", membershipcontroller.DeleteSubscription) + userRouter.GET("/licence/categories", licenceController.GetAllCategories) } }