Improve compatibility with ancient browsers
This commit is contained in:
parent
f35e35e1de
commit
1674988751
@ -43,6 +43,11 @@ type ServerConfig struct {
|
|||||||
Started chan bool
|
Started chan bool
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const DefaultDomain = "localhost:8080"
|
||||||
|
|
||||||
|
// The domain that the server is reachable at.
|
||||||
|
var domain = DefaultDomain
|
||||||
|
|
||||||
func getUsers(c *gin.Context) {
|
func getUsers(c *gin.Context) {
|
||||||
users, err := db.GetUsers()
|
users, err := db.GetUsers()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -706,5 +711,10 @@ func main() {
|
|||||||
config.Datasource = "allowance_planner.db3"
|
config.Datasource = "allowance_planner.db3"
|
||||||
log.Printf("Warning: No DB_PATH set, using default of %s", config.Datasource)
|
log.Printf("Warning: No DB_PATH set, using default of %s", config.Datasource)
|
||||||
}
|
}
|
||||||
|
domain = os.Getenv("DOMAIN")
|
||||||
|
if domain == "" {
|
||||||
|
domain = DefaultDomain
|
||||||
|
log.Printf("Warning: No DOMAIN set, using default of %s", domain)
|
||||||
|
}
|
||||||
start(context.Background(), &config)
|
start(context.Background(), &config)
|
||||||
}
|
}
|
||||||
|
@ -3,6 +3,7 @@ package main
|
|||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
)
|
)
|
||||||
@ -26,11 +27,17 @@ func loadWebEndpoints(router *gin.Engine) {
|
|||||||
router.GET("/completeAllowance", renderCompleteAllowance)
|
router.GET("/completeAllowance", renderCompleteAllowance)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func redirectToPage(c *gin.Context, page string) {
|
||||||
|
scheme := c.Request.URL.Scheme
|
||||||
|
c.Redirect(http.StatusSeeOther, scheme+domain+page)
|
||||||
|
}
|
||||||
|
|
||||||
func renderLogin(c *gin.Context) {
|
func renderLogin(c *gin.Context) {
|
||||||
if c.Query("user") != "" {
|
if c.Query("user") != "" {
|
||||||
c.SetCookie("user", c.Query("user"), 3600, "/", "localhost", false, true)
|
log.Println("Set cookie for user:", c.Query("user"))
|
||||||
|
c.SetCookie("user", c.Query("user"), 3600, "", "", false, true)
|
||||||
}
|
}
|
||||||
c.Redirect(http.StatusFound, "/")
|
redirectToPage(c, "/")
|
||||||
}
|
}
|
||||||
|
|
||||||
func renderIndex(c *gin.Context) {
|
func renderIndex(c *gin.Context) {
|
||||||
@ -149,6 +156,7 @@ func renderCompleteAllowance(c *gin.Context) {
|
|||||||
|
|
||||||
func getCurrentUser(c *gin.Context) *int {
|
func getCurrentUser(c *gin.Context) *int {
|
||||||
currentUserStr, err := c.Cookie("user")
|
currentUserStr, err := c.Cookie("user")
|
||||||
|
log.Println("Cookie string:", currentUserStr)
|
||||||
if errors.Is(err, http.ErrNoCookie) {
|
if errors.Is(err, http.ErrNoCookie) {
|
||||||
renderNoUser(c)
|
renderNoUser(c)
|
||||||
return nil
|
return nil
|
||||||
|
Loading…
x
Reference in New Issue
Block a user