Allow any ID

kylecarbs · kylecarbs · commit 02718dde935a · 2023-10-02T16:50:48.000Z
diff --git a/coderd/externalauth/externalauth.go b/coderd/externalauth/externalauth.go
@@ -370,8 +370,6 @@ func ConvertConfig(entries []codersdk.ExternalAuthConfig, accessURL *url.URL) ([
 
 		var typ codersdk.ExternalAuthProvider
 		switch codersdk.ExternalAuthProvider(entry.Type) {
-		case codersdk.ExternalAuthProviderOpenIDConnect:
-			typ = codersdk.ExternalAuthProviderOpenIDConnect
 		case codersdk.ExternalAuthProviderAzureDevops:
 			typ = codersdk.ExternalAuthProviderAzureDevops
 		case codersdk.ExternalAuthProviderBitBucket:
@@ -381,7 +379,7 @@ func ConvertConfig(entries []codersdk.ExternalAuthConfig, accessURL *url.URL) ([
 		case codersdk.ExternalAuthProviderGitLab:
 			typ = codersdk.ExternalAuthProviderGitLab
 		default:
-			return nil, xerrors.Errorf("unknown external auth provider type: %q", entry.Type)
+			typ = codersdk.ExternalAuthProvider(entry.Type)
 		}
 
 		// Applies defaults to the config entry.
@@ -507,6 +505,13 @@ func applyDefaultsToConfig(typ codersdk.ExternalAuthProvider, config *codersdk.E
 	if config.ID == "" {
 		config.ID = string(typ)
 	}
+	if config.DisplayName == "" {
+		config.DisplayName = string(typ)
+	}
+	if config.DisplayIcon == "" {
+		// This is a key emoji.
+		config.DisplayIcon = "/emojis/1f511.png"
+	}
 }
 
 var defaults = map[codersdk.ExternalAuthProvider]codersdk.ExternalAuthConfig{
@@ -548,11 +553,6 @@ var defaults = map[codersdk.ExternalAuthProvider]codersdk.ExternalAuthConfig{
 		DeviceCodeURL:       "https://github.com/login/device/code",
 		AppInstallationsURL: "https://api.github.com/user/installations",
 	},
-	codersdk.ExternalAuthProviderOpenIDConnect: {
-		DisplayName: "OpenID Connect",
-		// This is a key emoji.
-		DisplayIcon: "/emojis/1f511.png",
-	},
 }
 
 // jwtConfig is a new OAuth2 config that uses a custom
diff --git a/codersdk/workspaceagents.go b/codersdk/workspaceagents.go
@@ -749,11 +749,10 @@ func (c *Client) WorkspaceAgentLogsAfter(ctx context.Context, agentID uuid.UUID,
 type ExternalAuthProvider string
 
 const (
-	ExternalAuthProviderAzureDevops   ExternalAuthProvider = "azure-devops"
-	ExternalAuthProviderGitHub        ExternalAuthProvider = "github"
-	ExternalAuthProviderGitLab        ExternalAuthProvider = "gitlab"
-	ExternalAuthProviderBitBucket     ExternalAuthProvider = "bitbucket"
-	ExternalAuthProviderOpenIDConnect ExternalAuthProvider = "oidc"
+	ExternalAuthProviderAzureDevops ExternalAuthProvider = "azure-devops"
+	ExternalAuthProviderGitHub      ExternalAuthProvider = "github"
+	ExternalAuthProviderGitLab      ExternalAuthProvider = "gitlab"
+	ExternalAuthProviderBitBucket   ExternalAuthProvider = "bitbucket"
 )
 
 type WorkspaceAgentLog struct {
diff --git a/docs/admin/external-auth.md b/docs/admin/external-auth.md
@@ -33,7 +33,7 @@ Set the following environment variables to
 
 ```env
 CODER_EXTERNAL_AUTH_0_ID="primary-github"
-CODER_EXTERNAL_AUTH_0_TYPE=github|gitlab|azure-devops|bitbucket|oidc
+CODER_EXTERNAL_AUTH_0_TYPE=github|gitlab|azure-devops|bitbucket|<name of service e.g. jfrog>
 CODER_EXTERNAL_AUTH_0_CLIENT_ID=xxxxxx
 CODER_EXTERNAL_AUTH_0_CLIENT_SECRET=xxxxxxx
 
