revert plural

coder · mafredri · Dec 5, 2022 · Dec 1, 2022 · Dec 1, 2022 · Dec 1, 2022
commit 193c000819ceb6bacafc18d70dc6ea45cd5cef8c
diff --git a/cli/deployment/config.go b/cli/deployment/config.go
@@ -215,7 +215,7 @@ func newConfig() *codersdk.DeploymentConfig {
 				Flag:   "oidc-client-secret",
 				Secret: true,
 			},
-			EmailDomains: &codersdk.DeploymentConfigField[[]string]{
+			EmailDomain: &codersdk.DeploymentConfigField[[]string]{
 				Name:  "OIDC Email Domain",
 				Usage: "Email domains that clients logging in with OIDC must match.",
 				Flag:  "oidc-email-domain",

diff --git a/cli/deployment/config_test.go b/cli/deployment/config_test.go
@@ -127,7 +127,7 @@ func TestConfig(t *testing.T) {
 		Env:  map[string]string{},
 		Valid: func(config *codersdk.DeploymentConfig) {
 			require.Empty(t, config.OIDC.IssuerURL.Value)
-			require.Empty(t, config.OIDC.EmailDomains.Value)
+			require.Empty(t, config.OIDC.EmailDomain.Value)
 			require.Empty(t, config.OIDC.ClientID.Value)
 			require.Empty(t, config.OIDC.ClientSecret.Value)
 			require.True(t, config.OIDC.AllowSignups.Value)
@@ -147,7 +147,7 @@ func TestConfig(t *testing.T) {
 		},
 		Valid: func(config *codersdk.DeploymentConfig) {
 			require.Equal(t, config.OIDC.IssuerURL.Value, "https://accounts.google.com")
-			require.Equal(t, config.OIDC.EmailDomains.Value, []string{"coder.com"})
+			require.Equal(t, config.OIDC.EmailDomain.Value, []string{"coder.com"})
 			require.Equal(t, config.OIDC.ClientID.Value, "client")
 			require.Equal(t, config.OIDC.ClientSecret.Value, "secret")
 			require.False(t, config.OIDC.AllowSignups.Value)

diff --git a/cli/server.go b/cli/server.go
@@ -424,7 +424,7 @@ func Server(vip *viper.Viper, newAPI func(context.Context, *coderd.Options) (*co
 					Verifier: oidcProvider.Verifier(&oidc.Config{
 						ClientID: cfg.OIDC.ClientID.Value,
 					}),
-					EmailDomains: cfg.OIDC.EmailDomains.Value,
+					EmailDomain:  cfg.OIDC.EmailDomain.Value,
 					AllowSignups: cfg.OIDC.AllowSignups.Value,
 				}
 			}

diff --git a/cli/testdata/coder_server_--help.golden b/cli/testdata/coder_server_--help.golden
@@ -97,7 +97,7 @@ Flags:
                                                      Consumes $CODER_OIDC_CLIENT_SECRET
       --oidc-email-domain strings                    Email domains that clients logging in
                                                      with OIDC must match.
-                                                     Consumes $CODER_OIDC_EMAIL_DOMAINS
+                                                     Consumes $CODER_OIDC_EMAIL_DOMAIN
       --oidc-ignore-email-verified                   Ignore the email_verified claim from the
                                                      upstream provider.
                                                      Consumes $CODER_OIDC_IGNORE_EMAIL_VERIFIED

diff --git a/coderd/userauth.go b/coderd/userauth.go
@@ -193,7 +193,7 @@ type OIDCConfig struct {
 
 	Verifier *oidc.IDTokenVerifier
 	// EmailDomains are the domains to enforce when a user authenticates.
-	EmailDomains []string
+	EmailDomain  []string
 	AllowSignups bool
 	// IgnoreEmailVerified allows ignoring the email_verified claim
 	// from an upstream OIDC provider. See #5065 for context.
@@ -291,17 +291,17 @@ func (api *API) userOIDC(rw http.ResponseWriter, r *http.Request) {
 	}
 	// Check if one or comma delimited list of allowed domains is provided.
 	// If a suffix matches, break and continue, otherwise error.
-	if len(api.OIDCConfig.EmailDomains) > 0 {
+	if len(api.OIDCConfig.EmailDomain) > 0 {
 		ok = false
-		for _, domain := range api.OIDCConfig.EmailDomains {
+		for _, domain := range api.OIDCConfig.EmailDomain {
 			if strings.HasSuffix(strings.ToLower(email), strings.ToLower(domain)) {
 				ok = true
 				break
 			}
 		}
 		if !ok {
 			httpapi.Write(ctx, rw, http.StatusForbidden, codersdk.Response{
-				Message: fmt.Sprintf("Your email %q is not in domains %q !", email, api.OIDCConfig.EmailDomains),
+				Message: fmt.Sprintf("Your email %q is not in domains %q !", email, api.OIDCConfig.EmailDomain),
 			})
 			return
 		}

diff --git a/coderd/userauth_test.go b/coderd/userauth_test.go
@@ -482,7 +482,7 @@ func TestUserOIDC(t *testing.T) {
 		Name                string
 		Claims              jwt.MapClaims
 		AllowSignups        bool
-		EmailDomains        []string
+		EmailDomain         []string
 		Username            string
 		AvatarURL           string
 		StatusCode          int
@@ -528,7 +528,7 @@ func TestUserOIDC(t *testing.T) {
 			"email_verified": true,
 		},
 		AllowSignups: true,
-		EmailDomains: []string{
+		EmailDomain: []string{
 			"coder.com",
 		},
 		StatusCode: http.StatusForbidden,
@@ -539,7 +539,7 @@ func TestUserOIDC(t *testing.T) {
 			"email_verified": true,
 		},
 		AllowSignups: true,
-		EmailDomains: []string{
+		EmailDomain: []string{
 			"kwc.io",
 		},
 		StatusCode: http.StatusTemporaryRedirect,
@@ -615,7 +615,7 @@ func TestUserOIDC(t *testing.T) {
 
 			config := conf.OIDCConfig()
 			config.AllowSignups = tc.AllowSignups
-			config.EmailDomains = tc.EmailDomains
+			config.EmailDomain = tc.EmailDomain
 			config.IgnoreEmailVerified = tc.IgnoreEmailVerified
 
 			client := coderdtest.New(t, &coderdtest.Options{

diff --git a/codersdk/deploymentconfig.go b/codersdk/deploymentconfig.go
@@ -90,7 +90,7 @@ type OIDCConfig struct {
 	AllowSignups        *DeploymentConfigField[bool]     `json:"allow_signups" typescript:",notnull"`
 	ClientID            *DeploymentConfigField[string]   `json:"client_id" typescript:",notnull"`
 	ClientSecret        *DeploymentConfigField[string]   `json:"client_secret" typescript:",notnull"`
-	EmailDomains        *DeploymentConfigField[[]string] `json:"email_domains" typescript:",notnull"`
+	EmailDomain         *DeploymentConfigField[[]string] `json:"email_domain" typescript:",notnull"`
 	IssuerURL           *DeploymentConfigField[string]   `json:"issuer_url" typescript:",notnull"`
 	Scopes              *DeploymentConfigField[[]string] `json:"scopes" typescript:",notnull"`
 	IgnoreEmailVerified *DeploymentConfigField[bool]     `json:"ignore_email_verified" typescript:",notnull"`

diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -439,7 +439,7 @@ export interface OIDCConfig {
   readonly allow_signups: DeploymentConfigField<boolean>
   readonly client_id: DeploymentConfigField<string>
   readonly client_secret: DeploymentConfigField<string>
-  readonly email_domains: DeploymentConfigField<string[]>
+  readonly email_domain: DeploymentConfigField<string[]>
   readonly issuer_url: DeploymentConfigField<string>
   readonly scopes: DeploymentConfigField<string[]>
   readonly ignore_email_verified: DeploymentConfigField<boolean>

diff --git a/site/src/pages/DeploySettingsPage/UserAuthSettingsPage.tsx b/site/src/pages/DeploySettingsPage/UserAuthSettingsPage.tsx
@@ -43,7 +43,7 @@ const UserAuthSettingsPage: React.FC = () => {
             options={{
               client_id: deploymentConfig.oidc.client_id,
               allow_signups: deploymentConfig.oidc.allow_signups,
-              email_domains: deploymentConfig.oidc.email_domains,
+              email_domain: deploymentConfig.oidc.email_domain,
               issuer_url: deploymentConfig.oidc.issuer_url,
               scopes: deploymentConfig.oidc.scopes,
             }}