update user profile

modules/utils/globals.go

@@ -41,7 +41,7 @@ const (
 	SentCmdUpdateScannerLastUsed    = 15
 	SentCmdTaskLocked               = 16
 	SentCmdTaskUnlocked             = 17
-	SentCmdUpdateGroupTaskStepUserInputValue = 18
+	SentCmdUserProfileUpdated       = 18
 )
 
 // commands received from web clients
@@ -51,6 +51,7 @@ const (
 	ReceivedCmdTaskContinueTaskStep          = 3
 	ReceivedCmdReloadGroupTasks              = 4
 	ReceivedCmdTaskLocking                   = 5
+	ReceivedCmdUpdateUserProfile             = 6
 )
 
 const (

modules/utils/utils.go

@@ -26,3 +26,14 @@ func MarshalJson(v any) string {
 func GetSessionExpiresAtTime() time.Time {
 	return time.Now().Add(time.Second * SessionExpiresAtTime)
 }
+
+func IsPasswordLengthValid(password string) bool {
+	lenPassword := len(password)
+
+	if lenPassword < MinPassword || lenPassword > MaxPassword {
+		log.Error().Msg("Password length not valid")
+		return false
+	}
+
+	return true
+}

routers/router/api/v1/user/auth.go

@@ -35,7 +35,7 @@ func UserLogin(c *fiber.Ctx) error {
 		return c.Status(fiber.StatusBadRequest).JSON(err.Error())
 	}
 
-	if passwordValid := validatePasswordLength(string(decodedPassword)); !passwordValid {
+	if passwordValid := utils.IsPasswordLengthValid(string(decodedPassword)); !passwordValid {
 		return c.SendStatus(fiber.StatusBadRequest)
 	}
 
@@ -79,17 +79,6 @@ func UserLogout(c *fiber.Ctx) error {
 	return c.SendStatus(fiber.StatusCreated)
 }
 
-func validatePasswordLength(password string) bool {
-	lenPassword := len(password)
-
-	if lenPassword < utils.MinPassword || lenPassword > utils.MaxPassword {
-		log.Error().Msg("Password length not valid")
-		return false
-	}
-
-	return true
-}
-
 func GenerateSession() (string, error) {
 	var letters = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
 

socketclients/socketclients.go

@@ -1,11 +1,15 @@
 package socketclients
 
 import (
+	"encoding/base64"
 	"janex/admin-dashboard-backend/modules/cache"
 	"janex/admin-dashboard-backend/modules/database"
 	"janex/admin-dashboard-backend/modules/structs"
 	"janex/admin-dashboard-backend/modules/utils"
 	"time"
+
+	"github.com/rs/zerolog/log"
+	"golang.org/x/crypto/bcrypt"
 )
 
 func BroadcastMessage(sendSocketMessage structs.SendSocketMessage) {
@@ -149,3 +153,85 @@ func GetAllScanners() []structs.Scanner {
 
 	return allScanners
 }
+
+func isUsernameAvailable(username string) bool {
+	var user structs.User
+	database.DB.Select("username").Where("username = ?", username).Find(&user)
+
+	return user.Username == ""
+}
+
+func isEmailAvailable(email string) bool {
+	var user structs.User
+	database.DB.Select("email").Where("email = ?", email).Find(&user)
+
+	return user.Email == ""
+}
+
+func UpdateUserProfile(userId string, changes map[string]interface{}) {
+	log.Debug().Msgf("changes: %v", changes)
+
+	var user structs.User
+	var updates = make(map[string]interface{})
+
+	// TODO: validate length of username and email
+
+	if changes["username"] != nil {
+		username := changes["username"].(string)
+
+		if isUsernameAvailable(username) {
+			user.Username = username
+			updates["Username"] = username
+		}
+	}
+
+	if changes["email"] != nil {
+		email := changes["email"].(string)
+
+		if isEmailAvailable(email) {
+			user.Email = email
+			updates["Email"] = email
+		}
+	}
+
+	if changes["password"] != nil {
+		log.Debug().Msg("update password")
+		password := changes["password"].(string)
+
+		decodedPassword, err := base64.StdEncoding.DecodeString(changes["password"].(string))
+
+		if err != nil {
+			log.Error().Msg("Failed to decode base64 password, err: " + err.Error())
+		}
+
+		if utils.IsPasswordLengthValid(password) {
+			if err := bcrypt.CompareHashAndPassword([]byte(user.Password), decodedPassword); err != nil {
+				log.Error().Msg("Incorrect password")
+			}
+		}
+
+		// TODO: logout all client user sessions
+	}
+
+	log.Debug().Msgf("len %v", len(changes))
+
+	// TODO: dont sent change message if user changed password
+	if len(changes) > 0 {
+		// TODO: update user last updated timestamp
+		database.DB.Model(&structs.User{}).Where("id = ?", userId).Updates(user)
+
+		if changes["username"] != nil || changes["email"] != nil {
+			BroadcastMessage(structs.SendSocketMessage{
+				Cmd: utils.SentCmdUserProfileUpdated,
+				Body: struct {
+					UserId  string
+					Changes map[string]interface{}
+				}{
+					UserId:  userId,
+					Changes: updates,
+				},
+			})
+		}
+	}
+	// TODO: sent feedback back to user for ui notification message
+}

socketserver/hub.go

@@ -154,7 +154,6 @@ func RunHub() {
 					TaskStepId:    receivedMessage.Body["taskStepId"].(string),
 					TaskInputs:    utils.MarshalJson(receivedMessage.Body["taskInputs"]),
 				})
-
 				break
 			case utils.ReceivedCmdReloadGroupTasks:
 				category := receivedMessage.Body["category"].(string)
@@ -165,7 +164,6 @@ func RunHub() {
 				})
 
 				grouptasks.LoadGroups(category)
-
 				break
 			case utils.ReceivedCmdTaskLocking:
 				cache.AddLockedGroupTaskStep(structs.LockedGroupTaskSteps{
@@ -187,7 +185,9 @@ func RunHub() {
 					ParameterName: receivedMessage.Body["parameterName"].(string),
 					Value:         receivedMessage.Body["value"],
 				})
-
+				break
+			case utils.ReceivedCmdUpdateUserProfile:
+				socketclients.UpdateUserProfile(data.Conn.Locals("userId").(string), receivedMessage.Body["changes"].(map[string]interface{}))
 				break
 			default:
 				log.Error().Msgf("Received unknown message: %v", receivedMessage)