Compare commits

...

1 Commits

Author SHA1 Message Date
httpjamesm 18e0e575f3 fix: allow option parsing if only one is present 2023-09-24 00:35:21 -04:00
2 changed files with 12 additions and 18 deletions
+11 -15
View File
@@ -1,6 +1,8 @@
package middleware
import "github.com/gin-gonic/gin"
import (
"github.com/gin-gonic/gin"
)
func OptionsMiddleware() gin.HandlerFunc {
return func(c *gin.Context) {
@@ -8,23 +10,17 @@ func OptionsMiddleware() gin.HandlerFunc {
c.Set("theme", "dark")
imagesCookie, err := c.Cookie("disable_images")
if err != nil {
c.Next()
return
}
if imagesCookie == "true" {
c.Set("disable_images", true)
if err == nil {
if imagesCookie == "true" {
c.Set("disable_images", true)
}
}
themeCookie, err := c.Cookie("theme")
if err != nil {
c.Next()
return
}
if themeCookie == "light" {
c.Set("theme", "light")
if err == nil {
if themeCookie == "light" {
c.Set("theme", "light")
}
}
c.Next()
+1 -3
View File
@@ -30,12 +30,10 @@ func ChangeOptions(c *gin.Context) {
if c.MustGet("theme").(string) == "dark" {
text = "light"
}
c.SetCookie("theme", text, 60*60*24*365*10, "/", "", false, true)
// get redirect url from query
redirectUrl := c.Query("redirect_url")
if redirectUrl == "" {
redirectUrl = os.Getenv("APP_URL")
}
if !strings.HasPrefix(redirectUrl, os.Getenv("APP_URL")) {
redirectUrl = os.Getenv("APP_URL")