bk_login is_login/get_user send header x-verified-bk-app-code to back… (

#97)

* bk_login is_login/get_user send header x-verified-bk-app-code to backend api

* upgrade bkpaas-auth to 2.0.4

src/dashboard/apigateway/requirements.txt

@@ -14,7 +14,7 @@ bkapi-client-core==1.1.8 ; python_full_version >= "3.6.6" and python_version < "
 bkapi-client-generator==0.1.28 ; python_full_version >= "3.6.6" and python_version < "3.8"
 bkapi-component-open==1.1.0 ; python_full_version >= "3.6.6" and python_version < "3.8"
 bkapi-paasv3==1.0.1 ; python_full_version >= "3.6.6" and python_version < "3.8"
-bkpaas-auth==2.0.3 ; python_full_version >= "3.6.6" and python_version < "3.8"
+bkpaas-auth==2.0.4 ; python_full_version >= "3.6.6" and python_version < "3.8"
 blue-krill==1.2.3 ; python_full_version >= "3.6.6" and python_version < "3.8"
 cachetools==4.2.4 ; python_full_version >= "3.6.6" and python_version < "3.8"
 cattrs==1.0.0 ; python_full_version >= "3.6.6" and python_full_version < "3.7.0"

src/dashboard/apigateway/requirements_dev.txt

@@ -17,7 +17,7 @@ bkapi-client-core==1.1.8 ; python_full_version >= "3.6.6" and python_version < "
 bkapi-client-generator==0.1.28 ; python_full_version >= "3.6.6" and python_version < "3.8"
 bkapi-component-open==1.1.0 ; python_full_version >= "3.6.6" and python_version < "3.8"
 bkapi-paasv3==1.0.1 ; python_full_version >= "3.6.6" and python_version < "3.8"
-bkpaas-auth==2.0.3 ; python_full_version >= "3.6.6" and python_version < "3.8"
+bkpaas-auth==2.0.4 ; python_full_version >= "3.6.6" and python_version < "3.8"
 black==21.12b0 ; python_full_version >= "3.6.6" and python_version < "3.8"
 blue-krill==1.2.3 ; python_full_version >= "3.6.6" and python_version < "3.8"
 cachetools==4.2.4 ; python_full_version >= "3.6.6" and python_version < "3.8"

src/dashboard/pyproject.toml

@@ -37,7 +37,7 @@ typing_extensions = "4.1.1"
 jsonfield = "3.1.0"
 importlib-metadata = "4.8.3"
 greenlet = "2.0.2"
-bkpaas-auth = "2.0.3"
+bkpaas-auth = "2.0.4"
 blue-krill = "1.2.3"
 cryptography = "3.4.8"
 apigw-manager = "1.1.7"

src/esb/esb/components/bk/apisv2/bk_login/get_user.py

@@ -28,7 +28,7 @@
 
 class GetUser(Component):
     suggest_method = HTTP_METHOD.GET
-    label = u"获取用户信息"
+    label = "获取用户信息"
     label_en = "get user"
 
     sys_name = configs.SYSTEM_NAME
@@ -44,4 +44,7 @@ def handle(self):
             host=configs.host,
             path="/login/api/v2/get_user/",
             params=self.form_data,
+            headers={
+                "x-verified-bk-app-code": self.request.app_code,
+            },
         )

src/esb/esb/components/bk/apisv2/bk_login/is_login.py

@@ -28,7 +28,7 @@
 
 class IsLogin(Component):
     suggest_method = HTTP_METHOD.GET
-    label = u"用户登录态验证"
+    label = "用户登录态验证"
     label_en = "check is login"
 
     sys_name = configs.SYSTEM_NAME
@@ -43,4 +43,7 @@ def handle(self):
             host=configs.host,
             path="/login/api/v2/is_login/",
             params=self.form_data,
+            headers={
+                "x-verified-bk-app-code": self.request.app_code,
+            },
         )

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

@@ -26,22 +26,25 @@ class LOGINClient(object):
     def __init__(self, http_client):
         self.http_client = http_client
 
-    def request(self, method, host, path, data=None, params=None):
+    def request(self, method, host, path, data=None, params=None, headers=None):
+        headers = headers or {}
+        headers.update(configs.headers)
+
         result = self.http_client.request(
             method=method,
             host=host,
             path=path,
             data=data,
             params=params,
-            headers=configs.headers,
+            headers=headers,
         )
         return self.format_result(result)
 
-    def post(self, host, path, data=None):
-        return self.request(method="POST", host=host, path=path, data=data)
+    def post(self, host, path, data=None, headers=None):
+        return self.request(method="POST", host=host, path=path, data=data, headers=headers)
 
-    def get(self, host, path, params=None):
-        return self.request(method="GET", host=host, path=path, params=params)
+    def get(self, host, path, params=None, headers=None):
+        return self.request(method="GET", host=host, path=path, params=params, headers=headers)
 
     def format_result(self, result):
         if result["bk_error_code"] == 0: