dkforest

commit b54ec1c8f4cb6a3b082ee3130eec238460b82ebb
parent 80f25e998640283b01f29cc99e8c9f830b86325c
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Wed, 11 Jan 2023 10:33:48 -0800

cleanup

Diffstat:
M
pkg/database/tableSessions.go
 | 
9
+++++++++
M
pkg/web/handlers/chat.go
 | 
6
+-----
M
pkg/web/handlers/handlers.go
 | 
12
++----------

3 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/pkg/database/tableSessions.go b/pkg/database/tableSessions.go
@@ -42,6 +42,15 @@ func CreateSession(userID UserID, userAgent string) (Session, error) {
 	return session, err
 }
 
+// DoCreateSession same as CreateSession but log the error instead of returning it
+func DoCreateSession(userID UserID, userAgent string) Session {
+	session, err := CreateSession(userID, userAgent)
+	if err != nil {
+		logrus.Error("Failed to create session : ", err)
+	}
+	return session
+}
+
 // DeleteUserSessions all sessions of the user.
 func DeleteUserSessions(userID UserID) error {
 	return DB.Unscoped().Where("user_id = ?", userID).Delete(&Session{}).Error
diff --git a/pkg/web/handlers/chat.go b/pkg/web/handlers/chat.go
@@ -7,7 +7,6 @@ import (
 	"dkforest/pkg/utils"
 	hutils "dkforest/pkg/web/handlers/utils"
 	"github.com/labstack/echo"
-	"github.com/sirupsen/logrus"
 	"net/http"
 	"time"
 )
@@ -165,10 +164,7 @@ func handleChatPasswordPost(c echo.Context, data chatData, authUser *database.Us
 			return c.Render(http.StatusOK, "chat-password", data)
 		}
 
-		session, err := database.CreateSession(newUser.ID, c.Request().UserAgent())
-		if err != nil {
-			logrus.Error("Failed to create session : ", err)
-		}
+		session := database.DoCreateSession(newUser.ID, c.Request().UserAgent())
 		c.SetCookie(createSessionCookie(session.Token))
 	}
 
diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go
@@ -86,11 +86,7 @@ func firstUseHandler(c echo.Context) error {
 
 	config.IsFirstUse.SetFalse()
 
-	session, err := database.CreateSession(newUser.ID, c.Request().UserAgent())
-	if err != nil {
-		logrus.Error("Failed to save session : ", err)
-	}
-
+	session := database.DoCreateSession(newUser.ID, c.Request().UserAgent())
 	c.SetCookie(createSessionCookie(session.Token))
 
 	return c.Redirect(http.StatusFound, "/")
@@ -398,11 +394,7 @@ func completeLogin(c echo.Context, user database.User) error {
 		database.CreateSessionNotification(msg, session.Token)
 	}
 
-	session, err := database.CreateSession(user.ID, c.Request().UserAgent())
-	if err != nil {
-		logrus.Error("Failed to create session : ", err)
-	}
-
+	session := database.DoCreateSession(user.ID, c.Request().UserAgent())
 	database.CreateSecurityLog(user.ID, database.LoginSecurityLog)
 	c.SetCookie(createSessionCookie(session.Token))