github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-12 13:31:56 +00:00
Code Issues Projects Releases Wiki Activity

perf: Setting user attributes is invalid

Browse Source
This commit is contained in:
feng
2024-08-09 16:49:59 +08:00
committed by feng626
parent 5d2d8ca487
commit cea63e6083
6 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/common/sdk/im/slack/__init__.py
View File

@@ -94,7 +94,6 @@ class SlackRequests:
class Slack:
attributes = settings.SLACK_RENAME_ATTRIBUTES
def __init__(self, client_id=None, client_secret=None, bot_token=None, **kwargs):
self._client = SlackRequests(
@@ -102,6 +101,10 @@ class Slack:
)
self.markdown = mistune.Markdown(renderer=SlackRenderer())
@property
def attributes(self):
return settings.SLACK_RENAME_ATTRIBUTES
def get_user_id_by_code(self, code):
self._client.request_access_token(code)
response = self._client.request(
@@ -141,8 +144,8 @@ class Slack:
logger.exception(e)
@staticmethod
def default_user_detail(data):
username = data['user_id']
def default_user_detail(data, user_id):
username = data.get('id', user_id)
username = data.get('name', username)
name = data.get('real_name', username)
email = data.get('profile.email')
@@ -157,6 +160,6 @@ class Slack:
data = kwargs['other_info']
data['user_id'] = user_id
info = flatten_dict(data)
default_detail = self.default_user_detail(data)
default_detail = self.default_user_detail(data, user_id)
detail = map_attributes(default_detail, info, self.attributes)
return detail