From e91d8038ad468d1dfe2317e1dcee4c04bc9d870b Mon Sep 17 00:00:00 2001
From: Alireza Ahmadi <alireza7@gmail.com>
Date: Tue, 27 Feb 2024 01:01:44 +0100
Subject: [PATCH] change cookies

---
 backend/api/session.go       | 2 +-
 backend/go.mod               | 1 +
 backend/go.sum               | 2 ++
 backend/web/web.go           | 6 +++---
 frontend/src/router/index.ts | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/backend/api/session.go b/backend/api/session.go
index d02e460..545c8f7 100644
--- a/backend/api/session.go
+++ b/backend/api/session.go
@@ -4,7 +4,7 @@ import (
 	"encoding/gob"
 	"s-ui/database/model"
 
-	"github.com/gin-contrib/sessions"
+	sessions "github.com/Calidity/gin-sessions"
 	"github.com/gin-gonic/gin"
 )
 
diff --git a/backend/go.mod b/backend/go.mod
index 91375ab..58f4a85 100644
--- a/backend/go.mod
+++ b/backend/go.mod
@@ -54,6 +54,7 @@ require (
 )
 
 require (
+	github.com/Calidity/gin-sessions v1.3.1
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-playground/validator/v10 v10.17.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
diff --git a/backend/go.sum b/backend/go.sum
index b5e2466..9934a47 100644
--- a/backend/go.sum
+++ b/backend/go.sum
@@ -1,3 +1,5 @@
+github.com/Calidity/gin-sessions v1.3.1 h1:nF3dCBWa7TZ4j26iYLwGRmzZy9YODhWoOS3fmi+snyE=
+github.com/Calidity/gin-sessions v1.3.1/go.mod h1:I0+QE6qkO50TeN/n6If6novvxHk4Isvr23U8EdvPdns=
 github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls=
 github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E=
 github.com/aead/cmac v0.0.0-20160719120800-7af84192f0b1 h1:+JkXLHME8vLJafGhOH4aoV2Iu8bR55nU6iKMVfYVLjY=
diff --git a/backend/web/web.go b/backend/web/web.go
index dc6ba03..5f06a3a 100644
--- a/backend/web/web.go
+++ b/backend/web/web.go
@@ -17,9 +17,9 @@ import (
 	"strconv"
 	"strings"
 
+	sessions "github.com/Calidity/gin-sessions"
+	"github.com/Calidity/gin-sessions/cookie"
 	"github.com/gin-contrib/gzip"
-	"github.com/gin-contrib/sessions"
-	"github.com/gin-contrib/sessions/cookie"
 	"github.com/gin-gonic/gin"
 )
 
@@ -76,7 +76,7 @@ func (s *Server) initRouter() (*gin.Engine, error) {
 	assetsBasePath := base_url + "assets/"
 
 	store := cookie.NewStore(secret)
-	engine.Use(sessions.Sessions("session", store))
+	engine.Use(sessions.Sessions("s-ui", store))
 
 	engine.Use(func(c *gin.Context) {
 		uri := c.Request.RequestURI
diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
index 4cc6da7..c004042 100644
--- a/frontend/src/router/index.ts
+++ b/frontend/src/router/index.ts
@@ -64,7 +64,7 @@ let intervalId:any
 // Navigation guard to check authentication state
 router.beforeEach((to, from, next) => {
   // Check the session cookie
-  const sessionCookie = document.cookie.split(';').find(cookie => cookie.trim().startsWith('session='))
+  const sessionCookie = document.cookie.split(';').find(cookie => cookie.trim().startsWith('s-ui='))
   const isAuthenticated = !!sessionCookie
 
   // If the route requires authentication and the user is not authenticated, redirect to /login