diff --git a/api/urls.py b/api/urls.py index 340db99..459e7cf 100644 --- a/api/urls.py +++ b/api/urls.py @@ -20,7 +20,7 @@ urlpatterns = [ path('addfile/', views.NCAddFiles, name="apiaddfile"), path('adddir/', views.NCAddDirs, name="apiadddir"), - path('test/', views.NCTest, name="apitest"), + #path('setlog/', views.SetUserData, name="apisetlog"), # EXTERNAL FROM NC path('logout/', views.apilogout, name="api-logout"), path('uschanged//', views.userChangedInNc, name="api-userchanged"), diff --git a/api/views.py b/api/views.py index 0a588da..4424a93 100644 --- a/api/views.py +++ b/api/views.py @@ -362,5 +362,34 @@ def NCAddDirs(request): @api_view(['GET'], ) def NCTest(request): - print("HI!") - return JsonResponse({'status' : False, 'message': 'AUTH ERROR'}) \ No newline at end of file + print(request.headers) + return JsonResponse({'status' : False, 'message': 'AUTH ERROR'}) + + +#@api_view(['POST'], ) +#def SetUserData(request): +# redirect('nclog', uid=request.POST.get('uid')) + #print(request.POST.get('uid')) + #print(request.POST.get('key')) + #print(request.POST.get('csrf')) + #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') diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index 35c694d..0ed3a92 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 1498651..ba11349 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -26,7 +26,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # Nach zehn Stunden läuft der Cookie ab! # TASK: Zehn stunden auto-auslog einmal checken Sekunden! SESSION_COOKIE_AGE = 100*60*60 - +SESSION_COOKIE_SECURE = False #CHANNELS_PRESENCE_MAX_AGE = 30 @@ -215,7 +215,7 @@ LOGIN_URL = 'login' #LOGIN_URL = NEXTCLOUD_URL STATIC_URL = '/static/' - +SESSION_COOKIE_DOMAIN = "digitale-agentur.com" ''' diff --git a/users/models.py b/users/models.py index ea09a9d..1b15f0d 100644 --- a/users/models.py +++ b/users/models.py @@ -215,6 +215,8 @@ class Profile(models.Model): phonemobile = models.CharField(max_length=60, blank=True) phone_public = models.BooleanField(default=False) + #nc_sid = models.CharField(max_length=200, blank=True) + # Wenn die Funktion gelöscht wird, wird die FUNC auf NULL gesetzt func = models.ForeignKey("AgencyJob", blank=True, null=True, default=None, on_delete=models.SET_NULL) # Wenn dieses Profil gelöscht wird, wird NICHT die Agency geslöscht diff --git a/users/views.py b/users/views.py index 3897a1e..ee6915a 100644 --- a/users/views.py +++ b/users/views.py @@ -81,16 +81,14 @@ import urllib.request as urllib2 from django.contrib.auth import login, logout from django.core.mail import send_mail def ncLogin(request, uid): - print("HIER PASSIERT DER NCLOGIN" + str(uid)) - #try: - 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']))) + try: + 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') + except: return redirect('users-dashboard') - return redirect('login') - #except: - # return redirect('users-dashboard') - def getICSFile(request, ag): if 'HTTP_AUTHORIZATION' in request.META: