From 71128d21d9fbcf14c13c026057b82dc9dd74d747 Mon Sep 17 00:00:00 2001
From: Bertrand Zuchuat <bertrand.zuchuat@rero.ch>
Date: Wed, 19 Oct 2022 08:11:16 +0200
Subject: [PATCH] logged user: fix settings

Co-Authored-by: Bertrand Zuchuat <bertrand.zuchuat@rero.ch>
---
 sonar/theme/views.py   | 85 ++++++++++++++++++++----------------------
 tests/ui/test_views.py |  3 +-
 2 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/sonar/theme/views.py b/sonar/theme/views.py
index 8c2950fe..2252517a 100644
--- a/sonar/theme/views.py
+++ b/sonar/theme/views.py
@@ -173,14 +173,6 @@ def manage(path=None):
 @blueprint.route('/logged-user/', methods=['GET'])
 def logged_user():
     """Current logged user informations in JSON."""
-    if current_user.is_anonymous:
-        return jsonify({})
-
-    user = current_user_record
-
-    if user and 'resolve' in request.args:
-        user = user.replace_refs()
-
     data = {
         'settings': {
             'document_identifier_link': current_app.config \
@@ -188,43 +180,48 @@ def logged_user():
         }
     }
 
-    if user:
-        data['metadata'] = user.dumps()
-        data['metadata']['is_superuser'] = user.is_superuser
-        data['metadata']['is_admin'] = user.is_admin
-        data['metadata']['is_moderator'] = user.is_moderator
-        data['metadata']['is_submitter'] = user.is_submitter
-        data['metadata']['is_user'] = user.is_user
-        data['metadata']['permissions'] = {
-            'users': {
-                'add': UserPermission.create(user),
-                'list': UserPermission.list(user)
-            },
-            'documents': {
-                'add': DocumentPermission.create(user),
-                'list': DocumentPermission.list(user)
-            },
-            'organisations': {
-                'add': OrganisationPermission.create(user),
-                'list': OrganisationPermission.list(user)
-            },
-            'deposits': {
-                'add': DepositPermission.create(user),
-                'list': DepositPermission.list(user)
-            },
-            'projects': {
-                'add': RecordPermissionPolicy('create').can(),
-                'list': RecordPermissionPolicy('search').can()
-            },
-            'collections': {
-                'add': CollectionPermission.create(user),
-                'list': CollectionPermission.list(user)
-            },
-            'subdivisions': {
-                'add': SubdivisionPermission.create(user),
-                'list': SubdivisionPermission.list(user)
+    if not current_user.is_anonymous:
+        user = current_user_record
+        if user and 'resolve' in request.args:
+            user = user.replace_refs()
+
+        if user:
+            data['metadata'] = user.dumps()
+            data['metadata']['is_superuser'] = user.is_superuser
+            data['metadata']['is_admin'] = user.is_admin
+            data['metadata']['is_moderator'] = user.is_moderator
+            data['metadata']['is_submitter'] = user.is_submitter
+            data['metadata']['is_user'] = user.is_user
+            data['metadata']['permissions'] = {
+                'users': {
+                    'add': UserPermission.create(user),
+                    'list': UserPermission.list(user)
+                },
+                'documents': {
+                    'add': DocumentPermission.create(user),
+                    'list': DocumentPermission.list(user)
+                },
+                'organisations': {
+                    'add': OrganisationPermission.create(user),
+                    'list': OrganisationPermission.list(user)
+                },
+                'deposits': {
+                    'add': DepositPermission.create(user),
+                    'list': DepositPermission.list(user)
+                },
+                'projects': {
+                    'add': RecordPermissionPolicy('create').can(),
+                    'list': RecordPermissionPolicy('search').can()
+                },
+                'collections': {
+                    'add': CollectionPermission.create(user),
+                    'list': CollectionPermission.list(user)
+                },
+                'subdivisions': {
+                    'add': SubdivisionPermission.create(user),
+                    'list': SubdivisionPermission.list(user)
+                }
             }
-        }
 
     # TODO: If an organisation is associated to user and only when running
     # tests, organisation cannot not be encoded to JSON after call of
diff --git a/tests/ui/test_views.py b/tests/ui/test_views.py
index fe00d7d4..c84dc8b4 100644
--- a/tests/ui/test_views.py
+++ b/tests/ui/test_views.py
@@ -83,7 +83,8 @@ def test_logged_user(app, client, superuser, admin, moderator, submitter,
     url = url_for('sonar.logged_user')
 
     res = client.get(url)
-    assert b'{}' in res.data
+    assert b'settings' in res.data
+    assert b'metadata' not in res.data
 
     # Logged as admin
     login_user_via_session(client, email=admin['email'])