WPB-23441 fix: validate saml emails feature not correctly targeted

changelog.d/3-bug-fixes/WPB-23441

@@ -0,0 +1 @@
+Streamlined and fixed team feature config `validateSAMLemails`

charts/wire-server/templates/galley/configmap.yaml

@@ -136,9 +136,11 @@ data:
         searchVisibilityInbound:
           {{- toYaml .settings.featureFlags.searchVisibilityInbound | nindent 10 }}
         {{- end }}
-        {{- if .settings.featureFlags.validateSAMLEmails }}
-        validateSAMLEmails:
-          {{- toYaml .settings.featureFlags.validateSAMLEmails | nindent 10 }}
+        {{- /* Accept the legacy typo in Helm values, but always render the canonical Galley key. */}}
+        {{- $validateSAMLemails := .settings.featureFlags.validateSAMLemails | default .settings.featureFlags.validateSAMLEmails }}
+        {{- if $validateSAMLemails }}
+        validateSAMLemails:
+          {{- toYaml $validateSAMLemails | nindent 10 }}
         {{- end }}
         {{- if .settings.featureFlags.appLock }}
         appLock:

charts/wire-server/values.yaml

@@ -198,7 +198,7 @@ galley:
             status: disabled
         sso: disabled-by-default
         teamSearchVisibility: disabled-by-default
-        validateSAMLEmails:
+        validateSAMLemails:
           defaults:
             status: enabled
         outlookCalIntegration:

docs/src/developer/reference/config-options.md

@@ -300,7 +300,7 @@ Validate SAML emails is enabled by default.  To disable, use the following synta
 
 ```yaml
 # galley.yaml
-validateSAMLEmails:
+validateSAMLemails:
   defaults:
     status: disabled
 ```

integration/test/Test/Auth.hs

@@ -252,7 +252,7 @@ testSetCookieLabelOnSsoFlow = do
   domain <- make OwnDomain
   (owner, tid, _) <- createTeam OwnDomain 1
   void $ setTeamFeatureStatus owner tid "sso" "enabled"
-  void $ setTeamFeatureStatus owner tid "validateSAMLEmails" "enabled"
+  void $ setTeamFeatureStatus owner tid "validateSAMLemails" "enabled"
   idp@(samlId, _) <- do
     (resp, (meta, creds)) <- registerTestIdPWithMetaWithPrivateCreds owner
     resp.status `shouldMatchInt` 201

integration/test/Test/Spar/STM.hs

@@ -112,7 +112,7 @@ runSteps :: (HasCallStack) => [Step] -> App ()
 runSteps steps = do
   (owner, tid, []) <- createTeam OwnDomain 1
   void $ setTeamFeatureStatus owner tid "sso" "enabled"
-  void $ setTeamFeatureStatus owner tid "validateSAMLEmails" "enabled"
+  void $ setTeamFeatureStatus owner tid "validateSAMLemails" "enabled"
   go owner tid emptyState steps
   where
     go :: Value -> String -> State -> [Step] -> App ()

libs/wire-api/src/Wire/API/Team/FeatureFlags.hs

@@ -187,7 +187,14 @@ newtype instance FeatureDefaults ValidateSAMLEmailsConfig
   deriving stock (Eq, Show)
   deriving newtype (Default, GetFeatureDefaults)
   deriving (FromJSON, ToJSON) via Defaults (Feature ValidateSAMLEmailsConfig)
-  deriving (ParseFeatureDefaults) via OptionalField ValidateSAMLEmailsConfig
+
+instance ParseFeatureDefaults (FeatureDefaults ValidateSAMLEmailsConfig) where
+  parseFeatureDefaults obj =
+    ValidateSAMLEmailsDefaults <$> do
+      -- Accept the legacy typo in config input for backward compatibility,
+      -- but prefer the canonical feature key when both are present.
+      mCfg <- obj .:? featureKey @ValidateSAMLEmailsConfig <|> obj .:? "validateSAMLEmails"
+      pure $ fromMaybe def mCfg
 
 data instance FeatureDefaults DigitalSignaturesConfig = DigitalSignaturesDefaults
   deriving stock (Eq, Show)