Commit 183ff095 authored by ibuler's avatar ibuler

[Update] 修改token返回

parent 8386f107
...@@ -3,6 +3,7 @@ import uuid ...@@ -3,6 +3,7 @@ import uuid
from django.core.cache import cache from django.core.cache import cache
from django.urls import reverse from django.urls import reverse
from django.shortcuts import get_object_or_404
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from rest_framework import generics from rest_framework import generics
...@@ -20,6 +21,7 @@ from .permissions import IsSuperUser, IsValidUser, IsCurrentUserOrReadOnly, \ ...@@ -20,6 +21,7 @@ from .permissions import IsSuperUser, IsValidUser, IsCurrentUserOrReadOnly, \
IsSuperUserOrAppUser IsSuperUserOrAppUser
from .utils import check_user_valid, generate_token, get_login_ip, \ from .utils import check_user_valid, generate_token, get_login_ip, \
check_otp_code, set_user_login_failed_count_to_cache, is_block_login check_otp_code, set_user_login_failed_count_to_cache, is_block_login
from .hands import Asset, SystemUser
from common.mixins import IDInFilterMixin from common.mixins import IDInFilterMixin
from common.utils import get_logger from common.utils import get_logger
...@@ -305,10 +307,16 @@ class UserConnectionTokenApi(APIView): ...@@ -305,10 +307,16 @@ class UserConnectionTokenApi(APIView):
asset_id = request.data.get('asset', '') asset_id = request.data.get('asset', '')
system_user_id = request.data.get('system_user', '') system_user_id = request.data.get('system_user', '')
token = str(uuid.uuid4()) token = str(uuid.uuid4())
user = get_object_or_404(User, id=user_id)
asset = get_object_or_404(Asset, id=asset_id)
system_user = get_object_or_404(SystemUser, id=system_user_id)
value = { value = {
'user': user_id, 'user': user_id,
'username': user.username,
'asset': asset_id, 'asset': asset_id,
'system_user': system_user_id 'hostname': asset.hostname,
'system_user': system_user_id,
'system_user_name': system_user.name
} }
cache.set(token, value, timeout=20) cache.set(token, value, timeout=20)
return Response({"token": token}, status=201) return Response({"token": token}, status=201)
......
...@@ -15,3 +15,4 @@ ...@@ -15,3 +15,4 @@
# from users.models import User # from users.models import User
# from perms.models import AssetPermission # from perms.models import AssetPermission
# from perms.utils import get_user_granted_assets, get_user_granted_asset_groups # from perms.utils import get_user_granted_assets, get_user_granted_asset_groups
from assets.models import Asset, SystemUser
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment