mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 21:37:32 +00:00
fix: fix some requests (#198)
* fix: alway do permission check * fix: alway do permission check * fix: add project query to applications search request * fix: add email template to statik * fix: org members
This commit is contained in:
@@ -3,25 +3,28 @@ package templates
|
||||
import (
|
||||
"bytes"
|
||||
"html/template"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
const (
|
||||
templatesPath = "/templates"
|
||||
templateFileName = "template.html"
|
||||
)
|
||||
|
||||
func GetParsedTemplate(contentData interface{}) (string, error) {
|
||||
template, err := ParseTemplateFile("", contentData)
|
||||
func GetParsedTemplate(dir http.FileSystem, contentData interface{}) (string, error) {
|
||||
template, err := ParseTemplateFile(dir, "", contentData)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return ParseTemplateText(template, contentData)
|
||||
}
|
||||
|
||||
func ParseTemplateFile(fileName string, data interface{}) (string, error) {
|
||||
func ParseTemplateFile(dir http.FileSystem, fileName string, data interface{}) (string, error) {
|
||||
if fileName == "" {
|
||||
fileName = templateFileName
|
||||
}
|
||||
template, err := template.ParseFiles(fileName)
|
||||
template, err := readFile(dir, fileName)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
@@ -43,3 +46,20 @@ func parseTemplate(template *template.Template, data interface{}) (string, error
|
||||
}
|
||||
return buf.String(), nil
|
||||
}
|
||||
|
||||
func readFile(dir http.FileSystem, fileName string) (*template.Template, error) {
|
||||
f, err := dir.Open(templatesPath + "/" + fileName)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer f.Close()
|
||||
content, err := ioutil.ReadAll(f)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
tmpl, err := template.New(fileName).Parse(string(content))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return tmpl, nil
|
||||
}
|
||||
|
Reference in New Issue
Block a user