Merge pull request #669 from alex-smile/esb_fix_fetch_user_info

修复 esb bk_login get_batch_users 组件

paas2/VERSION

@@ -1 +1 @@
-2.12.33
+2.12.34

paas2/esb/components/bk/apis/bk_login/toolkit/tools.py

@@ -13,13 +13,13 @@
 
 def convert_user_info(user):
     return {
-        "username": user.get("bk_username", ""),
+        "username": user.get("username", ""),
         "qq": user.get("qq", ""),
         "language": user.get("language", ""),
         "wx_userid": user.get("wx_userid", ""),
         "time_zone": user.get("time_zone", ""),
         "phone": user.get("telephone", ""),
         "role": str(user.get("bk_role", 0)),
-        "email": user.get("email"),
-        "chname": user.get("display_name"),
+        "email": user.get("email", ""),
+        "chname": user.get("display_name", ""),
     }

paas2/esb/components/bk/apisv2/bk_login/toolkit/tools.py

@@ -55,13 +55,13 @@ def format_result(self, result):
 
 def convert_user_info(user):
     return {
-        "bk_username": user.get("bk_username", ""),
+        "username": user.get("username", ""),
         "qq": user.get("qq", ""),
         "language": user.get("language", ""),
         "wx_userid": user.get("wx_userid", ""),
         "time_zone": user.get("time_zone", ""),
         "phone": user.get("telephone", ""),
-        "bk_role": user.get("bk_role", 0),
-        "email": user.get("email"),
-        "chname": user.get("display_name"),
+        "role": str(user.get("bk_role", 0)),
+        "email": user.get("email", ""),
+        "chname": user.get("display_name", ""),
     }

paas2/esb/components/bk/apisv2/usermanage/get_batch_users.py

@@ -10,6 +10,7 @@
 specific language governing permissions and limitations under the License.
 """
 
+from common.forms import BaseComponentForm, ListField
 from common.constants import API_TYPE_Q
 from components.component import Component
 from .toolkit import configs
@@ -24,15 +25,19 @@ class GetBatchUsers(Component):
     sys_name = configs.SYSTEM_NAME
     api_type = API_TYPE_Q
 
+    class Form(BaseComponentForm):
+        bk_username_list = ListField(label="username list", required=True)
+
     def handle(self):
-        comp_obj = self.prepare_other(
-            "generic.v2.usermanage.usermanage_component",
-            kwargs=self.request.kwargs,
-        )
-        comp_obj.setup_conf(
-            {
-                "dest_path": "/api/v1/profile_batch/",
-                "dest_http_method": "POST",
-            }
-        )
-        self.response.payload = comp_obj.invoke()
+        params = {
+            "lookup_field": "username",
+            "no_page": True,
+            "best_match": 1,
+            "exact_lookups": ",".join(self.form_data["bk_username_list"]),
+            "fields": "username,country_code,telephone,email,wx_userid,display_name,qq,language,time_zone",
+        }
+
+        result = self.invoke_other("generic.v2.usermanage.list_users", kwargs=params)
+        if result["result"]:
+            result["data"] = dict([(user["username"], user) for user in result["data"]])
+        self.response.payload = result

paas2/release.md

@@ -1,5 +1,8 @@
 Release Log
 ===============================
+# 2.12.34
+    - bug: esb fix bk_login get_batch_users
+
 # 2.12.33
     - bug: esb fix iam_delete_component