fix oidc unit test regressions

CSCfi · Jan 16, 2024 · a26844b · a26844b
1 parent 77618cf
commit a26844b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/swift_browser_ui/ui/login.py b/swift_browser_ui/ui/login.py
@@ -327,7 +327,7 @@ async def login_with_token(
         else await aiohttp_session.new_session(request)
     )
 
-    if setd["oidc_enabled"] and session.new or "oidc" not in session:
+    if setd["oidc_enabled"] and (session.new or "oidc" not in session):
         session.invalidate()
         return aiohttp.web.Response(status=302, headers={"Location": "/"})
 

diff --git a/tests/common/mockups.py b/tests/common/mockups.py
@@ -54,14 +54,17 @@ def setUp(self):
             self.aiohttp_session_new_session_mock,
         )
         self.aiohttp_session_get_session_oidc_mock = unittest.mock.AsyncMock()
-        self.aiohttp_session_get_session_oidc_mock.return_value = {
-            **self.session_return,
-            "oidc": {
-                "userinfo": {},
-                "state": "",
-                "access_token": "",
-            },
+        self.oidc_session_return = aiohttp_session.Session(
+            "test-identity-2",
+            new=False,
+            data=dict(self.session_return),
+        )
+        self.oidc_session_return["oidc"] = {
+            "userinfo": {},
+            "state": "",
+            "access_token": "",
         }
+        self.aiohttp_session_get_session_oidc_mock.return_value = self.oidc_session_return
         self.p_get_sess_oidc = unittest.mock.patch(
             "swift_browser_ui.ui.api.aiohttp_session.get_session",
             self.aiohttp_session_get_session_oidc_mock,

diff --git a/tests/ui_unit/test_login.py b/tests/ui_unit/test_login.py
@@ -27,6 +27,10 @@ def setUp(self):
             "swift_browser_ui.ui.login.aiohttp_session.get_session",
             self.aiohttp_session_get_session_mock,
         )
+        self.p_get_sess_oidc = unittest.mock.patch(
+            "swift_browser_ui.ui.login.aiohttp_session.get_session",
+            self.aiohttp_session_get_session_oidc_mock,
+        )
 
     async def test_oidc_start(self):
         """Test oidc initial request."""
@@ -364,7 +368,7 @@ async def test_login_with_token(self):
 
         self.setd_mock["oidc_enabled"] = True
         self.setd_mock["sdconnect_enabled"] = False
-        with patch1, patch2, self.p_get_sess:
+        with patch1, patch2, self.p_get_sess_oidc:
             resp = await swift_browser_ui.ui.login.login_with_token(
                 self.mock_request,
                 token,