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

fix: fix conflicts

Browse Source
This commit is contained in:
Stavros
2026-05-07 16:17:11 +03:00
parent 0c31fb0600
commit f8fb7d678b
3 changed files with 4 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/bootstrap/service_bootstrap.go
+1 -6
View File
@@ -89,13 +89,8 @@ func (app *BootstrapApp) initServices(queries *repository.Queries) (Services, er
services.oauthBrokerService = oauthBrokerService
authService := service.NewAuthService(service.AuthServiceConfig{
<<<<<<< HEAD
Users: app.context.users,
OauthWhitelist: app.context.oauthWhitelist,
=======
LocalUsers: app.context.localUsers,
OauthWhitelist: app.config.OAuth.Whitelist,
>>>>>>> main
OauthWhitelist: app.context.oauthWhitelist,
SessionExpiry: app.config.Auth.SessionExpiry,
SessionMaxLifetime: app.config.Auth.SessionMaxLifetime,
SecureCookie: app.config.Auth.SecureCookie,