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

fix some 500 errors

Browse Source
This commit is contained in:
sadnub
2024-10-18 17:50:21 -04:00
parent 61790d2261
commit bacf4154fd
5 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.devcontainer/entrypoint.sh
View File

@@ -71,7 +71,7 @@ ADMIN_URL = 'admin/'
ALLOWED_HOSTS = ['${API_HOST}', '${APP_HOST}', '*'] ALLOWED_HOSTS = ['${API_HOST}', '${APP_HOST}', '*']
CORS_ORIGIN_WHITELIST = ['https://${APP_HOST}', 'https://${API_HOST}'] CORS_ORIGIN_WHITELIST = ['https://${APP_HOST}']
CORS_ALLOW_CREDENTIALS = True CORS_ALLOW_CREDENTIALS = True
SESSION_COOKIE_DOMAIN = '${BASE_DOMAIN}' SESSION_COOKIE_DOMAIN = '${BASE_DOMAIN}'

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

@@ -262,17 +262,20 @@ class GetAddUsers(APIView):
accounts = SocialAccount.objects.filter(user_id=obj.pk) accounts = SocialAccount.objects.filter(user_id=obj.pk)
return [ if len(accounts) > 0:
{ return [
"uid": account.uid, {
"provider": account.provider, "uid": account.uid,
"display": account.get_provider_account().to_str(), "provider": account.provider,
"last_login": account.last_login, "display": account.get_provider_account().to_str(),
"date_joined": account.date_joined, "last_login": account.last_login,
"extra_data": account.extra_data, "date_joined": account.date_joined,
} "extra_data": account.extra_data,
for account in accounts }
] for account in accounts
]
else:
return []
class Meta: class Meta:
model = User model = User

1
api/tacticalrmm/ee/sso/permissions.py
View File

@@ -5,5 +5,4 @@ from allauth.socialaccount.models import SocialAccount
class SSOLoginPerms(permissions.BasePermission): class SSOLoginPerms(permissions.BasePermission):
def has_permission(self, r, view): def has_permission(self, r, view):
connected_apps = SocialAccount.objects.filter(user=r.user) connected_apps = SocialAccount.objects.filter(user=r.user)
return len(connected_apps) > 0 return len(connected_apps) > 0

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

@@ -125,7 +125,7 @@ class GetUpdateDeleteSSOProvider(APIView):
class GetAccessToken(KnoxLoginView): class GetAccessToken(KnoxLoginView):
permission_classes = [SSOLoginPerms] permission_classes = [IsAuthenticated, SSOLoginPerms]
authentication_classes = [SessionAuthentication] authentication_classes = [SessionAuthentication]
def post(self, request, format=None): def post(self, request, format=None):

2
docker/containers/tactical/entrypoint.sh
View File

@@ -92,7 +92,7 @@ ALLOWED_HOSTS = ['${API_HOST}', '${APP_HOST}', 'tactical-backend']
ADMIN_URL = '${ADMINURL}/' ADMIN_URL = '${ADMINURL}/'
CORS_ORIGIN_WHITELIST = ['https://${APP_HOST}', 'https://${API_HOST}'] CORS_ORIGIN_WHITELIST = ['https://${APP_HOST}']
CORS_ALLOW_CREDENTIALS = True CORS_ALLOW_CREDENTIALS = True
SESSION_COOKIE_DOMAIN = '${BASE_DOMAIN}' SESSION_COOKIE_DOMAIN = '${BASE_DOMAIN}'