diff --git a/api/views.py b/api/views.py index f3a1ac1..6b0e0f2 100644 --- a/api/views.py +++ b/api/views.py @@ -366,34 +366,12 @@ def NCTest(request): return JsonResponse({'status' : False, 'message': 'AUTH ERROR'}) -@api_view(['POST'], ) +@api_view(['GET'], ) def SetUserData(request): - #print("HI!") - #user = User.objects.get(username=request.POST.get('uid')) - #user.set_password(request.POST.get('pw')) - #user.save() - #user = authenticate(username=request.POST.get('uid'), password=request.POST.get('pw')) - #print(request.POST.get('uid')) - #print(request.POST.get('pw')) - return JsonResponse({}) - #user = User.objects.get(username=request.POST.get('uid')) - #user.backend = 'django.contrib.auth.backends.ModelBackend' - #login(request, user) - #login(request, )) - #if(request.session.get('_auth_user_id') == None): - # print("LOGIN " + request.POST.get('uid')) - - #else: - # print("user logged") - #return JsonResponse({}) - #print(request.session.get('_auth_user_id')) - #print(request.POST.get('uid')) - #print(request.POST.get('reqdata')) - #if(request.POST.get('key') == "lkais8id7oauihsdjgt6as7zdukHJAGHFTJ7s6a8dziuhabjshdatf6tASZDUHJB"): - # user = - # user.backend = 'django.contrib.auth.backends.ModelBackend' - # login(request, user) - # return redirect('users-dashboard') - #else: - # return redirect('login') - #return redirect('users-dashboard') + print("Check login status...") + if(request.COOKIES['nc_username'] != None and getNCLoggedUserBySession(request.COOKIES['nc_session_id'])): + login(request, User.objects.get(username=request.COOKIES['nc_username'])) + else: + logout(request) + + return JsonResponse({'stat' : True}) diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index e9ddb41..6e62f3a 100644 Binary files a/digitaleagentur/__pycache__/settings.cpython-38.pyc and b/digitaleagentur/__pycache__/settings.cpython-38.pyc differ diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py index c0ea88c..a155060 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -215,7 +215,7 @@ LOGIN_URL = 'login' #LOGIN_URL = NEXTCLOUD_URL STATIC_URL = '/static/' -SESSION_COOKIE_DOMAIN = ".cloud.digitale-agentur.com" +SESSION_COOKIE_DOMAIN = "digitale-agentur.com" #SESSION_COOKIE_DOMAIN = "localhost" diff --git a/users/views.py b/users/views.py index 5144a0b..c60fa09 100644 --- a/users/views.py +++ b/users/views.py @@ -81,11 +81,12 @@ import urllib.request as urllib2 from django.contrib.auth import login, logout from django.core.mail import send_mail def ncLogin(request, uid): - logout(request) - if(uid == urllib2.unquote(request.COOKIES['nc_username']) and getNCLoggedUserBySession(request.COOKIES['nc_session_id'])): - login(request, User.objects.get(username=urllib2.unquote(request.COOKIES['nc_username']))) - return redirect('users-dashboard') - return redirect('login') + #logout(request) + #if(uid == urllib2.unquote(request.COOKIES['nc_username']) and getNCLoggedUserBySession(request.COOKIES['nc_session_id'])): + # login(request, User.objects.get(username=urllib2.unquote(request.COOKIES['nc_username']))) + # return redirect('users-dashboard') + #return redirect('login') + return JsonResponse({}) def getICSFile(request, ag): if 'HTTP_AUTHORIZATION' in request.META: