fix some 500 errors
This commit is contained in:
@@ -71,7 +71,7 @@ ADMIN_URL = 'admin/'
|
||||
|
||||
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
|
||||
|
||||
SESSION_COOKIE_DOMAIN = '${BASE_DOMAIN}'
|
||||
|
@@ -262,17 +262,20 @@ class GetAddUsers(APIView):
|
||||
|
||||
accounts = SocialAccount.objects.filter(user_id=obj.pk)
|
||||
|
||||
return [
|
||||
{
|
||||
"uid": account.uid,
|
||||
"provider": account.provider,
|
||||
"display": account.get_provider_account().to_str(),
|
||||
"last_login": account.last_login,
|
||||
"date_joined": account.date_joined,
|
||||
"extra_data": account.extra_data,
|
||||
}
|
||||
for account in accounts
|
||||
]
|
||||
if len(accounts) > 0:
|
||||
return [
|
||||
{
|
||||
"uid": account.uid,
|
||||
"provider": account.provider,
|
||||
"display": account.get_provider_account().to_str(),
|
||||
"last_login": account.last_login,
|
||||
"date_joined": account.date_joined,
|
||||
"extra_data": account.extra_data,
|
||||
}
|
||||
for account in accounts
|
||||
]
|
||||
else:
|
||||
return []
|
||||
|
||||
class Meta:
|
||||
model = User
|
||||
|
@@ -5,5 +5,4 @@ from allauth.socialaccount.models import SocialAccount
|
||||
class SSOLoginPerms(permissions.BasePermission):
|
||||
def has_permission(self, r, view):
|
||||
connected_apps = SocialAccount.objects.filter(user=r.user)
|
||||
|
||||
return len(connected_apps) > 0
|
||||
|
@@ -125,7 +125,7 @@ class GetUpdateDeleteSSOProvider(APIView):
|
||||
|
||||
|
||||
class GetAccessToken(KnoxLoginView):
|
||||
permission_classes = [SSOLoginPerms]
|
||||
permission_classes = [IsAuthenticated, SSOLoginPerms]
|
||||
authentication_classes = [SessionAuthentication]
|
||||
|
||||
def post(self, request, format=None):
|
||||
|
@@ -92,7 +92,7 @@ ALLOWED_HOSTS = ['${API_HOST}', '${APP_HOST}', 'tactical-backend']
|
||||
|
||||
ADMIN_URL = '${ADMINURL}/'
|
||||
|
||||
CORS_ORIGIN_WHITELIST = ['https://${APP_HOST}', 'https://${API_HOST}']
|
||||
CORS_ORIGIN_WHITELIST = ['https://${APP_HOST}']
|
||||
CORS_ALLOW_CREDENTIALS = True
|
||||
|
||||
SESSION_COOKIE_DOMAIN = '${BASE_DOMAIN}'
|
||||
|
Reference in New Issue
Block a user