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

blacked

Browse Source
This commit is contained in:
wh1te909
2024-10-24 04:49:17 +00:00
committed by sadnub
parent 4fd772ecd8
commit c28d800d7f
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,7 +115,9 @@ 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
if request.user.first_name and request.user.last_name: if request.user.first_name and request.user.last_name:
response.data["name"] = f"{request.user.first_name} {request.user.last_name}" response.data["name"] = (
f"{request.user.first_name} {request.user.last_name}"
)
else: else:
response.data["name"] = None response.data["name"] = None
return Response(response.data) return Response(response.data)

2
api/tacticalrmm/ee/sso/urls.py
View File

@@ -28,7 +28,7 @@ urlpatterns = [
path("ssoproviders/<int:pk>/", views.GetUpdateDeleteSSOProvider.as_view()), path("ssoproviders/<int:pk>/", views.GetUpdateDeleteSSOProvider.as_view()),
path("ssoproviders/token/", views.GetAccessToken.as_view()), path("ssoproviders/token/", views.GetAccessToken.as_view()),
path("ssoproviders/settings/", views.GetUpdateSSOSettings.as_view()), path("ssoproviders/settings/", views.GetUpdateSSOSettings.as_view()),
path("ssoproviders/account/", views.DisconnectSSOAccount.as_view()) path("ssoproviders/account/", views.DisconnectSSOAccount.as_view()),
] ]
allauth_urls = [ allauth_urls = [

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

@@ -128,7 +128,11 @@ class DisconnectSSOAccount(APIView):
permission_classes = [IsAuthenticated, AccountsPerms] permission_classes = [IsAuthenticated, AccountsPerms]
def delete(self, request): def delete(self, request):
account = get_object_or_404(SocialAccount, uid=request.data["account"], provider=request.data["provider"]) account = get_object_or_404(
SocialAccount,
uid=request.data["account"],
provider=request.data["provider"],
)
account.delete() account.delete()
@@ -153,12 +157,14 @@ class GetAccessToken(KnoxLoginView):
# get token # get token
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["provider"] = login_method["provider"] response.data["provider"] = login_method["provider"]
if request.user.first_name and request.user.last_name: if request.user.first_name and request.user.last_name:
response.data["name"] = f"{request.user.first_name} {request.user.last_name}" response.data["name"] = (
f"{request.user.first_name} {request.user.last_name}"
)
else: else:
response.data["name"] = None response.data["name"] = None

2
api/tacticalrmm/tacticalrmm/settings.py
View File

@@ -258,7 +258,7 @@ if ADMIN_ENABLED:
"django.contrib.admin", "django.contrib.admin",
"django.contrib.messages", "django.contrib.messages",
) )
if DEMO: if DEMO:
MIDDLEWARE += ("tacticalrmm.middleware.DemoMiddleware",) MIDDLEWARE += ("tacticalrmm.middleware.DemoMiddleware",)