From a61f8ee45c480bc66364d9d454039ecb3426f50f Mon Sep 17 00:00:00 2001
From: Kyle Carberry <kyle@coder.com>
Date: Mon, 9 Oct 2023 22:11:05 -0500
Subject: [PATCH] fix: apply default `ExtraTokenKeys` to oauth (#10155)

---
 coderd/externalauth/externalauth.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/coderd/externalauth/externalauth.go b/coderd/externalauth/externalauth.go
index 7a84b56e04..8802b5d5f6 100644
--- a/coderd/externalauth/externalauth.go
+++ b/coderd/externalauth/externalauth.go
@@ -469,6 +469,7 @@ func ConvertConfig(entries []codersdk.ExternalAuthConfig, accessURL *url.URL) ([
 			AppInstallURL:       entry.AppInstallURL,
 			DisplayName:         entry.DisplayName,
 			DisplayIcon:         entry.DisplayIcon,
+			ExtraTokenKeys:      entry.ExtraTokenKeys,
 		}
 
 		if entry.DeviceFlow {
@@ -521,6 +522,9 @@ func applyDefaultsToConfig(config *codersdk.ExternalAuthConfig) {
 	if config.DisplayIcon == "" {
 		config.DisplayIcon = defaults.DisplayIcon
 	}
+	if config.ExtraTokenKeys == nil || len(config.ExtraTokenKeys) == 0 {
+		config.ExtraTokenKeys = defaults.ExtraTokenKeys
+	}
 
 	// Apply defaults if it's still empty...
 	if config.ID == "" {