Merge pull request #1135 from freedomofpress/update-current-user-info…

…-during-session update current user info during sync
freedomofpress · Sep 1, 2020 · cf872e8 · cf872e8
2 parents 992393d + 5c6a868
commit cf872e8
Show file tree

Hide file tree

Showing 16 changed files with 1,878 additions and 3,488 deletions.
diff --git a/securedrop_client/api_jobs/sync.py b/securedrop_client/api_jobs/sync.py
@@ -5,7 +5,7 @@
 from sqlalchemy.orm.session import Session
 
 from securedrop_client.api_jobs.base import ApiJob
-from securedrop_client.storage import get_remote_data, update_local_storage
+from securedrop_client.storage import get_remote_data, update_and_get_user, update_local_storage
 
 logger = logging.getLogger(__name__)
 
@@ -37,8 +37,11 @@ def call_api(self, api_client: API, session: Session) -> Any:
         # This timeout is used for 3 different requests: `get_sources`, `get_all_submissions`, and
         # `get_all_replies`
         api_client.default_request_timeout = 60
-        remote_sources, remote_submissions, remote_replies = get_remote_data(api_client)
-
-        update_local_storage(
-            session, remote_sources, remote_submissions, remote_replies, self.data_dir
-        )
+        sources, submissions, replies = get_remote_data(api_client)
+
+        update_local_storage(session, sources, submissions, replies, self.data_dir)
+        user = api_client.get_current_user()
+        if "uuid" in user and "username" in user and "first_name" in user and "last_name" in user:
+            update_and_get_user(
+                user["uuid"], user["username"], user["first_name"], user["last_name"], session,
+            )
diff --git a/tests/api_jobs/test_sync.py b/tests/api_jobs/test_sync.py
@@ -18,9 +18,37 @@ def test_MetadataSyncJob_success(mocker, homedir, session, session_maker):
         "securedrop_client.api_jobs.sync.get_remote_data", return_value=([mock_source], [], [])
     )
 
-    api_client = mocker.MagicMock()
-    api_client.default_request_timeout = mocker.MagicMock()
-    api_client.default_request_timeout = mocker.MagicMock()
+    user = factory.User(uuid="mock1", username="mock1", firstname="mock1", lastname="mock1")
+    session.add(user)
+
+    api_client = mocker.patch("securedrop_client.logic.sdclientapi.API")
+
+    user = {"uuid": "mock1", "username": "mock1", "first_name": "mock1", "last_name": "mock1"}
+    mocker.patch.object(api_client, "get_current_user", return_value=user)
+
+    job.call_api(api_client, session)
+
+    assert mock_get_remote_data.call_count == 1
+
+
+def test_MetadataSyncJob_success_current_user_name_change(mocker, homedir, session, session_maker):
+    job = MetadataSyncJob(homedir)
+
+    mock_source = factory.RemoteSource(
+        key={"type": "PGP", "public": PUB_KEY, "fingerprint": "123456ABC"}
+    )
+
+    mock_get_remote_data = mocker.patch(
+        "securedrop_client.api_jobs.sync.get_remote_data", return_value=([mock_source], [], [])
+    )
+
+    user = factory.User(uuid="mock1", username="mock1", firstname="mock1", lastname="mock1")
+    session.add(user)
+
+    api_client = mocker.patch("securedrop_client.logic.sdclientapi.API")
+
+    user = {"uuid": "mock2", "username": "mock2", "first_name": "mock2", "last_name": "mock2"}
+    mocker.patch.object(api_client, "get_current_user", return_value=user)
 
     job.call_api(api_client, session)
 

diff --git a/tests/functional/cassettes/test_delete_source.yaml b/tests/functional/cassettes/test_delete_source.yaml
diff --git a/tests/functional/cassettes/test_download_file.yaml b/tests/functional/cassettes/test_download_file.yaml
diff --git a/tests/functional/cassettes/test_export_dialog.yaml b/tests/functional/cassettes/test_export_dialog.yaml
diff --git a/tests/functional/cassettes/test_login_as_journalist.yaml b/tests/functional/cassettes/test_login_as_journalist.yaml
diff --git a/tests/functional/cassettes/test_login_from_offline.yaml b/tests/functional/cassettes/test_login_from_offline.yaml
diff --git a/tests/functional/cassettes/test_logout_as_journalist.yaml b/tests/functional/cassettes/test_logout_as_journalist.yaml
diff --git a/tests/functional/cassettes/test_offline_delete_source_attempt.yaml b/tests/functional/cassettes/test_offline_delete_source_attempt.yaml
diff --git a/tests/functional/cassettes/test_offline_read_conversation.yaml b/tests/functional/cassettes/test_offline_read_conversation.yaml
diff --git a/tests/functional/cassettes/test_offline_send_reply_to_source.yaml b/tests/functional/cassettes/test_offline_send_reply_to_source.yaml
diff --git a/tests/functional/cassettes/test_offline_star_source.yaml b/tests/functional/cassettes/test_offline_star_source.yaml
diff --git a/tests/functional/cassettes/test_receive_message_from_source.yaml b/tests/functional/cassettes/test_receive_message_from_source.yaml
diff --git a/tests/functional/cassettes/test_send_reply_to_source.yaml b/tests/functional/cassettes/test_send_reply_to_source.yaml
diff --git a/tests/functional/cassettes/test_star_source.yaml b/tests/functional/cassettes/test_star_source.yaml
diff --git a/tests/functional/cassettes/test_user_icon_click.yaml b/tests/functional/cassettes/test_user_icon_click.yaml