From fe07ae0e39ed1e22456968fc9e9170884ee2a308 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Sat, 31 Jul 2021 17:54:13 +0200
Subject: [PATCH] JS

---
 api/views.py                                  |  38 ++++--------------
 .../__pycache__/settings.cpython-38.pyc       | Bin 4599 -> 4592 bytes
 digitaleagentur/settings.py                   |   2 +-
 users/views.py                                |  11 ++---
 4 files changed, 15 insertions(+), 36 deletions(-)

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 e9ddb4114b657c6e6b71f7c87b5ab7cdf05af628..6e62f3a664b85dd6f02c1faa86d7924bfaabf6b3 100644
GIT binary patch
delta 29
jcmeya{6U#Fl$V!_0SM%aSQ9UA<lV=^D6;u7j|wXQcfAMJ

delta 36
qcmeyM{9Tzhl$V!_0SFGNu_oTy$h(h+Ls~C6C%-gBZ}S-*6;=Sjm<p``

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: