From 8b7d792fdb0daf958b4638553fe35993f663edda Mon Sep 17 00:00:00 2001
From: Kyle Carberry <kyle@carberry.com>
Date: Tue, 10 Oct 2023 02:55:47 +0000
Subject: [PATCH 1/2] fix: apply default `ExtraTokenKeys` to oauth

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

diff --git a/coderd/externalauth/externalauth.go b/coderd/externalauth/externalauth.go
index 7a84b56e04752..5bad34ac6ea37 100644
--- a/coderd/externalauth/externalauth.go
+++ b/coderd/externalauth/externalauth.go
@@ -521,6 +521,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 == "" {

From bb687d09bc920e6b4a37f24bc101487fdded20b5 Mon Sep 17 00:00:00 2001
From: Kyle Carberry <kyle@carberry.com>
Date: Tue, 10 Oct 2023 02:58:52 +0000
Subject: [PATCH 2/2] Add extra token keys option

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

diff --git a/coderd/externalauth/externalauth.go b/coderd/externalauth/externalauth.go
index 5bad34ac6ea37..8802b5d5f6108 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 {