From c28d800d7f2f34949f5d50117073100ae8c3a1e1 Mon Sep 17 00:00:00 2001 From: wh1te909 <7434746+wh1te909@users.noreply.github.com> Date: Thu, 24 Oct 2024 04:49:17 +0000 Subject: [PATCH] blacked --- api/tacticalrmm/accounts/views.py | 4 +++- api/tacticalrmm/ee/sso/urls.py | 2 +- api/tacticalrmm/ee/sso/views.py | 12 +++++++++--- api/tacticalrmm/tacticalrmm/settings.py | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/api/tacticalrmm/accounts/views.py b/api/tacticalrmm/accounts/views.py index a59d6cf1..b13a7aa4 100644 --- a/api/tacticalrmm/accounts/views.py +++ b/api/tacticalrmm/accounts/views.py @@ -115,7 +115,9 @@ class LoginViewV2(KnoxLoginView): response = super().post(request, format=None) response.data["username"] = request.user.username 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: response.data["name"] = None return Response(response.data) diff --git a/api/tacticalrmm/ee/sso/urls.py b/api/tacticalrmm/ee/sso/urls.py index 6519a160..175dc488 100644 --- a/api/tacticalrmm/ee/sso/urls.py +++ b/api/tacticalrmm/ee/sso/urls.py @@ -28,7 +28,7 @@ urlpatterns = [ path("ssoproviders//", views.GetUpdateDeleteSSOProvider.as_view()), path("ssoproviders/token/", views.GetAccessToken.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 = [ diff --git a/api/tacticalrmm/ee/sso/views.py b/api/tacticalrmm/ee/sso/views.py index 7a5ddffe..4bddd729 100644 --- a/api/tacticalrmm/ee/sso/views.py +++ b/api/tacticalrmm/ee/sso/views.py @@ -128,7 +128,11 @@ class DisconnectSSOAccount(APIView): permission_classes = [IsAuthenticated, AccountsPerms] 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() @@ -153,12 +157,14 @@ class GetAccessToken(KnoxLoginView): # get token response = super().post(request, format=None) - + response.data["username"] = request.user.username response.data["provider"] = login_method["provider"] 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: response.data["name"] = None diff --git a/api/tacticalrmm/tacticalrmm/settings.py b/api/tacticalrmm/tacticalrmm/settings.py index 2f4576e0..4f211ceb 100644 --- a/api/tacticalrmm/tacticalrmm/settings.py +++ b/api/tacticalrmm/tacticalrmm/settings.py @@ -258,7 +258,7 @@ if ADMIN_ENABLED: "django.contrib.admin", "django.contrib.messages", ) - + if DEMO: MIDDLEWARE += ("tacticalrmm.middleware.DemoMiddleware",)