Compare commits
	
		
			3 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 6f9fb2d8ec | |||
| 74e56f55d6 | |||
| ae4020fdcf | 
@@ -17,14 +17,6 @@ func MD5(b []byte) string {
 | 
				
			|||||||
	return hex.EncodeToString(hash[:])
 | 
						return hex.EncodeToString(hash[:])
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					 | 
				
			||||||
func MD5Int(b []byte) uint64 {
 | 
					 | 
				
			||||||
	n := new(big.Int)
 | 
					 | 
				
			||||||
	n.SetString(MD5(b), 16)
 | 
					 | 
				
			||||||
	return n.Uint64()
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
*/
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
// SHA256 Sum256 is generally preferred over md5.hash due to its superior security and resistance to collision attacks
 | 
					// SHA256 Sum256 is generally preferred over md5.hash due to its superior security and resistance to collision attacks
 | 
				
			||||||
func SHA256(b []byte) string {
 | 
					func SHA256(b []byte) string {
 | 
				
			||||||
	hash := sha256.Sum256(b)
 | 
						hash := sha256.Sum256(b)
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										83
									
								
								dotenv/assign.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										83
									
								
								dotenv/assign.go
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,83 @@
 | 
				
			|||||||
 | 
					package dotenv
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import (
 | 
				
			||||||
 | 
						"log/slog"
 | 
				
			||||||
 | 
						"reflect"
 | 
				
			||||||
 | 
						"strconv"
 | 
				
			||||||
 | 
						"strings"
 | 
				
			||||||
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// Assign env tag matching values from envMap
 | 
				
			||||||
 | 
					func Assign[T any](to *T, envMap map[string]string) error {
 | 
				
			||||||
 | 
						if to == nil {
 | 
				
			||||||
 | 
							return nil
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if len(envMap) == 0 {
 | 
				
			||||||
 | 
							return nil
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						val := reflect.Indirect(reflect.ValueOf(to))
 | 
				
			||||||
 | 
						name := val.Type().Name()
 | 
				
			||||||
 | 
						for i := range val.NumField() {
 | 
				
			||||||
 | 
							f := val.Type().Field(i)
 | 
				
			||||||
 | 
							tag := f.Tag.Get("env")
 | 
				
			||||||
 | 
							if tag == "" {
 | 
				
			||||||
 | 
								continue
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							var v string
 | 
				
			||||||
 | 
							var ok bool
 | 
				
			||||||
 | 
							if multiTag := strings.Split(tag, ","); len(multiTag) > 1 {
 | 
				
			||||||
 | 
								// multi tags like env:"DB_URL,PG_DB_URL"
 | 
				
			||||||
 | 
								for _, mt := range multiTag {
 | 
				
			||||||
 | 
									if v, ok = envMap[strings.TrimSpace(mt)]; ok {
 | 
				
			||||||
 | 
										break
 | 
				
			||||||
 | 
									}
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
							} else {
 | 
				
			||||||
 | 
								v, ok = envMap[tag]
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							if !ok {
 | 
				
			||||||
 | 
								continue
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							field := val.FieldByName(f.Name)
 | 
				
			||||||
 | 
							if !field.IsValid() {
 | 
				
			||||||
 | 
								continue
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							switch f.Type.Kind() {
 | 
				
			||||||
 | 
							case reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, reflect.Int:
 | 
				
			||||||
 | 
								if v, err := strconv.ParseInt(v, 10, 64); err != nil {
 | 
				
			||||||
 | 
									return err
 | 
				
			||||||
 | 
								} else {
 | 
				
			||||||
 | 
									field.SetInt(v)
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
							case reflect.Float32, reflect.Float64:
 | 
				
			||||||
 | 
								if v, err := strconv.ParseFloat(v, 64); err != nil {
 | 
				
			||||||
 | 
									return err
 | 
				
			||||||
 | 
								} else {
 | 
				
			||||||
 | 
									field.SetFloat(v)
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
							case reflect.Bool:
 | 
				
			||||||
 | 
								if strings.EqualFold(v, "true") {
 | 
				
			||||||
 | 
									field.SetBool(true)
 | 
				
			||||||
 | 
								} else {
 | 
				
			||||||
 | 
									field.SetBool(false)
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							default:
 | 
				
			||||||
 | 
								field.SetString(v)
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							if name == "" {
 | 
				
			||||||
 | 
								slog.Info("override value from env", "field", f.Name)
 | 
				
			||||||
 | 
							} else {
 | 
				
			||||||
 | 
								slog.Info("override value from env", "type", name, "field", f.Name)
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						return nil
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -23,7 +23,7 @@ const (
 | 
				
			|||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func parseBytes(src []byte, out map[string]string) error {
 | 
					func parseBytes(src []byte, out map[string]string) error {
 | 
				
			||||||
	src = bytes.Replace(src, []byte("\r\n"), []byte("\n"), -1)
 | 
						src = bytes.ReplaceAll(src, []byte("\r\n"), []byte("\n"))
 | 
				
			||||||
	cutset := src
 | 
						cutset := src
 | 
				
			||||||
	for {
 | 
						for {
 | 
				
			||||||
		cutset = getStatementStart(cutset)
 | 
							cutset = getStatementStart(cutset)
 | 
				
			||||||
@@ -76,8 +76,8 @@ func getStatementStart(src []byte) []byte {
 | 
				
			|||||||
func locateKeyName(src []byte) (key string, cutset []byte, err error) {
 | 
					func locateKeyName(src []byte) (key string, cutset []byte, err error) {
 | 
				
			||||||
	// trim "export" and space at beginning
 | 
						// trim "export" and space at beginning
 | 
				
			||||||
	src = bytes.TrimLeftFunc(src, isSpace)
 | 
						src = bytes.TrimLeftFunc(src, isSpace)
 | 
				
			||||||
	if bytes.HasPrefix(src, []byte(exportPrefix)) {
 | 
						if after, ok := bytes.CutPrefix(src, []byte(exportPrefix)); ok {
 | 
				
			||||||
		trimmed := bytes.TrimPrefix(src, []byte(exportPrefix))
 | 
							trimmed := after
 | 
				
			||||||
		if bytes.IndexFunc(trimmed, isSpace) == 0 {
 | 
							if bytes.IndexFunc(trimmed, isSpace) == 0 {
 | 
				
			||||||
			src = bytes.TrimLeftFunc(trimmed, isSpace)
 | 
								src = bytes.TrimLeftFunc(trimmed, isSpace)
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -22,14 +22,17 @@ func Read(dir string, filenames ...string) (envMap map[string]string, err error)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	for _, filename := range filenames {
 | 
						for _, filename := range filenames {
 | 
				
			||||||
		slog.Info("read .env", slog.String("file", filepath.Join(dir, filename)))
 | 
							slog.Info("read .env", slog.String("file", filepath.Join(dir, filename)))
 | 
				
			||||||
		individualEnvMap, individualErr := readFile(filepath.Join(dir, filename))
 | 
							m, er := readFile(filepath.Join(dir, filename))
 | 
				
			||||||
 | 
							if er != nil {
 | 
				
			||||||
		if individualErr != nil {
 | 
								if os.IsNotExist(er) {
 | 
				
			||||||
			err = individualErr
 | 
									slog.Info(".env not found", slog.String("file", filename))
 | 
				
			||||||
 | 
									continue
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
								err = er
 | 
				
			||||||
			return
 | 
								return
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		maps.Copy(envMap, individualEnvMap)
 | 
							maps.Copy(envMap, m)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return
 | 
						return
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -56,7 +56,7 @@ func doubleQuoteEscape(line string) string {
 | 
				
			|||||||
		if c == '\r' {
 | 
							if c == '\r' {
 | 
				
			||||||
			toReplace = `\r`
 | 
								toReplace = `\r`
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		line = strings.Replace(line, string(c), toReplace, -1)
 | 
							line = strings.ReplaceAll(line, string(c), toReplace)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	return line
 | 
						return line
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,36 +5,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
package email
 | 
					package email
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import (
 | 
					 | 
				
			||||||
	"os"
 | 
					 | 
				
			||||||
	"path/filepath"
 | 
					 | 
				
			||||||
	"time"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	"code.patial.tech/go/appcore/open"
 | 
					 | 
				
			||||||
)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
type Transport interface {
 | 
					type Transport interface {
 | 
				
			||||||
	Send(*Message) error
 | 
						Send(*Message) error
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					 | 
				
			||||||
// DumpToTemp transport is for development environment to ensure emails are renderd as HTML ok
 | 
					 | 
				
			||||||
//
 | 
					 | 
				
			||||||
// once dump operation is done it will try to open the html with default app for html
 | 
					 | 
				
			||||||
type DumpToTemp struct{}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
func (DumpToTemp) Send(msg *Message) error {
 | 
					 | 
				
			||||||
	// validate msg first
 | 
					 | 
				
			||||||
	if err := msg.Validate(); err != nil {
 | 
					 | 
				
			||||||
		return err
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	dir := os.TempDir()
 | 
					 | 
				
			||||||
	id := time.Now().Format("20060102T150405999")
 | 
					 | 
				
			||||||
	file := filepath.Join(dir, id+".html")
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	if err := os.WriteFile(file, []byte(msg.HtmlBody), 0440); err != nil {
 | 
					 | 
				
			||||||
		return err
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	return open.WithDefaultApp(file)
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										30
									
								
								email/transport_dump.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										30
									
								
								email/transport_dump.go
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,30 @@
 | 
				
			|||||||
 | 
					package email
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import (
 | 
				
			||||||
 | 
						"os"
 | 
				
			||||||
 | 
						"path/filepath"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						"code.patial.tech/go/appcore/open"
 | 
				
			||||||
 | 
						"github.com/google/uuid"
 | 
				
			||||||
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// DumpToTemp transport is for development environment to ensure emails are renderd as HTML ok
 | 
				
			||||||
 | 
					// once dump operation is done it will try to open the html with default app for html
 | 
				
			||||||
 | 
					type DumpToTemp struct{}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func (DumpToTemp) Send(msg *Message) error {
 | 
				
			||||||
 | 
						// validate msg first
 | 
				
			||||||
 | 
						if err := msg.Validate(); err != nil {
 | 
				
			||||||
 | 
							return err
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						dir := os.TempDir()
 | 
				
			||||||
 | 
						id, _ := uuid.NewV7()
 | 
				
			||||||
 | 
						file := filepath.Join(dir, id.String()+".html")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if err := os.WriteFile(file, []byte(msg.HtmlBody), 0440); err != nil {
 | 
				
			||||||
 | 
							return err
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						return open.WithDefaultApp(file)
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -17,11 +17,12 @@ import (
 | 
				
			|||||||
// SMTP mailer
 | 
					// SMTP mailer
 | 
				
			||||||
type SMTP struct {
 | 
					type SMTP struct {
 | 
				
			||||||
	Host     string
 | 
						Host     string
 | 
				
			||||||
	Port     int
 | 
					 | 
				
			||||||
	Username string
 | 
						Username string
 | 
				
			||||||
	Password string
 | 
						Password string
 | 
				
			||||||
	// Domain name for smtp
 | 
						// Domain name for smtp
 | 
				
			||||||
	Domain string
 | 
						Domain string
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						Port int
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func (t SMTP) Send(msg *Message) error {
 | 
					func (t SMTP) Send(msg *Message) error {
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										15
									
								
								go.mod
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								go.mod
									
									
									
									
									
								
							@@ -1,21 +1,20 @@
 | 
				
			|||||||
module code.patial.tech/go/appcore
 | 
					module code.patial.tech/go/appcore
 | 
				
			||||||
 | 
					
 | 
				
			||||||
go 1.24
 | 
					go 1.25
 | 
				
			||||||
 | 
					
 | 
				
			||||||
require (
 | 
					require (
 | 
				
			||||||
	github.com/go-playground/validator/v10 v10.26.0
 | 
						github.com/go-playground/validator/v10 v10.27.0
 | 
				
			||||||
	github.com/golang-jwt/jwt/v5 v5.2.2
 | 
						github.com/golang-jwt/jwt/v5 v5.3.0
 | 
				
			||||||
	github.com/google/uuid v1.6.0
 | 
						github.com/google/uuid v1.6.0
 | 
				
			||||||
	github.com/sqids/sqids-go v0.4.1
 | 
						github.com/sqids/sqids-go v0.4.1
 | 
				
			||||||
	golang.org/x/crypto v0.39.0
 | 
						golang.org/x/crypto v0.42.0
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
require (
 | 
					require (
 | 
				
			||||||
	github.com/gabriel-vasile/mimetype v1.4.9 // indirect
 | 
						github.com/gabriel-vasile/mimetype v1.4.10 // indirect
 | 
				
			||||||
	github.com/go-playground/locales v0.14.1 // indirect
 | 
						github.com/go-playground/locales v0.14.1 // indirect
 | 
				
			||||||
	github.com/go-playground/universal-translator v0.18.1 // indirect
 | 
						github.com/go-playground/universal-translator v0.18.1 // indirect
 | 
				
			||||||
	github.com/leodido/go-urn v1.4.0 // indirect
 | 
						github.com/leodido/go-urn v1.4.0 // indirect
 | 
				
			||||||
	golang.org/x/net v0.41.0 // indirect
 | 
						golang.org/x/sys v0.36.0 // indirect
 | 
				
			||||||
	golang.org/x/sys v0.33.0 // indirect
 | 
						golang.org/x/text v0.29.0 // indirect
 | 
				
			||||||
	golang.org/x/text v0.26.0 // indirect
 | 
					 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										30
									
								
								go.sum
									
									
									
									
									
								
							
							
						
						
									
										30
									
								
								go.sum
									
									
									
									
									
								
							@@ -1,19 +1,17 @@
 | 
				
			|||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 | 
					github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 | 
				
			||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 | 
					github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 | 
				
			||||||
github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=
 | 
					github.com/gabriel-vasile/mimetype v1.4.10 h1:zyueNbySn/z8mJZHLt6IPw0KoZsiQNszIpU+bX4+ZK0=
 | 
				
			||||||
github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8=
 | 
					github.com/gabriel-vasile/mimetype v1.4.10/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
 | 
				
			||||||
github.com/gabriel-vasile/mimetype v1.4.9 h1:5k+WDwEsD9eTLL8Tz3L0VnmVh9QxGjRmjBvAG7U/oYY=
 | 
					 | 
				
			||||||
github.com/gabriel-vasile/mimetype v1.4.9/go.mod h1:WnSQhFKJuBlRyLiKohA/2DtIlPFAbguNaG7QCHcyGok=
 | 
					 | 
				
			||||||
github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 | 
					github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 | 
				
			||||||
github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 | 
					github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 | 
				
			||||||
github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 | 
					github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 | 
				
			||||||
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 | 
					github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 | 
				
			||||||
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 | 
					github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 | 
				
			||||||
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 | 
					github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 | 
				
			||||||
github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc/iMaVtFbr3Sw2k=
 | 
					github.com/go-playground/validator/v10 v10.27.0 h1:w8+XrWVMhGkxOaaowyKH35gFydVHOvC0/uWoy2Fzwn4=
 | 
				
			||||||
github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
 | 
					github.com/go-playground/validator/v10 v10.27.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
 | 
				
			||||||
github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
 | 
					github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
 | 
				
			||||||
github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 | 
					github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
 | 
				
			||||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 | 
					github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 | 
				
			||||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 | 
					github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 | 
				
			||||||
github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 | 
					github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 | 
				
			||||||
@@ -24,15 +22,11 @@ github.com/sqids/sqids-go v0.4.1 h1:eQKYzmAZbLlRwHeHYPF35QhgxwZHLnlmVj9AkIj/rrw=
 | 
				
			|||||||
github.com/sqids/sqids-go v0.4.1/go.mod h1:EMwHuPQgSNFS0A49jESTfIQS+066XQTVhukrzEPScl8=
 | 
					github.com/sqids/sqids-go v0.4.1/go.mod h1:EMwHuPQgSNFS0A49jESTfIQS+066XQTVhukrzEPScl8=
 | 
				
			||||||
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 | 
					github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 | 
				
			||||||
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 | 
					github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 | 
				
			||||||
golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
 | 
					golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI=
 | 
				
			||||||
golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
 | 
					golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8=
 | 
				
			||||||
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
 | 
					golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
 | 
				
			||||||
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
 | 
					golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 | 
				
			||||||
golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
 | 
					golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
 | 
				
			||||||
golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
 | 
					golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
 | 
				
			||||||
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
 | 
					 | 
				
			||||||
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 | 
					 | 
				
			||||||
golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
 | 
					 | 
				
			||||||
golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
 | 
					 | 
				
			||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 | 
					gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 | 
				
			||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 | 
					gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								gz/gz.go
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								gz/gz.go
									
									
									
									
									
								
							@@ -8,7 +8,6 @@ package gz
 | 
				
			|||||||
import (
 | 
					import (
 | 
				
			||||||
	"bytes"
 | 
						"bytes"
 | 
				
			||||||
	"compress/gzip"
 | 
						"compress/gzip"
 | 
				
			||||||
	"io"
 | 
					 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func Zip(data []byte) ([]byte, error) {
 | 
					func Zip(data []byte) ([]byte, error) {
 | 
				
			||||||
@@ -31,7 +30,6 @@ func Zip(data []byte) ([]byte, error) {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
func UnZip(data []byte) ([]byte, error) {
 | 
					func UnZip(data []byte) ([]byte, error) {
 | 
				
			||||||
	b := bytes.NewBuffer(data)
 | 
						b := bytes.NewBuffer(data)
 | 
				
			||||||
	var r io.Reader
 | 
					 | 
				
			||||||
	r, err := gzip.NewReader(b)
 | 
						r, err := gzip.NewReader(b)
 | 
				
			||||||
	if err != nil {
 | 
						if err != nil {
 | 
				
			||||||
		return nil, err
 | 
							return nil, err
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										51
									
								
								jwt/jwt.go
									
									
									
									
									
								
							
							
						
						
									
										51
									
								
								jwt/jwt.go
									
									
									
									
									
								
							@@ -8,6 +8,7 @@ package jwt
 | 
				
			|||||||
import (
 | 
					import (
 | 
				
			||||||
	"crypto/ed25519"
 | 
						"crypto/ed25519"
 | 
				
			||||||
	"errors"
 | 
						"errors"
 | 
				
			||||||
 | 
						"fmt"
 | 
				
			||||||
	"log"
 | 
						"log"
 | 
				
			||||||
	"maps"
 | 
						"maps"
 | 
				
			||||||
	"time"
 | 
						"time"
 | 
				
			||||||
@@ -15,7 +16,18 @@ import (
 | 
				
			|||||||
	"github.com/golang-jwt/jwt/v5"
 | 
						"github.com/golang-jwt/jwt/v5"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// Sign using EdDSA
 | 
				
			||||||
func Sign(key ed25519.PrivateKey, claims map[string]any, issuer string, d time.Duration) (string, error) {
 | 
					func Sign(key ed25519.PrivateKey, claims map[string]any, issuer string, d time.Duration) (string, error) {
 | 
				
			||||||
 | 
						return SignEdDSA(key, claims, issuer, d)
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func Parse(key ed25519.PrivateKey, tokenString string, issuer string) (jwt.MapClaims, error) {
 | 
				
			||||||
 | 
						return ParseEdDSA(key, tokenString, issuer)
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// SignEdDSA (Edwards-curve Digital Signature Algorithm, typically Ed25519) is an excellent,
 | 
				
			||||||
 | 
					// modern choice for JWT signing—arguably safer and more efficient than both HS256 and traditional RSA/ECDSA.
 | 
				
			||||||
 | 
					func SignEdDSA(key ed25519.PrivateKey, claims map[string]any, issuer string, d time.Duration) (string, error) {
 | 
				
			||||||
	cl := jwt.MapClaims{
 | 
						cl := jwt.MapClaims{
 | 
				
			||||||
		"iss": issuer,
 | 
							"iss": issuer,
 | 
				
			||||||
		"iat": jwt.NewNumericDate(time.Now().UTC()),
 | 
							"iat": jwt.NewNumericDate(time.Now().UTC()),
 | 
				
			||||||
@@ -27,7 +39,7 @@ func Sign(key ed25519.PrivateKey, claims map[string]any, issuer string, d time.D
 | 
				
			|||||||
	return t.SignedString(key)
 | 
						return t.SignedString(key)
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func Parse(key ed25519.PrivateKey, tokenString string, issuer string) (jwt.MapClaims, error) {
 | 
					func ParseEdDSA(key ed25519.PrivateKey, tokenString string, issuer string) (jwt.MapClaims, error) {
 | 
				
			||||||
	token, err := jwt.Parse(
 | 
						token, err := jwt.Parse(
 | 
				
			||||||
		tokenString,
 | 
							tokenString,
 | 
				
			||||||
		func(token *jwt.Token) (any, error) {
 | 
							func(token *jwt.Token) (any, error) {
 | 
				
			||||||
@@ -48,3 +60,40 @@ func Parse(key ed25519.PrivateKey, tokenString string, issuer string) (jwt.MapCl
 | 
				
			|||||||
		return nil, errors.New("no claims found")
 | 
							return nil, errors.New("no claims found")
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func SignHS256(secret []byte, claims map[string]any, issuer string, d time.Duration) (string, error) {
 | 
				
			||||||
 | 
						cl := jwt.MapClaims{
 | 
				
			||||||
 | 
							"iss": issuer,
 | 
				
			||||||
 | 
							"iat": jwt.NewNumericDate(time.Now().UTC()),
 | 
				
			||||||
 | 
							"exp": jwt.NewNumericDate(time.Now().Add(d)),
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						maps.Copy(cl, claims)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						t := jwt.NewWithClaims(jwt.SigningMethodHS256, cl)
 | 
				
			||||||
 | 
						return t.SignedString(secret)
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func ParseHS256(secret []byte, tokenString string, issuer string) (jwt.MapClaims, error) {
 | 
				
			||||||
 | 
						token, err := jwt.Parse(
 | 
				
			||||||
 | 
							tokenString,
 | 
				
			||||||
 | 
							func(token *jwt.Token) (any, error) {
 | 
				
			||||||
 | 
								if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
 | 
				
			||||||
 | 
									return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
 | 
								return secret, nil
 | 
				
			||||||
 | 
							},
 | 
				
			||||||
 | 
							jwt.WithValidMethods([]string{jwt.SigningMethodHS256.Alg()}),
 | 
				
			||||||
 | 
							jwt.WithIssuer(issuer),
 | 
				
			||||||
 | 
							jwt.WithIssuedAt(),
 | 
				
			||||||
 | 
							jwt.WithExpirationRequired(),
 | 
				
			||||||
 | 
						)
 | 
				
			||||||
 | 
						if err != nil {
 | 
				
			||||||
 | 
							log.Fatal(err)
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if claims, ok := token.Claims.(jwt.MapClaims); ok {
 | 
				
			||||||
 | 
							return claims, nil
 | 
				
			||||||
 | 
						} else {
 | 
				
			||||||
 | 
							return nil, errors.New("no claims found")
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -60,3 +60,28 @@ MC4CAQAwBQYDK2VwBCIEIMMkYUKJ9P0gp+Rm9mR4i0KUBT9nFUzxzxjH7sC0xq/F
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	fmt.Printf("%v", claims)
 | 
						fmt.Printf("%v", claims)
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func TestHS256(t *testing.T) {
 | 
				
			||||||
 | 
						secret := []byte("c4c5fcb25e289e7a23763b013f04fd11b6b0247729216bb98d07f58332360aec")
 | 
				
			||||||
 | 
						claims := map[string]any{
 | 
				
			||||||
 | 
							"id":    1,
 | 
				
			||||||
 | 
							"email": "aa@aa.com",
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						issuer := "pat"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						// Sign
 | 
				
			||||||
 | 
						jwt, err := SignHS256(secret, claims, issuer, time.Second)
 | 
				
			||||||
 | 
						if err != nil {
 | 
				
			||||||
 | 
							t.Error(err)
 | 
				
			||||||
 | 
							return
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						t.Log("jwt", jwt)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						// Parse
 | 
				
			||||||
 | 
						_, err = ParseHS256(secret, jwt, issuer)
 | 
				
			||||||
 | 
						if err != nil {
 | 
				
			||||||
 | 
							t.Error(err)
 | 
				
			||||||
 | 
							return
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,5 +1,3 @@
 | 
				
			|||||||
//go:build darwin
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
package open
 | 
					package open
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import (
 | 
					import (
 | 
				
			||||||
@@ -1,5 +1,3 @@
 | 
				
			|||||||
//go:build linux
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
package open
 | 
					package open
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import (
 | 
					import (
 | 
				
			||||||
@@ -1,5 +1,3 @@
 | 
				
			|||||||
//go:build windows
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
package open
 | 
					package open
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import (
 | 
					import (
 | 
				
			||||||
							
								
								
									
										35
									
								
								ptr/ptr.go
									
									
									
									
									
								
							
							
						
						
									
										35
									
								
								ptr/ptr.go
									
									
									
									
									
								
							@@ -7,15 +7,24 @@ package ptr
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
import "strings"
 | 
					import "strings"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func Ref[T string | bool | Num](v T) *T {
 | 
				
			||||||
 | 
						return &v
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func Deref[T any](v *T) T {
 | 
				
			||||||
 | 
						if v == nil {
 | 
				
			||||||
 | 
							var a T
 | 
				
			||||||
 | 
							return a
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						return *v
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func Bool(v bool) *bool {
 | 
					func Bool(v bool) *bool {
 | 
				
			||||||
	return &v
 | 
						return &v
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func GetBool(v *bool) bool {
 | 
					func GetBool(v *bool) bool {
 | 
				
			||||||
	if v == nil {
 | 
						return Deref(v)
 | 
				
			||||||
		return false
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
	return *v
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func Str(v string) *string {
 | 
					func Str(v string) *string {
 | 
				
			||||||
@@ -23,10 +32,7 @@ func Str(v string) *string {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func GetStr(v *string) string {
 | 
					func GetStr(v *string) string {
 | 
				
			||||||
	if v == nil {
 | 
						return Deref(v)
 | 
				
			||||||
		return ""
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
	return *v
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func StrTrim(v *string) *string {
 | 
					func StrTrim(v *string) *string {
 | 
				
			||||||
@@ -38,17 +44,14 @@ func StrTrim(v *string) *string {
 | 
				
			|||||||
	return v
 | 
						return v
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
type N interface {
 | 
					type Num interface {
 | 
				
			||||||
	uint8 | int8 | uint16 | int16 | uint | int | uint32 | int32 | uint64 | int64 | float32 | float64
 | 
						uint8 | int8 | uint16 | int16 | uint32 | int32 | uint64 | int64 | uint | int | float32 | float64
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func Number[T N](v T) *T {
 | 
					func Number[T Num](v T) *T {
 | 
				
			||||||
	return &v
 | 
						return &v
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func GetNumber[T N](v *T) T {
 | 
					func GetNumber[T Num](v *T) T {
 | 
				
			||||||
	if v == nil {
 | 
						return Deref(v)
 | 
				
			||||||
		return 0
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
	return *v
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										36
									
								
								ptr/ptr_test.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										36
									
								
								ptr/ptr_test.go
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,36 @@
 | 
				
			|||||||
 | 
					package ptr
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import "testing"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func TestRefDeref(t *testing.T) {
 | 
				
			||||||
 | 
						a := 10
 | 
				
			||||||
 | 
						if Deref(Ref(a)) != a {
 | 
				
			||||||
 | 
							t.Log("a) had a issue")
 | 
				
			||||||
 | 
							return
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						b := 10.1
 | 
				
			||||||
 | 
						if Deref(Ref(b)) != b {
 | 
				
			||||||
 | 
							t.Log("b) had a issue")
 | 
				
			||||||
 | 
							return
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						c := true
 | 
				
			||||||
 | 
						if Deref(Ref(c)) != c {
 | 
				
			||||||
 | 
							t.Log("c) had a issue")
 | 
				
			||||||
 | 
							return
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						d := "hello there"
 | 
				
			||||||
 | 
						if Deref(Ref(d)) != d {
 | 
				
			||||||
 | 
							t.Log("d) had a issue")
 | 
				
			||||||
 | 
							return
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						var e string
 | 
				
			||||||
 | 
						if Deref(Ref(e)) != e {
 | 
				
			||||||
 | 
							t.Log("e) had a issue")
 | 
				
			||||||
 | 
							return
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -14,12 +14,15 @@ import (
 | 
				
			|||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
type Pager struct {
 | 
					type Pager struct {
 | 
				
			||||||
	Search      string
 | 
					 | 
				
			||||||
	OrderBy  *string `json:"orderBy"`
 | 
						OrderBy  *string `json:"orderBy"`
 | 
				
			||||||
	OrderAsc *bool   `json:"orderAsc"`
 | 
						OrderAsc *bool   `json:"orderAsc"`
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						Search string
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	Page  int `json:"page"`
 | 
						Page  int `json:"page"`
 | 
				
			||||||
	Size  int `json:"size"`
 | 
						Size  int `json:"size"`
 | 
				
			||||||
	Total int `json:"total"`
 | 
						Total int `json:"total"`
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	TotalNeeded bool `json:"-"`
 | 
						TotalNeeded bool `json:"-"`
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -8,6 +8,7 @@ package response
 | 
				
			|||||||
import (
 | 
					import (
 | 
				
			||||||
	"encoding/json"
 | 
						"encoding/json"
 | 
				
			||||||
	"fmt"
 | 
						"fmt"
 | 
				
			||||||
 | 
						"log/slog"
 | 
				
			||||||
	"net/http"
 | 
						"net/http"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	"code.patial.tech/go/appcore/request"
 | 
						"code.patial.tech/go/appcore/request"
 | 
				
			||||||
@@ -49,7 +50,10 @@ func reply(w http.ResponseWriter, data any, p *request.Pager) {
 | 
				
			|||||||
	// if data is nil, let's pass it on as null
 | 
						// if data is nil, let's pass it on as null
 | 
				
			||||||
	if data == nil {
 | 
						if data == nil {
 | 
				
			||||||
		w.WriteHeader(http.StatusOK)
 | 
							w.WriteHeader(http.StatusOK)
 | 
				
			||||||
		w.Write([]byte("{\"data\":null}"))
 | 
							_, writeErr := fmt.Fprint(w, "{\"data\":null}")
 | 
				
			||||||
 | 
							if writeErr != nil {
 | 
				
			||||||
 | 
								slog.Error(writeErr.Error())
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
		return
 | 
							return
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -64,30 +68,45 @@ func reply(w http.ResponseWriter, data any, p *request.Pager) {
 | 
				
			|||||||
func BadRequest(w http.ResponseWriter, err error) {
 | 
					func BadRequest(w http.ResponseWriter, err error) {
 | 
				
			||||||
	w.Header().Set("Content-Type", "application/json")
 | 
						w.Header().Set("Content-Type", "application/json")
 | 
				
			||||||
	w.WriteHeader(http.StatusBadRequest)
 | 
						w.WriteHeader(http.StatusBadRequest)
 | 
				
			||||||
	w.Write(fmt.Appendf(nil, "{\"error\": %q}", err.Error()))
 | 
						_, writeErr := fmt.Fprintf(w, "{\"error\": %q}", err.Error())
 | 
				
			||||||
 | 
						if writeErr != nil {
 | 
				
			||||||
 | 
							slog.Error(writeErr.Error())
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func InternalServerError(w http.ResponseWriter, err error) {
 | 
					func InternalServerError(w http.ResponseWriter, err error) {
 | 
				
			||||||
	w.Header().Set("Content-Type", "application/json")
 | 
						w.Header().Set("Content-Type", "application/json")
 | 
				
			||||||
	w.WriteHeader(http.StatusInternalServerError)
 | 
						w.WriteHeader(http.StatusInternalServerError)
 | 
				
			||||||
	w.Write(fmt.Appendf(nil, "{\"error\": %q}", err.Error()))
 | 
						_, writeErr := fmt.Fprintf(w, "{\"error\": %q}", err.Error())
 | 
				
			||||||
 | 
						if writeErr != nil {
 | 
				
			||||||
 | 
							slog.Error(writeErr.Error())
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func SessionExpired(w http.ResponseWriter) {
 | 
					func SessionExpired(w http.ResponseWriter) {
 | 
				
			||||||
	w.Header().Set("Content-Type", "application/json")
 | 
						w.Header().Set("Content-Type", "application/json")
 | 
				
			||||||
	w.WriteHeader(http.StatusUnauthorized)
 | 
						w.WriteHeader(http.StatusUnauthorized)
 | 
				
			||||||
	w.Write([]byte("{\"error\": \"Session is expired, please login again\"}"))
 | 
						_, writeErr := fmt.Fprint(w, "{\"error\": \"Session is expired, please login again\"}")
 | 
				
			||||||
 | 
						if writeErr != nil {
 | 
				
			||||||
 | 
							slog.Error(writeErr.Error())
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func NotAutorized(w http.ResponseWriter) {
 | 
					func NotAutorized(w http.ResponseWriter) {
 | 
				
			||||||
	w.Header().Set("Content-Type", "application/json")
 | 
						w.Header().Set("Content-Type", "application/json")
 | 
				
			||||||
	w.WriteHeader(http.StatusBadRequest)
 | 
						w.WriteHeader(http.StatusBadRequest)
 | 
				
			||||||
	w.Write([]byte("{\"error\": \"You are not authorized to perform this action\"}"))
 | 
						_, writeErr := fmt.Fprint(w, "{\"error\": \"You are not authorized to perform this action\"}")
 | 
				
			||||||
 | 
						if writeErr != nil {
 | 
				
			||||||
 | 
							slog.Error(writeErr.Error())
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Forbidden response error
 | 
					// Forbidden response error
 | 
				
			||||||
func Forbidden(w http.ResponseWriter, err error) {
 | 
					func Forbidden(w http.ResponseWriter, err error) {
 | 
				
			||||||
	w.Header().Set("Content-Type", "application/json")
 | 
						w.Header().Set("Content-Type", "application/json")
 | 
				
			||||||
	w.WriteHeader(http.StatusForbidden)
 | 
						w.WriteHeader(http.StatusForbidden)
 | 
				
			||||||
	w.Write(fmt.Appendf(nil, "{\"error\": %q}", err.Error()))
 | 
						_, writeErr := fmt.Fprintf(w, "{\"error\": %q}", err.Error())
 | 
				
			||||||
 | 
						if writeErr != nil {
 | 
				
			||||||
 | 
							slog.Error(writeErr.Error())
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -12,7 +12,7 @@ import (
 | 
				
			|||||||
func Map(obj any) map[string]any {
 | 
					func Map(obj any) map[string]any {
 | 
				
			||||||
	result := make(map[string]any)
 | 
						result := make(map[string]any)
 | 
				
			||||||
	val := reflect.ValueOf(obj)
 | 
						val := reflect.ValueOf(obj)
 | 
				
			||||||
	if val.Kind() == reflect.Ptr {
 | 
						if val.Kind() == reflect.Pointer {
 | 
				
			||||||
		val = val.Elem()
 | 
							val = val.Elem()
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,6 +6,8 @@
 | 
				
			|||||||
package validate
 | 
					package validate
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import (
 | 
					import (
 | 
				
			||||||
 | 
						"errors"
 | 
				
			||||||
 | 
						"fmt"
 | 
				
			||||||
	"reflect"
 | 
						"reflect"
 | 
				
			||||||
	"strings"
 | 
						"strings"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -24,8 +26,51 @@ func init() {
 | 
				
			|||||||
		}
 | 
							}
 | 
				
			||||||
		return name
 | 
							return name
 | 
				
			||||||
	})
 | 
						})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func Struct(s any) error {
 | 
					// RegisterAlias for single/multuple tags
 | 
				
			||||||
	return validate.Struct(s)
 | 
					func RegisterAlias(alias, tags string) {
 | 
				
			||||||
 | 
						validate.RegisterAlias(alias, tags)
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func RegisterValidation(tagName string, fn validator.Func, callValidationEvenIfNull ...bool) {
 | 
				
			||||||
 | 
						validate.RegisterValidation(tagName, fn, callValidationEvenIfNull...)
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// Struct validator
 | 
				
			||||||
 | 
					func Struct(s any) error {
 | 
				
			||||||
 | 
						err := validate.Struct(s)
 | 
				
			||||||
 | 
						if IsInvalidValidationError(err) {
 | 
				
			||||||
 | 
							return err
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						var valErrs validator.ValidationErrors
 | 
				
			||||||
 | 
						if !errors.As(err, &valErrs) {
 | 
				
			||||||
 | 
							return err
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						var sb strings.Builder
 | 
				
			||||||
 | 
						for _, err := range valErrs {
 | 
				
			||||||
 | 
							switch err.Tag() {
 | 
				
			||||||
 | 
							case "required":
 | 
				
			||||||
 | 
								sb.WriteString(fmt.Sprintf("%s: is required.\n", err.Field()))
 | 
				
			||||||
 | 
							case "email":
 | 
				
			||||||
 | 
								sb.WriteString(fmt.Sprintf("%s: is invalid.\n", err.Field()))
 | 
				
			||||||
 | 
							default:
 | 
				
			||||||
 | 
								sb.WriteString(fmt.Sprintf("%s: %q validation failed.\n", err.Field(), err.Tag()))
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						return errors.New(sb.String())
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					// Map validator
 | 
				
			||||||
 | 
					func Map(data map[string]any, rules map[string]any) map[string]any {
 | 
				
			||||||
 | 
						return validate.ValidateMap(data, rules)
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func IsInvalidValidationError(err error) bool {
 | 
				
			||||||
 | 
						var v *validator.InvalidValidationError
 | 
				
			||||||
 | 
						return errors.As(err, &v)
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										30
									
								
								validate/validate_test.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										30
									
								
								validate/validate_test.go
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,30 @@
 | 
				
			|||||||
 | 
					package validate
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import "testing"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func TestStruct(t *testing.T) {
 | 
				
			||||||
 | 
						type person struct {
 | 
				
			||||||
 | 
							FirstName string `validate:"required,max=10"`
 | 
				
			||||||
 | 
							LastName  string `validate:"required"`
 | 
				
			||||||
 | 
							Email     string `validate:"email"`
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						var p *person
 | 
				
			||||||
 | 
						t.Log("check for nil value")
 | 
				
			||||||
 | 
						if err := Struct(p); err == nil {
 | 
				
			||||||
 | 
							t.Fatal("nil value must report and error")
 | 
				
			||||||
 | 
						} else {
 | 
				
			||||||
 | 
							t.Log(err.Error())
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						p = new(person)
 | 
				
			||||||
 | 
						t.Log("validation checks")
 | 
				
			||||||
 | 
						if err := Struct(p); err == nil {
 | 
				
			||||||
 | 
							t.Error(err)
 | 
				
			||||||
 | 
						} else {
 | 
				
			||||||
 | 
							t.Log(err)
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						// Structure error string
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
		Reference in New Issue
	
	Block a user