diff --git a/admin/admin.go b/admin/admin.go index 7634ef589ed2831f1433db8cf242c08c2d120e44..26b1b68cb8066dc365550080f607a6db06c1dbac 100644 --- a/admin/admin.go +++ b/admin/admin.go @@ -11,7 +11,7 @@ import ( var adminTemplate *template.Template var balanceTemplate *template.Template var router = http.NewServeMux() -var Handler = adminMW(router) +var Handler = AdminMW(router) type Between struct { User *homepage.User @@ -40,7 +40,7 @@ func init() { router.HandleFunc("/", handler) } -func adminMW(h http.Handler) http.Handler { +func AdminMW(h http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { admin, err := homepage.GetUserInfoBySession(r) if err != nil { diff --git a/k8s/values.yaml b/k8s/values.yaml index 5225ef6f24f76d69e644566572fcbd07ebc4dff7..29761fe42fc58357fdd57d8da2672ef497677b0a 100644 --- a/k8s/values.yaml +++ b/k8s/values.yaml @@ -7,5 +7,5 @@ POSTGRES: "${POSTGRES}" POSTGRES_PASS: "${POSTGRES_PASS}" POSTGRES_USER: "${POSTGRES_USER}" POSTGRES_DB: "${POSTGRES_DB}" -Tag: "v1.6.3" +Tag: "v1.6.4" REGISTRY_CONF: "${REGISTRY_CONF}" diff --git a/main.go b/main.go index 1250afe3b9a9a0e35e6b448e97399ee5e8536bb4..715adb841045448bd875866fb4ead1e921e2b146 100644 --- a/main.go +++ b/main.go @@ -34,7 +34,7 @@ func main() { mux.HandleFunc("/logout/", auth.LogoutHandler) mux.Handle("/theme/", http.StripPrefix("/theme", http.HandlerFunc(homepage.ThemeHandler))) mux.Handle("/new/", http.StripPrefix("/new", http.HandlerFunc(homepage.NewHandler))) - mux.HandleFunc("/topup/", topup.TopupHandler) + mux.Handle("/topup/", topup.Handler) //mux.HandleFunc("/topup/api/", topup.PayPalHandler) mux.Handle("/metrics", promhttp.Handler()) mux.Handle("/metrics/", promhttp.Handler()) diff --git a/topup/topup.go b/topup/topup.go index fe37fac0b5aed1dcef5941e2b77c766575770b4c..ae0ff645944814db81e07c4fa5c7040f3ce24f62 100644 --- a/topup/topup.go +++ b/topup/topup.go @@ -1,6 +1,7 @@ package topup import ( + "git.sch.bme.hu/disappointment-industries/becskasszasch/admin" "git.sch.bme.hu/disappointment-industries/becskasszasch/auth" "git.sch.bme.hu/disappointment-industries/becskasszasch/db" "git.sch.bme.hu/disappointment-industries/becskasszasch/helpers" @@ -28,7 +29,9 @@ func init() { } } -func TopupHandler(w http.ResponseWriter, r *http.Request) { +var Handler = admin.AdminMW(http.HandlerFunc(topupHandler)) + +func topupHandler(w http.ResponseWriter, r *http.Request) { s := auth.GetFullSession(r) if r.Method != "POST" {