Skip to content

Commit

Permalink
Merge 169f03b into f23183b
Browse files Browse the repository at this point in the history
  • Loading branch information
Garfield-fr committed Oct 19, 2022
2 parents f23183b + 169f03b commit a0afc9b
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 45 deletions.
85 changes: 41 additions & 44 deletions sonar/theme/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -173,58 +173,55 @@ 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 \
.get('SONAR_APP_DOCUMENT_IDENTIFIER_LINK')
}
}

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
Expand Down
3 changes: 2 additions & 1 deletion tests/ui/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Expand Down

0 comments on commit a0afc9b

Please sign in to comment.