ruidy/rentease
1
0
Fork 0
mirror of https://github.com/rjNemo/rentease.git synced 2026-06-12 13:46:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

make origin a config change api sync url

Browse source
This commit is contained in:
Ruidy 2024-06-02 11:59:07 +02:00
parent c3c52cfbf7
commit 8c4a1554ca
No known key found for this signature in database
GPG key ID: E00F51288CB857CC
4 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
internal/server/handle_api_extension.go Normal file
View file

@ -0,0 +1 @@
package server

2
internal/server/routes.go
View file

@ -12,6 +12,8 @@ func (s Server) MountHandlers() {
s.Router.GET("/debug/pprof/*", echo.WrapHandler(http.DefaultServeMux)) s.Router.GET("/debug/pprof/*", echo.WrapHandler(http.DefaultServeMux))
s.Router.GET("/", handleLoginPage()) s.Router.GET("/", handleLoginPage())
s.Router.POST("/", handleLogin(s.as)) s.Router.POST("/", handleLogin(s.as))
// TODO: turn it to private using an API key?
s.Router.POST("/api/sync", handleSync())
// admin // admin
g := s.Router.Group("") g := s.Router.Group("")
g.Use(MakeAuthMiddleware()) g.Use(MakeAuthMiddleware())

14
internal/server/server.go
View file

@ -40,6 +40,7 @@ type options struct {
fs *embed.FS fs *embed.FS
debug *bool debug *bool
secretKey *string secretKey *string
origins []string
} }
type Option func(*options) error type Option func(*options) error
@ -75,6 +76,13 @@ func WithSecretKey(secretKey string) Option {
} }
} }
func WithOrigins(origins []string) Option {
return func(o *options) error {
o.origins = origins
return nil
}
}
func New(bs *booking.Service, as *auth.Service, ps *pdf.PdfService, hc *config.Host, opts ...Option) (*Server, error) { func New(bs *booking.Service, as *auth.Service, ps *pdf.PdfService, hc *config.Host, opts ...Option) (*Server, error) {
option := new(options) option := new(options)
for _, opt := range opts { for _, opt := range opts {
@ -85,7 +93,7 @@ func New(bs *booking.Service, as *auth.Service, ps *pdf.PdfService, hc *config.H
} }
s := &Server{ s := &Server{
Router: NewRouter(*option.fs, *option.debug, *option.secretKey), Router: NewRouter(*option.fs, *option.debug, *option.secretKey, option.origins),
bs: bs, bs: bs,
as: as, as: as,
ps: ps, ps: ps,
@ -127,7 +135,7 @@ func renderTempl(c echo.Context, status int, t templ.Component) error {
return nil return nil
} }
func NewRouter(fs embed.FS, debug bool, secret string) *echo.Echo { func NewRouter(fs embed.FS, debug bool, secret string, origins []string) *echo.Echo {
e := echo.New() e := echo.New()
// config // config
e.HideBanner = true e.HideBanner = true
@ -155,7 +163,7 @@ func NewRouter(fs embed.FS, debug bool, secret string) *echo.Echo {
e.Use(middleware.Recover()) e.Use(middleware.Recover())
e.Use(middleware.Secure()) e.Use(middleware.Secure())
e.Use(middleware.Gzip()) e.Use(middleware.Gzip())
// e.Use(middleware.CSRF()) e.Use(middleware.CORSWithConfig(middleware.CORSConfig{AllowOrigins: origins}))
e.Use(sentryecho.New(sentryecho.Options{})) e.Use(sentryecho.New(sentryecho.Options{}))
e.Use(SentryTracingMiddleware) e.Use(SentryTracingMiddleware)
e.Use(session.Middleware(sessions.NewCookieStore([]byte(secret)))) e.Use(session.Middleware(sessions.NewCookieStore([]byte(secret))))

7
main.go
View file

@ -62,7 +62,7 @@ func run(ctx context.Context, getEnv func(string) string) error {
return fmt.Errorf("error starting pdf service %s", err) return fmt.Errorf("error starting pdf service %s", err)
} }
as := auth.NewService(os.Getenv("SESSION_SECRET"), getEnv("ADMIN"), getEnv("ADMIN_SECRET")) as := auth.NewService(getEnv("SESSION_SECRET"), getEnv("ADMIN"), getEnv("ADMIN_SECRET"))
p := getEnv("PORT") p := getEnv("PORT")
port, err := strconv.Atoi(p) port, err := strconv.Atoi(p)
@ -70,9 +70,12 @@ func run(ctx context.Context, getEnv func(string) string) error {
return fmt.Errorf("error parsing PORT env %s", err) return fmt.Errorf("error parsing PORT env %s", err)
} }
ogs := getEnv("ORIGINS")
origins := strings.Split(ogs, ",")
srv, err := server.New( srv, err := server.New(
booking.NewService(db), as, ps, config.NewHost(), booking.NewService(db), as, ps, config.NewHost(),
server.WithPort(port), server.WithFileSystem(static), server.WithDebug(strings.ToLower(getEnv("DEBUG")) == "true"), server.WithSecretKey(getEnv("SECRET_KEY"))) server.WithPort(port), server.WithFileSystem(static), server.WithDebug(strings.ToLower(getEnv("DEBUG")) == "true"), server.WithSecretKey(getEnv("SECRET_KEY")), server.WithOrigins(origins))
if err != nil { if err != nil {
return fmt.Errorf("error starting server %s", err) return fmt.Errorf("error starting server %s", err)
} }