Skip to content

Commit 6c30efa

Browse files
authored
Fixed lost lang parameter in certain routes
1 parent f79a2e0 commit 6c30efa

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

internal/webserver/controller/auth/signin.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func (a *Controller) SignIn(c *fiber.Ctx) error {
4141
Name: "coreander",
4242
Value: signedToken,
4343
Path: "/",
44-
Expires: expiration,
44+
MaxAge: int(a.config.SessionTimeout.Seconds()),
4545
Secure: false,
4646
HTTPOnly: true,
4747
})

internal/webserver/controller/auth/signout.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package auth
22

33
import (
44
"fmt"
5-
"time"
65

76
"github.com/gofiber/fiber/v2"
87
)
@@ -11,9 +10,9 @@ import (
1110
func (a *Controller) SignOut(c *fiber.Ctx) error {
1211
c.Cookie(&fiber.Cookie{
1312
Name: "coreander",
14-
Value: "",
13+
Value: "void",
1514
Path: "/",
16-
Expires: time.Now().Add(-time.Second * 10),
15+
MaxAge: -1,
1716
Secure: false,
1817
HTTPOnly: true,
1918
})

internal/webserver/controller/user/update.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func (u *Controller) updateUserData(c *fiber.Ctx, user *model.User, session mode
7575
Name: "coreander",
7676
Value: signedToken,
7777
Path: "/",
78-
Expires: expiration,
78+
MaxAge: int(session.Exp),
7979
Secure: false,
8080
HTTPOnly: true,
8181
})

internal/webserver/middleware.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,9 @@ func forbidden(c *fiber.Ctx, sender Sender, err error) error {
111111
emailSendingConfigured = false
112112
}
113113
message := ""
114-
if err.Error() != "missing or malformed JWT" {
114+
if err.Error() != "missing or malformed JWT" && c.Cookies("coreander") != "void" {
115115
message = "Session expired, please log in again."
116116
}
117-
118117
return c.Status(fiber.StatusForbidden).Render("auth/login", fiber.Map{
119118
"Lang": chooseBestLanguage(c),
120119
"Title": "Login",

internal/webserver/routes.go

+1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ func routes(app *fiber.App, controllers Controllers, jwtSecret []byte, sender Se
7272
langGroup.Get("/logout", alwaysRequireAuthentication, controllers.Auth.SignOut)
7373

7474
// Authentication requirement is configurable for all routes below this middleware
75+
langGroup.Use(configurableAuthentication)
7576
app.Use(configurableAuthentication)
7677

7778
app.Get("/cover/:slug", controllers.Documents.Cover)

0 commit comments

Comments
 (0)