diff --git a/internal/auth/auth.go b/internal/auth/auth.go index 2acd8e9f5b..e8f15e4f11 100644 --- a/internal/auth/auth.go +++ b/internal/auth/auth.go @@ -30,4 +30,5 @@ type AuthService interface { AuthServiceKind() string GetName() string GetClaimsFromHeader(context.Context, http.Header) (map[string]any, error) + ToConfig() AuthServiceConfig } diff --git a/internal/auth/google/google.go b/internal/auth/google/google.go index 528baa2ccf..90cb809589 100644 --- a/internal/auth/google/google.go +++ b/internal/auth/google/google.go @@ -43,9 +43,7 @@ func (cfg Config) AuthServiceConfigKind() string { // Initialize a Google auth service func (cfg Config) Initialize() (auth.AuthService, error) { a := &AuthService{ - Name: cfg.Name, - Kind: AuthServiceKind, - ClientID: cfg.ClientID, + Config: cfg, } return a, nil } @@ -54,9 +52,7 @@ var _ auth.AuthService = AuthService{} // struct used to store auth service info type AuthService struct { - Name string `yaml:"name"` - Kind string `yaml:"kind"` - ClientID string `yaml:"clientId"` + Config } // Returns the auth service kind @@ -64,6 +60,10 @@ func (a AuthService) AuthServiceKind() string { return AuthServiceKind } +func (a AuthService) ToConfig() auth.AuthServiceConfig { + return a.Config +} + // Returns the name of the auth service func (a AuthService) GetName() string { return a.Name