Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion controller/users.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func GetUserServices(ctx *gin.Context) {
ctx.JSON(http.StatusOK, serviceTokens)
}

func GetSelfUserId(ctx *gin.Context) {
func GetSelfUserID(ctx *gin.Context) {
userInterface, exists := ctx.Get("user")
if !exists {
ctx.JSON(http.StatusUnauthorized, gin.H{"error": "User not authenticated"})
Expand All @@ -106,3 +106,14 @@ func GetSelfUserId(ctx *gin.Context) {
user := userInterface.(*db.UsersModel)
ctx.JSON(http.StatusOK, gin.H{"userId": user.ID})
}

func GetSelf(ctx *gin.Context) {
userInterface, exists := ctx.Get("user")
if !exists {
ctx.JSON(http.StatusUnauthorized, gin.H{"error": "User not authenticated"})
return
}

user := userInterface.(*db.UsersModel)
ctx.JSON(http.StatusOK, gin.H{"userId": user.ID, "mail": user.Email, "admin": user.Admin})
}
3 changes: 2 additions & 1 deletion router/router.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ func setupProtectedRouter(router *gin.Engine) *gin.Engine {
protectedRoute.POST("/areas/create", controller.CreateArea)

protectedRoute.GET("/areas", controller.GetUserAreas)
protectedRoute.GET("/me/userId", controller.GetSelfUserId)
protectedRoute.GET("/me/userId", controller.GetSelfUserID)
protectedRoute.GET("/me", controller.GetSelf)
protectedRoute.GET("/users/:userId", controller.GetSpecificUser)
protectedRoute.GET("/services/:userId", controller.GetUserServices)
protectedRoute.PATCH("/areas/:areaId/status", controller.UpdateAreaStatus)
Expand Down