Skip to content

Refactor: Simplified is_admin determination #1104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MariusWirtz merged 1 commit into from
Apr 16, 2024
Merged

Refactor: Simplified is_admin determination #1104

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 9 additions & 19 deletions TM1py/Services/RestService.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,21 +152,17 @@ def __init__(self, **kwargs):
self.handle_logging(kwargs.get('logging', False))

self._proxies = self._handle_proxies(kwargs.get('proxies', None))
self._is_admin = None
self._is_data_admin = None
self._is_security_admin = None
self._is_ops_admin = None

# populated later on the fly for users with the name different from 'Admin'
self._is_admin = self._determine_is_admin(kwargs.get('user', None))

# populated on the fly
if kwargs.get('user'):
self._is_admin = True if case_and_space_insensitive_equals(kwargs.get('user'), 'ADMIN') else None
self._is_data_admin = True if case_and_space_insensitive_equals(kwargs.get('user'), 'ADMIN') else None
self._is_security_admin = True if case_and_space_insensitive_equals(kwargs.get('user'), 'ADMIN') else None
self._is_ops_admin = True if case_and_space_insensitive_equals(kwargs.get('user'), 'ADMIN') else None
else:
self._is_admin = None
self._is_data_admin = None
self._is_security_admin = None
self._is_ops_admin = None
if self._user and case_and_space_insensitive_equals(self._user, 'ADMIN'):
self._is_admin = True
self._is_data_admin = True
self._is_security_admin = True
self._is_ops_admin = True

self._verify = self._determine_verify(kwargs.get('verify', None))

Expand All @@ -190,12 +186,6 @@ def __init__(self, **kwargs):

self._manage_http_adapter()

def _determine_is_admin(self, user: [None, str]) -> [None, bool]:
if user is None:
return None

return True if case_and_space_insensitive_equals(user, 'ADMIN') else None

def _determine_verify(self, verify: [bool, str] = None) -> [bool, str]:
if verify is None:
# Default SSL verification in v12 is True
Expand Down