session sign out

modules/structs/socket.go

@@ -97,6 +97,7 @@ type UserData struct {
 }
 
 type UserSessionSocket struct {
+	IdForDeletion    string
 	UserAgent        string
 	ConnectionStatus uint8
 	LastUsed         time.Time

modules/structs/user.go

@@ -13,7 +13,8 @@ type User struct {
 }
 
 type UserSession struct {
-	Id        string
+	Id            string // user session which he use to connect to the websocket and api server
+	IdForDeletion string // this id is needed to sign out a session from website
 	UserId        string
 	UserAgent     string
 	LastUsed      time.Time
@@ -33,3 +34,7 @@ type UserResponse struct {
 	Username string
 	Email    string
 }
+
+type UserSignOutSessionRequest struct {
+	SessionId string
+}

modules/utils/globals.go

@@ -9,6 +9,7 @@ const (
 	MaxPassword = 64
 
 	LenHeaderXAuthorization = 36
+	lenHeaderXAuthorization = "36"
 	LenUserId               = 36
 
 	HeaderXAuthorization = "X-Authorization"
@@ -39,5 +40,6 @@ var (
 	generalRules = map[string]string{
 		"Username":  "required,min=" + minUsername + ",max=" + maxUsername,
 		"Password":  "required", // length is checked later because sent in base64
+		"SessionId": "required,len" + lenHeaderXAuthorization,
 	}
 )

modules/utils/validator.go

@@ -30,5 +30,5 @@ func ValidateStruct(event interface{}) []*ErrorResponse {
 }
 
 func ValidatorInit() {
-	Validate.RegisterStructValidationMapRules(generalRules, structs.UserLoginRequest{})
+	Validate.RegisterStructValidationMapRules(generalRules, structs.UserLoginRequest{}, structs.UserSignOutSessionRequest{})
 }

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

@@ -11,6 +11,7 @@ import (
 
 	"github.com/gofiber/fiber/v2"
 	"github.com/rs/zerolog/log"
+	"github.com/savsgio/gotils/uuid"
 	"golang.org/x/crypto/bcrypt"
 )
 
@@ -60,6 +61,7 @@ func UserLogin(c *fiber.Ctx) error {
 
 	database.DB.Create(&structs.UserSession{
 		Id:            session,
+		IdForDeletion: uuid.V4(),
 		UserId:        user.Id,
 		UserAgent:     string(c.Context().UserAgent())})
 

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

@@ -0,0 +1,24 @@
+package user
+
+import (
+	"janex/admin-dashboard-backend/modules/structs"
+	"janex/admin-dashboard-backend/modules/utils"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/rs/zerolog/log"
+)
+
+func SignOutSession(c *fiber.Ctx) error {
+	var params structs.UserSignOutSessionRequest
+
+	if err := c.ParamsParser(&params); err != nil {
+		log.Error().Msg("Failed to parse params, err: " + err.Error())
+		return c.SendStatus(fiber.StatusBadRequest)
+	}
+
+	log.Debug().Msgf("params %s", params.SessionId)
+
+	log.Debug().Msgf("userId %s", utils.GetXAuhorizationHeader(c))
+
+	return c.SendStatus(fiber.StatusOK)
+}

routers/router/router.go

@@ -15,6 +15,7 @@ func SetupRoutes(app *fiber.App) {
 	u := v1.Group("/user")
 	u.Post("/auth/login", user.UserLogin)
 	u.Delete("/auth/logout", user.UserLogout)
+	u.Delete("/session/:sessionId", user.SignOutSession)
 }
 
 func userSessionValidation(c *fiber.Ctx) error {

socketclients/socketclients.go

@@ -49,6 +49,7 @@ func GetUserSessions(userId string) []structs.UserSessionSocket {
 
 	for _, userSession := range userSessions {
 		userSessionsSocket = append(userSessionsSocket, structs.UserSessionSocket{
+			IdForDeletion:    userSession.IdForDeletion,
 			UserAgent:        userSession.UserAgent,
 			ConnectionStatus: isUserSessionConnected(userSession.Id, socketClients),
 			LastUsed:         userSession.LastUsed,