mirror of
https://github.com/steveiliop56/tinyauth.git
synced 2026-01-16 12:22:30 +00:00
53bd413046
* Refactor logging to use centralized logger utility - Removed direct usage of zerolog in multiple files and replaced it with a centralized logging utility in the `utils` package. - Introduced `Loggers` struct to manage different loggers (Audit, HTTP, App) with configurable levels and outputs. - Updated all relevant files to utilize the new logging structure, ensuring consistent logging practices across the application. - Enhanced error handling and logging messages for better traceability and debugging. * refactor: update logging implementation to use new logger structure * Refactor logging to use tlog package - Replaced instances of utils logging with tlog in various controllers, services, and middleware. - Introduced audit logging for login success, login failure, and logout events. - Created tlog package with structured logging capabilities using zerolog. - Added tests for the new tlog logger functionality. * refactor: update logging configuration in environment files * fix: adding coderabbit suggestions * fix: ensure correct audit caller * fix: include reason in audit login failure logs
82 lines
2.0 KiB
Go
82 lines
2.0 KiB
Go
package service
|
|
|
|
import (
|
|
"errors"
|
|
|
|
"github.com/steveiliop56/tinyauth/internal/config"
|
|
"github.com/steveiliop56/tinyauth/internal/utils/tlog"
|
|
|
|
"golang.org/x/exp/slices"
|
|
)
|
|
|
|
type OAuthService interface {
|
|
Init() error
|
|
GenerateState() string
|
|
GenerateVerifier() string
|
|
GetAuthURL(state string) string
|
|
VerifyCode(code string) error
|
|
Userinfo() (config.Claims, error)
|
|
GetName() string
|
|
}
|
|
|
|
type OAuthBrokerService struct {
|
|
services map[string]OAuthService
|
|
configs map[string]config.OAuthServiceConfig
|
|
}
|
|
|
|
func NewOAuthBrokerService(configs map[string]config.OAuthServiceConfig) *OAuthBrokerService {
|
|
return &OAuthBrokerService{
|
|
services: make(map[string]OAuthService),
|
|
configs: configs,
|
|
}
|
|
}
|
|
|
|
func (broker *OAuthBrokerService) Init() error {
|
|
for name, cfg := range broker.configs {
|
|
switch name {
|
|
case "github":
|
|
service := NewGithubOAuthService(cfg)
|
|
broker.services[name] = service
|
|
case "google":
|
|
service := NewGoogleOAuthService(cfg)
|
|
broker.services[name] = service
|
|
default:
|
|
service := NewGenericOAuthService(cfg)
|
|
broker.services[name] = service
|
|
}
|
|
}
|
|
|
|
for name, service := range broker.services {
|
|
err := service.Init()
|
|
if err != nil {
|
|
tlog.App.Error().Err(err).Msgf("Failed to initialize OAuth service: %s", name)
|
|
return err
|
|
}
|
|
tlog.App.Info().Str("service", name).Msg("Initialized OAuth service")
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (broker *OAuthBrokerService) GetConfiguredServices() []string {
|
|
services := make([]string, 0, len(broker.services))
|
|
for name := range broker.services {
|
|
services = append(services, name)
|
|
}
|
|
slices.Sort(services)
|
|
return services
|
|
}
|
|
|
|
func (broker *OAuthBrokerService) GetService(name string) (OAuthService, bool) {
|
|
service, exists := broker.services[name]
|
|
return service, exists
|
|
}
|
|
|
|
func (broker *OAuthBrokerService) GetUser(service string) (config.Claims, error) {
|
|
oauthService, exists := broker.services[service]
|
|
if !exists {
|
|
return config.Claims{}, errors.New("oauth service not found")
|
|
}
|
|
return oauthService.Userinfo()
|
|
}
|