From 50bd0b796d40ea9928e6f55924df252ad4e7b32b Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Tue, 22 Jun 2021 19:09:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9LDAP=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=9A=84=E7=BB=84=E7=BB=87=E4=B8=BA=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/settings/api/ldap.py   | 21 ++++++++++++++++-----
 apps/settings/utils/ldap.py |  8 ++++++--
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/apps/settings/api/ldap.py b/apps/settings/api/ldap.py
index 0c982d1b1..dd5c15563 100644
--- a/apps/settings/api/ldap.py
+++ b/apps/settings/api/ldap.py
@@ -7,8 +7,7 @@ from collections.abc import Iterable
 from smtplib import SMTPSenderRefused
 from rest_framework import generics
 from rest_framework.views import Response, APIView
-from django.conf import settings
-from django.core.mail import send_mail, get_connection
+from orgs.models import Organization
 from django.utils.translation import ugettext_lazy as _
 
 from ..utils import (
@@ -17,11 +16,12 @@ from ..utils import (
 )
 from ..tasks import sync_ldap_user
 from common.permissions import IsOrgAdmin, IsSuperUser
-from common.utils import get_logger
+from common.utils import get_logger, is_uuid
 from ..serializers import (
     MailTestSerializer, LDAPTestConfigSerializer, LDAPUserSerializer,
     PublicSettingSerializer, LDAPTestLoginSerializer, SettingsSerializer
 )
+from orgs.utils import current_org
 from users.models import User
 
 logger = get_logger(__file__)
@@ -170,6 +170,14 @@ class LDAPUserListApi(generics.ListAPIView):
 class LDAPUserImportAPI(APIView):
     permission_classes = (IsSuperUser,)
 
+    def get_org(self):
+        org_id = self.request.data.get('org_id')
+        if is_uuid(org_id):
+            org = Organization.objects.get(id=org_id)
+        else:
+            org = current_org
+        return org
+
     def get_ldap_users(self):
         username_list = self.request.data.get('username_list', [])
         cache_police = self.request.query_params.get('cache_police', True)
@@ -188,12 +196,15 @@ class LDAPUserImportAPI(APIView):
         if users is None:
             return Response({'msg': _('Get ldap users is None')}, status=400)
 
-        errors = LDAPImportUtil().perform_import(users)
+        org = self.get_org()
+        errors = LDAPImportUtil().perform_import(users, org)
         if errors:
             return Response({'errors': errors}, status=400)
 
         count = users if users is None else len(users)
-        return Response({'msg': _('Imported {} users successfully').format(count)})
+        return Response({
+            'msg': _('Imported {} users successfully (Organization: {})').format(count, org)
+        })
 
 
 class LDAPCacheRefreshAPI(generics.RetrieveAPIView):
diff --git a/apps/settings/utils/ldap.py b/apps/settings/utils/ldap.py
index 0cac92a4c..366d21614 100644
--- a/apps/settings/utils/ldap.py
+++ b/apps/settings/utils/ldap.py
@@ -362,15 +362,19 @@ class LDAPImportUtil(object):
         )
         return obj, created
 
-    def perform_import(self, users):
+    def perform_import(self, users, org=None):
         logger.info('Start perform import ldap users, count: {}'.format(len(users)))
         errors = []
+        objs = []
         for user in users:
             try:
-                self.update_or_create(user)
+                obj, created = self.update_or_create(user)
+                objs.append(obj)
             except Exception as e:
                 errors.append({user['username']: str(e)})
                 logger.error(e)
+        if org and not org.is_root():
+            org.members.add(*objs)
         logger.info('End perform import ldap users')
         return errors