haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-18 00:00:00 +00:00
Code Issues Releases Wiki Activity

update admin import dingtalk user (#4712)

Browse Source 
Co-authored-by: lian <lian@seafile.com>
This commit is contained in:
lian
2020-11-05 15:12:59 +08:00
committed by GitHub
parent 2248ebc50b
commit 18d44452b4
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
seahub/api2/endpoints/admin/dingtalk.py
View File

@@ -38,6 +38,7 @@ DEPARTMENT_OWNER = 'system admin'
logger = logging.getLogger(__name__)
def update_dingtalk_user_info(email, name, contact_email, avatar_url):
# make sure the contact_email is unique
@@ -57,17 +58,19 @@ def update_dingtalk_user_info(email, name, contact_email, avatar_url):
except Exception as e:
logger.error(e)
try:
image_name = 'dingtalk_avatar'
image_file = requests.get(avatar_url).content
avatar = Avatar.objects.filter(emailuser=email, primary=True).first()
avatar = avatar or Avatar(emailuser=email, primary=True)
avatar_file = ContentFile(image_file)
avatar_file.name = image_name
avatar.avatar = avatar_file
avatar.save()
except Exception as e:
logger.error(e)
if avatar_url:
try:
image_name = 'dingtalk_avatar'
image_file = requests.get(avatar_url).content
avatar = Avatar.objects.filter(emailuser=email, primary=True).first()
avatar = avatar or Avatar(emailuser=email, primary=True)
avatar_file = ContentFile(image_file)
avatar_file.name = image_name
avatar.avatar = avatar_file
avatar.save()
except Exception as e:
logger.error(e)
class AdminDingtalkDepartments(APIView):
@@ -213,8 +216,10 @@ class AdminDingtalkUsersBatch(APIView):
})
try:
update_dingtalk_user_info(email, user.get('name'),
user.get('contact_email'), user.get('avatar'))
update_dingtalk_user_info(email,
user.get('name'),
user.get('contact_email'),
user.get('avatar'))
except Exception as e:
logger.error(e)
@@ -418,8 +423,10 @@ class AdminDingtalkDepartmentsImport(APIView):
failed.append(failed_msg)
try:
update_dingtalk_user_info(email, api_user.get('name'),
api_user.get('contact_email'), api_user.get('avatar'))
update_dingtalk_user_info(email,
api_user.get('name'),
api_user.get('contact_email'),
api_user.get('avatar'))
except Exception as e:
logger.error(e)