github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

[Update] 修改设置session的时间，避免sdk等报错

pull/3100/head
ibuler 2019-08-08 15:14:08 +08:00
parent 0ee5d3b79f
commit 42ff5a382a
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/jumpserver/middleware.py
View File

@ -57,7 +57,8 @@ class RequestMiddleware:
def __call__(self, request): def __call__(self, request):
set_current_request(request) set_current_request(request)
response = self.get_response(request) response = self.get_response(request)
if not settings.SESSION_EXPIRE_AT_BROWSER_CLOSE: is_request_api = request.path.startswith('/api')
if not settings.SESSION_EXPIRE_AT_BROWSER_CLOSE and not is_request_api:
age = request.session.get_expiry_age() age = request.session.get_expiry_age()
request.session.set_expiry(age) request.session.set_expiry(age)
return response return response

5
apps/users/api/user.py
View File

@ -179,6 +179,11 @@ class UserProfileApi(generics.RetrieveAPIView):
def get_object(self): def get_object(self):
return self.request.user return self.request.user
def retrieve(self, request, *args, **kwargs):
age = request.session.get_expiry_age()
request.session.set_expiry(age)
return super().retrieve(request, *args, **kwargs)
class UserResetOTPApi(generics.RetrieveAPIView): class UserResetOTPApi(generics.RetrieveAPIView):
queryset = User.objects.all() queryset = User.objects.all()