diff --git a/api/urls.py b/api/urls.py index 459e7cf..b74dd35 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('setlog/', views.SetUserData, name="apisetlog"), + 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 4424a93..f3a1ac1 100644 --- a/api/views.py +++ b/api/views.py @@ -366,12 +366,16 @@ def NCTest(request): return JsonResponse({'status' : False, 'message': 'AUTH ERROR'}) -#@api_view(['POST'], ) -#def SetUserData(request): -# redirect('nclog', uid=request.POST.get('uid')) +@api_view(['POST'], ) +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('key')) - #print(request.POST.get('csrf')) + #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) diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index 9f9054e..22e0e74 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 041ae84..29d140e 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 = "digitale-agentur.com" +SESSION_COOKIE_DOMAIN = "cloud.digitale-agentur.com" #SESSION_COOKIE_DOMAIN = "localhost" diff --git a/users/views.py b/users/views.py index df4b8c8..5144a0b 100644 --- a/users/views.py +++ b/users/views.py @@ -81,14 +81,11 @@ import urllib.request as urllib2 from django.contrib.auth import login, logout from django.core.mail import send_mail def ncLogin(request, uid): - print(request.COOKIES['nc_username']) 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 redirect('users-dashboard') def getICSFile(request, ag): if 'HTTP_AUTHORIZATION' in request.META: