From 1c4ca8f436f617b3c288a9e853762c0ca5a55949 Mon Sep 17 00:00:00 2001 From: Stavros Date: Mon, 1 Jun 2026 12:02:11 +0300 Subject: [PATCH] chore: differentiate oauth userinfo from oidc userinfo --- internal/service/oauth_extractors.go | 4 ++-- internal/service/oauth_service.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/oauth_extractors.go b/internal/service/oauth_extractors.go index 821a02ca..6d52567c 100644 --- a/internal/service/oauth_extractors.go +++ b/internal/service/oauth_extractors.go @@ -17,7 +17,7 @@ type GithubEmailResponse []struct { Verified bool `json:"verified"` } -type GithubUserInfoResponse struct { +type GithubUserinfoResponse struct { Login string `json:"login"` Name string `json:"name"` ID int `json:"id"` @@ -30,7 +30,7 @@ func defaultExtractor(client *http.Client, url string) (*model.Claims, error) { func githubExtractor(client *http.Client, _ string) (*model.Claims, error) { var user model.Claims - userInfo, err := simpleReq[GithubUserInfoResponse](client, "https://api.github.com/user", map[string]string{ + userInfo, err := simpleReq[GithubUserinfoResponse](client, "https://api.github.com/user", map[string]string{ "accept": "application/vnd.github+json", }) if err != nil { diff --git a/internal/service/oauth_service.go b/internal/service/oauth_service.go index dc0b7c08..07d0e1cc 100644 --- a/internal/service/oauth_service.go +++ b/internal/service/oauth_service.go @@ -10,13 +10,13 @@ import ( "golang.org/x/oauth2" ) -type UserinfoExtractor func(client *http.Client, url string) (*model.Claims, error) +type OAuthUserinfoExtractor func(client *http.Client, url string) (*model.Claims, error) type OAuthService struct { serviceCfg model.OAuthServiceConfig config *oauth2.Config ctx context.Context - userinfoExtractor UserinfoExtractor + userinfoExtractor OAuthUserinfoExtractor id string } @@ -50,7 +50,7 @@ func NewOAuthService(config model.OAuthServiceConfig, id string, ctx context.Con } } -func (s *OAuthService) WithUserinfoExtractor(extractor UserinfoExtractor) *OAuthService { +func (s *OAuthService) WithUserinfoExtractor(extractor OAuthUserinfoExtractor) *OAuthService { s.userinfoExtractor = extractor return s }