Skip to content

Commit d5908dc

Browse files
authored
Merge pull request #377 from softwareone-platform/MPT-18999_apply_performance_fixes
Mpt 18999 apply performance fixes
2 parents c86e266 + a39205e commit d5908dc

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

auth/auth_server/controllers/user.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,12 @@ def get(self, item_id, **kwargs):
211211
if 'token' in kwargs:
212212
token = kwargs.pop('token')
213213
user = self.get_user(token)
214-
action_resources = self.get_action_resources(token,
215-
['LIST_USERS'])
216-
if not (check_action(action_resources, 'LIST_USERS',
217-
item.type.name, item.scope_id) or
218-
self._is_self_edit(user, item_id)):
219-
raise ForbiddenException(Err.OA0012, [])
214+
if not self._is_self_edit(user, item_id):
215+
action_resources = self.get_action_resources(
216+
token, ['LIST_USERS'])
217+
if not check_action(action_resources, 'LIST_USERS',
218+
item.type.name, item.scope_id):
219+
raise ForbiddenException(Err.OA0012, [])
220220
payload = ((item.type.name, item.scope_id),)
221221
scope_info = self.get_resources_info(payload).get(item.scope_id, {})
222222
return item, scope_info

rest_api/rest_api_server/utils.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
from concurrent.futures import ThreadPoolExecutor
1212
from datetime import datetime
1313
from decimal import Decimal
14+
from functools import cache
1415
from string import ascii_letters, digits
1516
from urllib.parse import urlencode
1617

@@ -523,6 +524,7 @@ def get_root_directory_path():
523524
return os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
524525

525526

527+
@cache
526528
def _get_encryption_salt():
527529
return Config().client.encryption_salt()
528530

0 commit comments

Comments
 (0)