Compare commits
No commits in common. "49d9ff467a4170f5b39bb2b4c28952dda56e56ef" and "daebcdeccd6b8fc3c97b82d6ee436ef9cabd721a" have entirely different histories.
49d9ff467a
...
daebcdeccd
1
backend/.gitignore
vendored
1
backend/.gitignore
vendored
@ -1,4 +1,3 @@
|
|||||||
*.db3
|
*.db3
|
||||||
*.db3-*
|
*.db3-*
|
||||||
*.db3.*
|
|
||||||
/allowance_planner
|
/allowance_planner
|
||||||
|
@ -43,11 +43,6 @@ 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 {
|
||||||
@ -655,10 +650,5 @@ 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,7 +3,6 @@ package main
|
|||||||
import (
|
import (
|
||||||
"errors"
|
"errors"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
"log"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
)
|
)
|
||||||
@ -27,17 +26,11 @@ 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") != "" {
|
||||||
log.Println("Set cookie for user:", c.Query("user"))
|
c.SetCookie("user", c.Query("user"), 3600, "/", "localhost", false, true)
|
||||||
c.SetCookie("user", c.Query("user"), 3600, "", "", false, true)
|
|
||||||
}
|
}
|
||||||
redirectToPage(c, "/")
|
c.Redirect(http.StatusFound, "/")
|
||||||
}
|
}
|
||||||
|
|
||||||
func renderIndex(c *gin.Context) {
|
func renderIndex(c *gin.Context) {
|
||||||
@ -156,7 +149,6 @@ 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