Skip to content

Commit

Permalink
blacked
Browse files Browse the repository at this point in the history
  • Loading branch information
wh1te909 committed Oct 24, 2024
1 parent 9618bdd commit 13c2da2
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 6 deletions.
4 changes: 3 additions & 1 deletion api/tacticalrmm/accounts/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,9 @@ def post(self, request, format=None):
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)
Expand Down
2 changes: 1 addition & 1 deletion api/tacticalrmm/ee/sso/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
path("ssoproviders/<int:pk>/", 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 = [
Expand Down
12 changes: 9 additions & 3 deletions api/tacticalrmm/ee/sso/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand All @@ -153,12 +157,14 @@ def post(self, request, format=None):

# 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

Expand Down
2 changes: 1 addition & 1 deletion api/tacticalrmm/tacticalrmm/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
"django.contrib.admin",
"django.contrib.messages",
)

if DEMO:
MIDDLEWARE += ("tacticalrmm.middleware.DemoMiddleware",)

Expand Down

0 comments on commit 13c2da2

Please sign in to comment.