diff --git a/cookies.go b/cookies.go index 8c03c10..87503e7 100644 --- a/cookies.go +++ b/cookies.go @@ -5,9 +5,10 @@ package core import ( - "bytes" "crypto/aes" "crypto/cipher" + + "bytes" "crypto/rand" "encoding/base64" "encoding/gob" @@ -16,8 +17,6 @@ import ( "fmt" "io" "net/http" - "os" - "strconv" "strings" ) @@ -40,24 +39,9 @@ func GetCookie(r *http.Request) (UserCookie, error) { // Create a new instance of a User type. var user UserCookie - // check if template engine is enable - TemplateEnableStr := os.Getenv("TEMPLATE_ENABLE") - if TemplateEnableStr == "" { - TemplateEnableStr = "false" - } - TemplateEnable, _ := strconv.ParseBool(TemplateEnableStr) - // if enabled, - if TemplateEnable { - cookie_secret := os.Getenv("COOKIE_SECRET") - if cookie_secret == "" { - panic("cookie secret key is not set") - } - secretcookie, err = hex.DecodeString(cookie_secret) - if err != nil { - return user, err - } - } else { - panic("Templates are disabled") + secretcookie, err = hex.DecodeString("13d6b4dff8f84a10851021ec8608f814570d562c92fe6b5ec4c9f595bcb3234b") + if err != nil { + return user, err } gobEncodedValue, err := CookieReadEncrypted(r, "goffee", secretcookie) @@ -83,26 +67,7 @@ func SetCookie(w http.ResponseWriter, email string, token string) error { // cookie. var err error - // check if template engine is enable - TemplateEnableStr := os.Getenv("TEMPLATE_ENABLE") - if TemplateEnableStr == "" { - TemplateEnableStr = "false" - } - TemplateEnable, _ := strconv.ParseBool(TemplateEnableStr) - // if enabled, - if TemplateEnable { - cookie_secret := os.Getenv("COOKIE_SECRET") - if cookie_secret == "" { - panic("cookie secret key is not set") - } - secretcookie, err = hex.DecodeString(cookie_secret) - if err != nil { - return err - } - } else { - panic("Templates are disabled") - } - + secretcookie, err = hex.DecodeString("13d6b4dff8f84a10851021ec8608f814570d562c92fe6b5ec4c9f595bcb3234b") if err != nil { return err } @@ -136,6 +101,8 @@ func SetCookie(w http.ResponseWriter, email string, token string) error { return err } + fmt.Printf("Cookie set %v\n", email) + return nil } diff --git a/template/components/content_table.html b/template/components/content_table.html index 2bf559d..ce19344 100644 --- a/template/components/content_table.html +++ b/template/components/content_table.html @@ -6,7 +6,7 @@
- {{- range .AllTD}}