paulmataruso/tacticalrmm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move name stuff to the correct view and add email fallback

Browse Source
This commit is contained in:
wh1te909
2024-11-10 20:59:27 +00:00
parent 0d34831df4
commit 86816ce357
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/tacticalrmm/accounts/views.py
View File

@@ -125,17 +125,8 @@ class LoginViewV2(KnoxLoginView):
) )
response = super().post(request, format=None) response = super().post(request, format=None)
response.data["username"] = request.user.username response.data["username"] = request.user.username
response.data["name"] = None response.data["name"] = None
if request.user.is_sso_user:
if request.user.first_name and request.user.last_name:
response.data["name"] = (
f"{request.user.first_name} {request.user.last_name}"
)
elif request.user.first_name:
response.data["name"] = request.user.first_name
return Response(response.data) return Response(response.data)
else: else:
AuditLog.audit_user_failed_twofactor( AuditLog.audit_user_failed_twofactor(

8
api/tacticalrmm/ee/sso/views.py
View File

@@ -188,12 +188,16 @@ class GetAccessToken(KnoxLoginView):
response.data["username"] = request.user.username response.data["username"] = request.user.username
response.data["provider"] = login_method["provider"] response.data["provider"] = login_method["provider"]
response.data["name"] = None
if request.user.first_name and request.user.last_name: if request.user.first_name and request.user.last_name:
response.data["name"] = ( response.data["name"] = (
f"{request.user.first_name} {request.user.last_name}" f"{request.user.first_name} {request.user.last_name}"
) )
else: elif request.user.first_name:
response.data["name"] = None response.data["name"] = request.user.first_name
elif request.user.email:
response.data["name"] = request.user.email
# log ip # log ip
ipw = IpWare() ipw = IpWare()