siteconfig and deployment config

hugodutka · hugodutka · commit 63dc6fc74370 · 2025-02-22T14:29:28.000Z
diff --git a/coderd/database/queries/siteconfig.sql b/coderd/database/queries/siteconfig.sql
@@ -107,3 +107,27 @@ ON CONFLICT (key) DO UPDATE SET value = $2 WHERE site_configs.key = $1;
 DELETE FROM site_configs
 WHERE site_configs.key = $1;
 
+-- name: GetOAuth2GithubDefaultEligible :one
+SELECT
+	CASE
+		WHEN value = 'true' THEN TRUE
+		ELSE FALSE
+	END
+FROM site_configs
+WHERE key = 'oauth2_github_default_eligible';
+
+-- name: UpsertOAuth2GithubDefaultEligible :exec
+INSERT INTO site_configs (key, value)
+VALUES (
+    'oauth2_github_default_eligible',
+    CASE
+        WHEN sqlc.arg(eligible)::bool THEN 'true'
+        ELSE 'false'
+    END
+)
+ON CONFLICT (key) DO UPDATE
+SET value = CASE
+    WHEN sqlc.arg(eligible)::bool THEN 'true'
+    ELSE 'false'
+END
+WHERE site_configs.key = 'oauth2_github_default_eligible';
diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -506,6 +506,7 @@ type OAuth2GithubConfig struct {
 	ClientID          serpent.String      `json:"client_id" typescript:",notnull"`
 	ClientSecret      serpent.String      `json:"client_secret" typescript:",notnull"`
 	DeviceFlow        serpent.Bool        `json:"device_flow" typescript:",notnull"`
+	DefaultProvider   serpent.Bool        `json:"default_provider" typescript:",notnull"`
 	AllowedOrgs       serpent.StringArray `json:"allowed_orgs" typescript:",notnull"`
 	AllowedTeams      serpent.StringArray `json:"allowed_teams" typescript:",notnull"`
 	AllowSignups      serpent.Bool        `json:"allow_signups" typescript:",notnull"`
@@ -1583,6 +1584,16 @@ func (c *DeploymentValues) Options() serpent.OptionSet {
 			YAML:        "deviceFlow",
 			Default:     "false",
 		},
+		{
+			Name:        "OAuth2 GitHub Default Provider",
+			Description: "Enable the default GitHub OAuth2 provider managed by Coder.",
+			Flag:        "oauth2-github-default-provider",
+			Env:         "CODER_OAUTH2_GITHUB_DEFAULT_PROVIDER",
+			Value:       &c.OAuth2.Github.DefaultProvider,
+			Group:       &deploymentGroupOAuth2GitHub,
+			YAML:        "defaultProvider",
+			Default:     "true",
+		},
 		{
 			Name:        "OAuth2 GitHub Allowed Orgs",
 			Description: "Organizations the user must be a member of to Login with GitHub.",
