Enable SSO in CI.

cmd/generate-config/main.go

@@ -82,6 +82,27 @@ func main() {
 	if *defaultsForCI {
 		cfg.AppServiceAPI.DisableTLSValidation = true
 		cfg.ClientAPI.RateLimiting.Enabled = false
+		cfg.ClientAPI.Login.SSO.Enabled = true
+		cfg.ClientAPI.Login.SSO.Providers = []config.IdentityProvider{
+			{
+				ID:   "github",
+				Name: "Fake GitHub",
+				OIDC: config.OIDC{
+					ClientID:     "aclientid",
+					ClientSecret: "aclientsecret",
+				},
+			},
+			{
+				ID:   "google",
+				Name: "Fake Google",
+				Type: "oidc",
+				OIDC: config.OIDC{
+					ClientID:     "aclientid",
+					ClientSecret: "aclientsecret",
+					DiscoveryURL: "https://accounts.google.com/.well-known/openid-configuration",
+				},
+			},
+		}
 		cfg.FederationAPI.DisableTLSValidation = false
 		// don't hit matrix.org when running tests!!!
 		cfg.FederationAPI.KeyPerspectives = config.KeyPerspectives{}

setup/config/config_clientapi.go

@@ -180,11 +180,13 @@ type IdentityProvider struct {
 	Type IdentityProviderType `yaml:"type"`
 
 	// OIDC contains settings for providers based on OpenID Connect (OAuth 2).
-	OIDC struct {
+	OIDC OIDC `yaml:"oidc"`
-		ClientID     string `yaml:"client_id"`
+}
-		ClientSecret string `yaml:"client_secret"`
+
-		DiscoveryURL string `yaml:"discovery_url"`
+type OIDC struct {
-	} `yaml:"oidc"`
+	ClientID     string `yaml:"client_id"`
+	ClientSecret string `yaml:"client_secret"`
+	DiscoveryURL string `yaml:"discovery_url"`
 }
 
 func (idp *IdentityProvider) Verify(configErrs *ConfigErrors) {