Try direct mod

Author: alexiri

astra_app/core/tests/test_views_selfservice_settings_pages.py

@@ -450,6 +450,63 @@ def test_settings_save_all_profile_country_can_save_when_other_tabs_invalid_but_
         self.assertEqual(response["Location"], reverse("settings") + "#profile")
         self.assertEqual(mocked_update.call_count, 1)
 
+    @override_settings(
+        FREEIPA_HOST="ipa.test",
+        FREEIPA_VERIFY_SSL=False,
+        FREEIPA_SERVICE_USER="svc",
+        FREEIPA_SERVICE_PASSWORD="pw",
+        SELF_SERVICE_ADDRESS_COUNTRY_ATTR="st",
+    )
+    def test_settings_profile_country_uses_direct_attr_update_for_st(self):
+        factory = RequestFactory()
+
+        fake_user = SimpleNamespace(
+            username="alice",
+            email="[email protected]",
+            is_authenticated=True,
+            _user_data={
+                "givenname": ["Alice"],
+                "sn": ["User"],
+                "cn": ["Alice User"],
+                "st": ["CH"],
+            },
+        )
+
+        request = factory.post(
+            "/settings/",
+            data={
+                "tab": "profile",
+                "givenname": "Alice",
+                "sn": "User",
+                "country_code": "US",
+                "fasPronoun": "",
+                "fasLocale": "",
+                "fasTimezone": "",
+                "fasWebsiteUrl": "",
+                "fasRssUrl": "",
+                "fasIRCNick": "",
+                "fasGitHubUsername": "",
+                "fasGitLabUsername": "",
+                "fasIsPrivate": "",
+            },
+        )
+        self._add_session_and_messages(request)
+        request.user = self._auth_user("alice")
+
+        with patch("core.views_settings._get_full_user", autospec=True, return_value=fake_user):
+            with patch("core.views_settings._update_user_attrs", autospec=True) as mocked_update:
+                mocked_update.return_value = ([], True)
+                response = views_settings.settings_root(request)
+
+        self.assertEqual(response.status_code, 302)
+        self.assertEqual(response["Location"], reverse("settings") + "#profile")
+
+        kwargs = mocked_update.call_args.kwargs
+        direct_updates = kwargs.get("direct_updates", {})
+        setattrs = kwargs.get("setattrs", [])
+        self.assertEqual(direct_updates.get("o_st"), "US")
+        self.assertNotIn("st=US", setattrs)
+
     @override_settings(
         FREEIPA_HOST="ipa.test",
         FREEIPA_VERIFY_SSL=False,

astra_app/core/views_settings.py

@@ -197,6 +197,7 @@ def settings_root(request: HttpRequest) -> HttpResponse:
     data = fu._user_data
 
     country_attr = str(settings.SELF_SERVICE_ADDRESS_COUNTRY_ATTR).strip() or "c"
+    country_attr_lower = country_attr.lower()
 
     # --- Profile ---
     # Use the FreeIPA attribute data as the source of truth. This avoids relying on
@@ -674,14 +675,24 @@ def _user_can_reauth(password: str) -> bool:
                 current_value=profile_initial.get("fasGitLabUsername"),
                 new_value=profile_form.cleaned_data["fasGitLabUsername"],
             )
-            _add_change_setattr(
-                setattrs=profile_setattrs,
-                delattrs=profile_delattrs,
-                attr=country_attr,
-                current_value=profile_initial.get("country_code"),
-                new_value=profile_form.cleaned_data["country_code"],
-                transform=str.upper,
-            )
+            if country_attr_lower in {"c", "st", "l", "postalcode"}:
+                _add_change(
+                    updates=profile_direct_updates,
+                    delattrs=profile_delattrs,
+                    attr=country_attr_lower,
+                    current_value=profile_initial.get("country_code"),
+                    new_value=profile_form.cleaned_data["country_code"],
+                    transform=str.upper,
+                )
+            else:
+                _add_change_setattr(
+                    setattrs=profile_setattrs,
+                    delattrs=profile_delattrs,
+                    attr=country_attr,
+                    current_value=profile_initial.get("country_code"),
+                    new_value=profile_form.cleaned_data["country_code"],
+                    transform=str.upper,
+                )
 
             current_private = profile_initial["fasIsPrivate"]
             new_private = profile_form.cleaned_data["fasIsPrivate"]
@@ -973,14 +984,24 @@ def _user_can_reauth(password: str) -> bool:
             current_value=profile_initial.get("fasGitLabUsername"),
             new_value=profile_form.cleaned_data["fasGitLabUsername"],
         )
-        _add_change_setattr(
-            setattrs=setattrs,
-            delattrs=delattrs,
-            attr=country_attr,
-            current_value=profile_initial.get("country_code"),
-            new_value=profile_form.cleaned_data["country_code"],
-            transform=str.upper,
-        )
+        if country_attr_lower in {"c", "st", "l", "postalcode"}:
+            _add_change(
+                updates=direct_updates,
+                delattrs=delattrs,
+                attr=country_attr_lower,
+                current_value=profile_initial.get("country_code"),
+                new_value=profile_form.cleaned_data["country_code"],
+                transform=str.upper,
+            )
+        else:
+            _add_change_setattr(
+                setattrs=setattrs,
+                delattrs=delattrs,
+                attr=country_attr,
+                current_value=profile_initial.get("country_code"),
+                new_value=profile_form.cleaned_data["country_code"],
+                transform=str.upper,
+            )
 
         current_private = profile_initial["fasIsPrivate"]
         new_private = profile_form.cleaned_data["fasIsPrivate"]