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

add: Safe func to user model

Browse Source
This commit is contained in:
$(pass /github/name)
2024-09-07 10:36:21 +02:00
parent f99ff57275
commit c3944cb4aa
2 changed files with 45 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/controllers/user_controller.go
View File

@@ -24,8 +24,7 @@ type UserController struct {
}
type RegistrationData struct {
User models.User `json:"user"`
Password string `json:"password"`
User models.User `json:"user"`
}
func (uc *UserController) CurrentUserHandler(c *gin.Context) {
@@ -34,8 +33,6 @@ func (uc *UserController) CurrentUserHandler(c *gin.Context) {
logger.Error.Printf("Error getting user_id from header")
}
userID := userIDString.(float64)
logger.Error.Printf("UserIDINt64: %v", userID)
logger.Error.Printf("c.Get Value: %v", userIDString)
user, err := uc.Service.GetUserByID(int64(userID))
if err != nil {
logger.Error.Printf("Error retrieving valid user: %v", err)
@@ -43,7 +40,7 @@ func (uc *UserController) CurrentUserHandler(c *gin.Context) {
return
}
c.JSON(http.StatusOK, user)
c.JSON(http.StatusOK, user.Safe())
}
func (uc *UserController) LoginUser(c *gin.Context) {
@@ -126,7 +123,6 @@ func (uc *UserController) RegisterUser(c *gin.Context) {
// logger.Info.Printf("REGISTERING user: %#v", regData.User)
regData.User.RoleID = constants.Roles.Member
regData.User.Password = regData.Password
// Register User
id, token, err := uc.Service.RegisterUser(&regData.User)