Enable the 'Is Active?' flag by default in user view (#37507)

* Enable the 'Is Active?' flag by default in user view * fixing tests
apache · Feb 17, 2024 · 68e20aa · 68e20aa
1 parent d50a25b
commit 68e20aa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/airflow/providers/fab/auth_manager/models/__init__.py b/airflow/providers/fab/auth_manager/models/__init__.py
@@ -152,7 +152,7 @@ class User(Model, BaseUser):
         String(512).with_variant(String(512, collation="NOCASE"), "sqlite"), unique=True, nullable=False
     )
     password = Column(String(256))
-    active = Column(Boolean)
+    active = Column(Boolean, default=True)
     email = Column(String(512), unique=True, nullable=False)
     last_login = Column(DateTime)
     login_count = Column(Integer)

diff --git a/tests/providers/fab/auth_manager/api_endpoints/test_user_endpoint.py b/tests/providers/fab/auth_manager/api_endpoints/test_user_endpoint.py
@@ -83,6 +83,7 @@ def _create_users(self, count, roles=None):
                 roles=roles or [],
                 created_on=timezone.parse(DEFAULT_TIME),
                 changed_on=timezone.parse(DEFAULT_TIME),
+                active=True,
             )
             for i in range(1, count + 1)
         ]
@@ -96,7 +97,7 @@ def test_should_respond_200(self):
         response = self.client.get("/auth/fab/v1/users/TEST_USER1", environ_overrides={"REMOTE_USER": "test"})
         assert response.status_code == 200
         assert response.json == {
-            "active": None,
+            "active": True,
             "changed_on": DEFAULT_TIME,
             "created_on": DEFAULT_TIME,
             "email": "mytest@test1.org",
@@ -124,7 +125,7 @@ def test_last_names_can_be_empty(self):
         response = self.client.get("/auth/fab/v1/users/prince", environ_overrides={"REMOTE_USER": "test"})
         assert response.status_code == 200
         assert response.json == {
-            "active": None,
+            "active": True,
             "changed_on": DEFAULT_TIME,
             "created_on": DEFAULT_TIME,
             "email": "prince@example.org",
@@ -152,7 +153,7 @@ def test_first_names_can_be_empty(self):
         response = self.client.get("/auth/fab/v1/users/liberace", environ_overrides={"REMOTE_USER": "test"})
         assert response.status_code == 200
         assert response.json == {
-            "active": None,
+            "active": True,
             "changed_on": DEFAULT_TIME,
             "created_on": DEFAULT_TIME,
             "email": "liberace@example.org",
@@ -180,7 +181,7 @@ def test_both_first_and_last_names_can_be_empty(self):
         response = self.client.get("/auth/fab/v1/users/nameless", environ_overrides={"REMOTE_USER": "test"})
         assert response.status_code == 200
         assert response.json == {
-            "active": None,
+            "active": True,
             "changed_on": DEFAULT_TIME,
             "created_on": DEFAULT_TIME,
             "email": "nameless@example.org",