barbercollie/tinyauth
1
0
Fork 1
mirror of https://github.com/steveiliop56/tinyauth.git synced 2026-02-28 03:42:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: auto generate redirect url if empty

Browse Source
This commit is contained in:
Stavros
2026-02-02 15:46:02 +02:00
parent 7ca79d4532
commit fb671139cd
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -71,6 +71,10 @@ develop-infisical:
prod: prod:
docker compose -f $(PROD_COMPOSE) up --force-recreate --pull=always --remove-orphans docker compose -f $(PROD_COMPOSE) up --force-recreate --pull=always --remove-orphans
# Production - Infisical
prod-infisical:
infisical run --env=dev -- docker compose -f $(PROD_COMPOSE) up --force-recreate --pull=always --remove-orphans
# SQL # SQL
.PHONY: sql .PHONY: sql
sql: sql:

26
internal/bootstrap/app_bootstrap.go
View File

@@ -22,6 +22,7 @@ import (
type BootstrapApp struct { type BootstrapApp struct {
config config.Config config config.Config
context struct { context struct {
appUrl string
uuid string uuid string
cookieDomain string cookieDomain string
sessionCookieName string sessionCookieName string
@@ -42,10 +43,20 @@ func NewBootstrapApp(config config.Config) *BootstrapApp {
} }
func (app *BootstrapApp) Setup() error { func (app *BootstrapApp) Setup() error {
// get app url
appUrl, err := url.Parse(app.config.AppURL)
if err != nil {
return err
}
app.context.appUrl = appUrl.Scheme + "://" + appUrl.Host
// validate session config // validate session config
if app.config.Auth.SessionMaxLifetime != 0 && app.config.Auth.SessionMaxLifetime < app.config.Auth.SessionExpiry { if app.config.Auth.SessionMaxLifetime != 0 && app.config.Auth.SessionMaxLifetime < app.config.Auth.SessionExpiry {
return fmt.Errorf("session max lifetime cannot be less than session expiry") return fmt.Errorf("session max lifetime cannot be less than session expiry")
} }
// Parse users // Parse users
users, err := utils.GetUsers(app.config.Auth.Users, app.config.Auth.UsersFile) users, err := utils.GetUsers(app.config.Auth.Users, app.config.Auth.UsersFile)
@@ -62,16 +73,12 @@ func (app *BootstrapApp) Setup() error {
secret := utils.GetSecret(provider.ClientSecret, provider.ClientSecretFile) secret := utils.GetSecret(provider.ClientSecret, provider.ClientSecretFile)
provider.ClientSecret = secret provider.ClientSecret = secret
provider.ClientSecretFile = "" provider.ClientSecretFile = ""
app.context.oauthProviders[name] = provider
}
for id := range config.OverrideProviders { if provider.RedirectURL == "" {
if provider, exists := app.context.oauthProviders[id]; exists { provider.RedirectURL = app.context.appUrl + "/api/oauth/callback/" + name
if provider.RedirectURL == "" {
provider.RedirectURL = app.config.AppURL + "/api/oauth/callback/" + id
app.context.oauthProviders[id] = provider
}
} }
app.context.oauthProviders[name] = provider
} }
for id, provider := range app.context.oauthProviders { for id, provider := range app.context.oauthProviders {
@@ -92,7 +99,7 @@ func (app *BootstrapApp) Setup() error {
} }
// Get cookie domain // Get cookie domain
cookieDomain, err := utils.GetCookieDomain(app.config.AppURL) cookieDomain, err := utils.GetCookieDomain(app.context.appUrl)
if err != nil { if err != nil {
return err return err
@@ -101,7 +108,6 @@ func (app *BootstrapApp) Setup() error {
app.context.cookieDomain = cookieDomain app.context.cookieDomain = cookieDomain
// Cookie names // Cookie names
appUrl, _ := url.Parse(app.config.AppURL) // Already validated
app.context.uuid = utils.GenerateUUID(appUrl.Hostname()) app.context.uuid = utils.GenerateUUID(appUrl.Hostname())
cookieId := strings.Split(app.context.uuid, "-")[0] cookieId := strings.Split(app.context.uuid, "-")[0]
app.context.sessionCookieName = fmt.Sprintf("%s-%s", config.SessionCookieName, cookieId) app.context.sessionCookieName = fmt.Sprintf("%s-%s", config.SessionCookieName, cookieId)