Skip to content

Commit

Permalink
Merge pull request #819 from wklken/ft_login_esb_apis
Browse files Browse the repository at this point in the history
feat(esb/conf): add usermanage apis for login
  • Loading branch information
alex-smile authored Mar 29, 2022
2 parents fd0df07 + 56c1602 commit 786b7e0
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 2 deletions.
2 changes: 1 addition & 1 deletion paas2/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.12.46
2.12.47
69 changes: 68 additions & 1 deletion paas2/esb/components/esb_conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from django.conf import settings

from components.component import ApiChannelForAPIS, ESBApiChannelForAPIS, FTAApiChannelForAPIS
from esb.bkapp.validators import AppAuthValidator
from esb.bkapp.validators import AppAuthValidator, AppCodeWhiteListValidator
from esb.bkauth.validators import UserAuthWithBKTokenValidator


Expand Down Expand Up @@ -584,6 +584,73 @@ def _rel_path(x):
},
},
),
(
"/v1/usermanage/login/check/",
{
"comp_codename": "generic.v2.usermanage.usermanage_component",
"request_validators": [
AppAuthValidator(),
AppCodeWhiteListValidator(
(
"bk_login",
"bk_paas",
"bk_console",
)
),
],
"is_hidden": True,
"comp_conf": {
"name": "api_v1_login_check",
"dest_http_method": "POST",
"dest_path": "/api/v1/login/check/",
},
},
),
(
"/v1/usermanage/login/profile/",
{
"comp_codename": "generic.v2.usermanage.usermanage_component",
"request_validators": [
AppAuthValidator(),
AppCodeWhiteListValidator(
(
"bk_login",
"bk_paas",
"bk_console",
)
),
],
"is_hidden": True,
"comp_conf": {
"name": "api_v1_login_profile",
"dest_http_method": "POST",
"dest_path": "/api/v1/login/profile/",
},
},
),
(
"/v1/usermanage/login/profile/query/",
{
"comp_codename": "generic.v2.usermanage.usermanage_component",
"request_validators": [
AppAuthValidator(),
AppCodeWhiteListValidator(
(
"bk_login",
"bk_paas",
"bk_console",
)
),
],
"is_hidden": True,
"comp_conf": {
"name": "api_v1_login_profile_query",
"dest_http_method": "POST",
"dest_path": "/api/v1/login/profile/query/",
},
},
),

],
},
"esb": {
Expand Down
3 changes: 3 additions & 0 deletions paas2/release.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
Release Log
===============================
# 2.12.47
- update: esb update usermanage apis, for bk_login

# 2.12.46
- update: esb add with_jwt_header=True for usermanage

Expand Down

0 comments on commit 786b7e0

Please sign in to comment.