From b426a1529e8a96db89ef1780d3944b7a026d3edd Mon Sep 17 00:00:00 2001 From: Stavros Date: Wed, 29 Apr 2026 19:27:38 +0300 Subject: [PATCH] fix: fix bootstrap import issues --- internal/bootstrap/app_bootstrap.go | 32 ++++++++++++------------- internal/bootstrap/router_bootstrap.go | 4 ++-- internal/bootstrap/service_bootstrap.go | 20 ++++++++-------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/internal/bootstrap/app_bootstrap.go b/internal/bootstrap/app_bootstrap.go index 3879c05..252d75b 100644 --- a/internal/bootstrap/app_bootstrap.go +++ b/internal/bootstrap/app_bootstrap.go @@ -12,15 +12,15 @@ import ( "strings" "time" - "github.com/tinyauthapp/tinyauth/internal/config" "github.com/tinyauthapp/tinyauth/internal/controller" + "github.com/tinyauthapp/tinyauth/internal/model" "github.com/tinyauthapp/tinyauth/internal/repository" "github.com/tinyauthapp/tinyauth/internal/utils" "github.com/tinyauthapp/tinyauth/internal/utils/tlog" ) type BootstrapApp struct { - config config.Config + config model.Config context struct { appUrl string uuid string @@ -29,15 +29,15 @@ type BootstrapApp struct { csrfCookieName string redirectCookieName string oauthSessionCookieName string - users []config.User - oauthProviders map[string]config.OAuthServiceConfig + localUsers []model.LocalUser + oauthProviders map[string]model.OAuthServiceConfig configuredProviders []controller.Provider - oidcClients []config.OIDCClientConfig + oidcClients []model.OIDCClientConfig } services Services } -func NewBootstrapApp(config config.Config) *BootstrapApp { +func NewBootstrapApp(config model.Config) *BootstrapApp { return &BootstrapApp{ config: config, } @@ -69,7 +69,7 @@ func (app *BootstrapApp) Setup() error { return err } - app.context.users = users + app.context.localUsers = *users // Setup OAuth providers app.context.oauthProviders = app.config.OAuth.Providers @@ -88,7 +88,7 @@ func (app *BootstrapApp) Setup() error { for id, provider := range app.context.oauthProviders { if provider.Name == "" { - if name, ok := config.OverrideProviders[id]; ok { + if name, ok := model.OverrideProviders[id]; ok { provider.Name = name } else { provider.Name = utils.Capitalize(id) @@ -115,14 +115,14 @@ func (app *BootstrapApp) Setup() error { // Cookie names app.context.uuid = utils.GenerateUUID(appUrl.Hostname()) cookieId := strings.Split(app.context.uuid, "-")[0] - app.context.sessionCookieName = fmt.Sprintf("%s-%s", config.SessionCookieName, cookieId) - app.context.csrfCookieName = fmt.Sprintf("%s-%s", config.CSRFCookieName, cookieId) - app.context.redirectCookieName = fmt.Sprintf("%s-%s", config.RedirectCookieName, cookieId) - app.context.oauthSessionCookieName = fmt.Sprintf("%s-%s", config.OAuthSessionCookieName, cookieId) + app.context.sessionCookieName = fmt.Sprintf("%s-%s", model.SessionCookieName, cookieId) + app.context.csrfCookieName = fmt.Sprintf("%s-%s", model.CSRFCookieName, cookieId) + app.context.redirectCookieName = fmt.Sprintf("%s-%s", model.RedirectCookieName, cookieId) + app.context.oauthSessionCookieName = fmt.Sprintf("%s-%s", model.OAuthSessionCookieName, cookieId) // Dumps tlog.App.Trace().Interface("config", app.config).Msg("Config dump") - tlog.App.Trace().Interface("users", app.context.users).Msg("Users dump") + tlog.App.Trace().Interface("users", app.context.localUsers).Msg("Users dump") tlog.App.Trace().Interface("oauthProviders", app.context.oauthProviders).Msg("OAuth providers dump") tlog.App.Trace().Str("cookieDomain", app.context.cookieDomain).Msg("Cookie domain") tlog.App.Trace().Str("sessionCookieName", app.context.sessionCookieName).Msg("Session cookie name") @@ -171,7 +171,7 @@ func (app *BootstrapApp) Setup() error { }) } - if services.authService.LdapAuthConfigured() { + if services.authService.LDAPAuthConfigured() { configuredProviders = append(configuredProviders, controller.Provider{ Name: "LDAP", ID: "ldap", @@ -244,7 +244,7 @@ func (app *BootstrapApp) heartbeatRoutine() { var body heartbeat body.UUID = app.context.uuid - body.Version = config.Version + body.Version = model.Version bodyJson, err := json.Marshal(body) @@ -257,7 +257,7 @@ func (app *BootstrapApp) heartbeatRoutine() { Timeout: 30 * time.Second, // The server should never take more than 30 seconds to respond } - heartbeatURL := config.ApiServer + "/v1/instances/heartbeat" + heartbeatURL := model.APIServer + "/v1/instances/heartbeat" for range ticker.C { tlog.App.Debug().Msg("Sending heartbeat") diff --git a/internal/bootstrap/router_bootstrap.go b/internal/bootstrap/router_bootstrap.go index 91d36ac..0a9eda1 100644 --- a/internal/bootstrap/router_bootstrap.go +++ b/internal/bootstrap/router_bootstrap.go @@ -4,9 +4,9 @@ import ( "fmt" "slices" - "github.com/tinyauthapp/tinyauth/internal/config" "github.com/tinyauthapp/tinyauth/internal/controller" "github.com/tinyauthapp/tinyauth/internal/middleware" + "github.com/tinyauthapp/tinyauth/internal/model" "github.com/gin-gonic/gin" ) @@ -14,7 +14,7 @@ import ( var DEV_MODES = []string{"main", "test", "development"} func (app *BootstrapApp) setupRouter() (*gin.Engine, error) { - if !slices.Contains(DEV_MODES, config.Version) { + if !slices.Contains(DEV_MODES, model.Version) { gin.SetMode(gin.ReleaseMode) } diff --git a/internal/bootstrap/service_bootstrap.go b/internal/bootstrap/service_bootstrap.go index 91e2b50..fc2357b 100644 --- a/internal/bootstrap/service_bootstrap.go +++ b/internal/bootstrap/service_bootstrap.go @@ -22,14 +22,14 @@ func (app *BootstrapApp) initServices(queries *repository.Queries) (Services, er services := Services{} ldapService := service.NewLdapService(service.LdapServiceConfig{ - Address: app.config.Ldap.Address, - BindDN: app.config.Ldap.BindDN, - BindPassword: app.config.Ldap.BindPassword, - BaseDN: app.config.Ldap.BaseDN, - Insecure: app.config.Ldap.Insecure, - SearchFilter: app.config.Ldap.SearchFilter, - AuthCert: app.config.Ldap.AuthCert, - AuthKey: app.config.Ldap.AuthKey, + Address: app.config.LDAP.Address, + BindDN: app.config.LDAP.BindDN, + BindPassword: app.config.LDAP.BindPassword, + BaseDN: app.config.LDAP.BaseDN, + Insecure: app.config.LDAP.Insecure, + SearchFilter: app.config.LDAP.SearchFilter, + AuthCert: app.config.LDAP.AuthCert, + AuthKey: app.config.LDAP.AuthKey, }) err := ldapService.Init() @@ -89,7 +89,7 @@ func (app *BootstrapApp) initServices(queries *repository.Queries) (Services, er services.oauthBrokerService = oauthBrokerService authService := service.NewAuthService(service.AuthServiceConfig{ - Users: app.context.users, + LocalUsers: app.context.localUsers, OauthWhitelist: app.config.OAuth.Whitelist, SessionExpiry: app.config.Auth.SessionExpiry, SessionMaxLifetime: app.config.Auth.SessionMaxLifetime, @@ -99,7 +99,7 @@ func (app *BootstrapApp) initServices(queries *repository.Queries) (Services, er LoginMaxRetries: app.config.Auth.LoginMaxRetries, SessionCookieName: app.context.sessionCookieName, IP: app.config.Auth.IP, - LDAPGroupsCacheTTL: app.config.Ldap.GroupCacheTTL, + LDAPGroupsCacheTTL: app.config.LDAP.GroupCacheTTL, }, services.ldapService, queries, services.oauthBrokerService) err = authService.Init()