Fixed go panic with GitHub provider (#52)

jkroepke · Oct 27, 2023 · ce8f640 · ce8f640
1 parent ed9d1b2
commit ce8f640
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/internal/oauth2/handler.go b/internal/oauth2/handler.go
@@ -114,10 +114,12 @@ func oauth2Callback(
 		ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 		defer cancel()
 
-		logger = logger.With(
-			slog.String("subject", tokens.IDTokenClaims.Subject),
-			slog.String("preferred_username", tokens.IDTokenClaims.PreferredUsername),
-		)
+		if tokens.IDTokenClaims != nil {
+			logger = logger.With(
+				slog.String("idtoken.subject", tokens.IDTokenClaims.Subject),
+				slog.String("idtoken.preferred_username", tokens.IDTokenClaims.PreferredUsername),
+			)
+		}
 
 		session := state.NewEncoded(encryptedSession)
 		if err := session.Decode(conf.HTTP.Secret); err != nil {
@@ -143,6 +145,11 @@ func oauth2Callback(
 			return
 		}
 
+		logger = logger.With(
+			slog.String("user.subject", user.Subject),
+			slog.String("user.preferred_username", user.PreferredUsername),
+		)
+
 		err = provider.OIDC.CheckUser(ctx, session, user, tokens)
 		if err != nil {
 			reason := err.Error()

diff --git a/internal/oauth2/providers/github/endpoints.go b/internal/oauth2/providers/github/endpoints.go
@@ -10,7 +10,7 @@ import (
 )
 
 func (p *Provider) GetEndpoints(conf config.Config) (oauth2.Endpoint, error) {
-	if !utils.IsURLEmpty(conf.OAuth2.Endpoints.Token) && !utils.IsURLEmpty(conf.OAuth2.Endpoints.Auth) {
+	if utils.IsURLEmpty(conf.OAuth2.Endpoints.Token) && utils.IsURLEmpty(conf.OAuth2.Endpoints.Auth) {
 		return github.Endpoint, nil
 	}