Alex/GoMembership
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

finalized routes

Browse Source
This commit is contained in:
Alex
2025-03-01 09:56:38 +01:00
parent 309e3a9d1e
commit 91787b616e
8 changed files with 26 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/.env.template
View File

@@ -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= VITE_BASE_API_URI_PROD=

2
frontend/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM node:latest-alpine AS deploy-node FROM node:23-alpine AS deploy-node
WORKDIR /app WORKDIR /app

6
frontend/src/hooks.server.js
View File

@@ -16,7 +16,7 @@ export async function handle({ event, resolve }) {
// if there is no jwt load page as normal // if there is no jwt load page as normal
return await resolve(event); 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', credentials: 'include',
headers: { headers: {
Cookie: `jwt=${jwt}` Cookie: `jwt=${jwt}`
@@ -37,11 +37,11 @@ export async function handle({ event, resolve }) {
userDatesFromRFC3339(data.user); userDatesFromRFC3339(data.user);
const [subscriptionsResponse, licenceCategoriesResponse] = await Promise.all([ const [subscriptionsResponse, licenceCategoriesResponse] = await Promise.all([
fetch(`${BASE_API_URI}/backend/membership/subscriptions`, { fetch(`${BASE_API_URI}/auth/subscriptions`, {
credentials: 'include', credentials: 'include',
headers: { Cookie: `jwt=${jwt}` } headers: { Cookie: `jwt=${jwt}` }
}), }),
fetch(`${BASE_API_URI}/backend/licence/categories`, { fetch(`${BASE_API_URI}/auth/licence/categories`, {
credentials: 'include', credentials: 'include',
headers: { Cookie: `jwt=${jwt}` } headers: { Cookie: `jwt=${jwt}` }
}) })

2
frontend/src/routes/auth/about/[id]/+page.server.js
View File

@@ -34,7 +34,7 @@ export const actions = {
// const isCreating = !processedData.user.id || processedData.user.id === 0; // const isCreating = !processedData.user.id || processedData.user.id === 0;
// console.log('Is creating: ', isCreating); // console.log('Is creating: ', isCreating);
const apiURL = `${BASE_API_URI}/backend/users/`; const apiURL = `${BASE_API_URI}/auth/users/`;
/** @type {RequestInit} */ /** @type {RequestInit} */
const requestUpdateOptions = { const requestUpdateOptions = {

2
frontend/src/routes/auth/admin/users/+layout.server.js
View File

@@ -6,7 +6,7 @@ import { userDatesFromRFC3339, refreshCookie } from '$lib/utils/helpers';
export async function load({ cookies, fetch, locals }) { export async function load({ cookies, fetch, locals }) {
const jwt = cookies.get('jwt'); const jwt = cookies.get('jwt');
try { try {
const response = await fetch(`${BASE_API_URI}/backend/users/all`, { const response = await fetch(`${BASE_API_URI}/auth/users/`, {
credentials: 'include', credentials: 'include',
headers: { headers: {
Cookie: `jwt=${jwt}` Cookie: `jwt=${jwt}`

8
frontend/src/routes/auth/admin/users/+page.server.js
View File

@@ -41,7 +41,7 @@ export const actions = {
console.dir(processedData.user.membership); console.dir(processedData.user.membership);
const isCreating = !processedData.user.id || processedData.user.id === 0; const isCreating = !processedData.user.id || processedData.user.id === 0;
console.log('Is creating: ', isCreating); console.log('Is creating: ', isCreating);
const apiURL = `${BASE_API_URI}/backend/users`; const apiURL = `${BASE_API_URI}/auth/users`;
/** @type {RequestInit} */ /** @type {RequestInit} */
const requestOptions = { const requestOptions = {
@@ -85,7 +85,7 @@ export const actions = {
const isCreating = !processedData.subscription.id || processedData.subscription.id === 0; const isCreating = !processedData.subscription.id || processedData.subscription.id === 0;
console.log('Is creating: ', isCreating); console.log('Is creating: ', isCreating);
const apiURL = `${BASE_API_URI}/backend/membership/subscriptions`; const apiURL = `${BASE_API_URI}/auth/subscriptions`;
/** @type {RequestInit} */ /** @type {RequestInit} */
const requestOptions = { const requestOptions = {
@@ -125,7 +125,7 @@ export const actions = {
const rawData = formDataToObject(formData); const rawData = formDataToObject(formData);
const processedData = processUserFormData(rawData); const processedData = processUserFormData(rawData);
const apiURL = `${BASE_API_URI}/backend/users`; const apiURL = `${BASE_API_URI}/auth/users`;
/** @type {RequestInit} */ /** @type {RequestInit} */
const requestOptions = { const requestOptions = {
@@ -165,7 +165,7 @@ export const actions = {
const rawData = formDataToObject(formData); const rawData = formDataToObject(formData);
const processedData = processSubscriptionFormData(rawData); const processedData = processSubscriptionFormData(rawData);
const apiURL = `${BASE_API_URI}/backend/membership/subscriptions`; const apiURL = `${BASE_API_URI}/auth/subscriptions`;
/** @type {RequestInit} */ /** @type {RequestInit} */
const requestOptions = { const requestOptions = {

2
frontend/src/routes/auth/logout/+page.server.js
View File

@@ -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) { if (!res.ok) {
const response = await res.json(); const response = await res.json();

44
go-backend/internal/routes/routes.go
View File

@@ -8,43 +8,27 @@ import (
) )
func RegisterRoutes(router *gin.Engine, userController *controllers.UserController, membershipcontroller *controllers.MembershipController, contactController *controllers.ContactController, licenceController *controllers.LicenceController) { func RegisterRoutes(router *gin.Engine, userController *controllers.UserController, membershipcontroller *controllers.MembershipController, contactController *controllers.ContactController, licenceController *controllers.LicenceController) {
router.GET("/users/verify", userController.VerifyMailHandler) router.GET("/api/users/verify", userController.VerifyMailHandler)
router.POST("/users/register", userController.RegisterUser) router.POST("/api/users/register", userController.RegisterUser)
router.POST("/users/contact", contactController.RelayContactRequest) router.POST("/api/users/contact", contactController.RelayContactRequest)
router.POST("/users/password/request-change", userController.RequestPasswordChangeHandler) router.POST("/api/users/password/request-change", userController.RequestPasswordChangeHandler)
router.PATCH("/users/password/change/:id", userController.ChangePassword) router.PATCH("/api/users/password/change/:id", userController.ChangePassword)
router.POST("/users/login", userController.LoginHandler) router.POST("/api/users/login", userController.LoginHandler)
router.POST("/csp-report", middlewares.CSPReportHandling) router.POST("/api/csp-report", middlewares.CSPReportHandling)
// apiRouter := router.Group("/api") userRouter := router.Group("/api/auth")
// apiRouter.Use(middlewares.APIKeyMiddleware())
// {
// apiRouter.POST("/v1/subscription", membershipcontroller.RegisterSubscription)
// }
userRouter := router.Group("/backend")
userRouter.Use(middlewares.AuthMiddleware()) userRouter.Use(middlewares.AuthMiddleware())
{ {
userRouter.GET("/users/current", userController.CurrentUserHandler) userRouter.GET("/users/current", userController.CurrentUserHandler)
userRouter.POST("/logout", userController.LogoutHandler) userRouter.POST("/logout", userController.LogoutHandler)
userRouter.PUT("/users", userController.UpdateHandler) userRouter.PUT("/users", userController.UpdateHandler)
userRouter.POST("/users", userController.RegisterUser) userRouter.POST("/users", userController.RegisterUser)
userRouter.GET("/users/all", userController.GetAllUsers) userRouter.GET("/users", userController.GetAllUsers)
userRouter.DELETE("/users", userController.DeleteUser) userRouter.DELETE("/users", userController.DeleteUser)
} userRouter.GET("/subscriptions", membershipcontroller.GetSubscriptions)
userRouter.PUT("/subscriptions", membershipcontroller.UpdateHandler)
membershipRouter := router.Group("/backend/membership") userRouter.POST("/subscriptions", membershipcontroller.RegisterSubscription)
membershipRouter.Use(middlewares.AuthMiddleware()) userRouter.DELETE("/subscriptions", membershipcontroller.DeleteSubscription)
{ userRouter.GET("/licence/categories", licenceController.GetAllCategories)
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)
} }
} }