diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index 3b397f4..8684589 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 26fff5b..db04c8d 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -110,7 +110,7 @@ MIDDLEWARE = [ 'django_user_agents.middleware.UserAgentMiddleware', 'simple_history.middleware.HistoryRequestMiddleware', 'auditlog.middleware.AuditlogMiddleware', - 'users.middleware.oauth.OAuthMiddleware' + #'users.middleware.oauth.OAuthMiddleware' ] ROOT_URLCONF = 'digitaleagentur.urls' diff --git a/users/models.py b/users/models.py index 3db38a3..9ebb09f 100644 --- a/users/models.py +++ b/users/models.py @@ -532,11 +532,11 @@ class UserFullName(User): return f'{self.first_name + " " + self.last_name}' # Hier Audit-Logeinträge einbauen für die versch. Models -from django.utils.six import python_2_unicode_compatible -from auditlog.registry import auditlog +#from django.utils.six import python_2_unicode_compatible +#from auditlog.registry import auditlog -auditlog.register(User) -auditlog.register(Agency) +#auditlog.register(User) +#auditlog.register(Agency) diff --git a/users/urls.py b/users/urls.py index 549bbbc..4131d2c 100644 --- a/users/urls.py +++ b/users/urls.py @@ -43,7 +43,7 @@ urlpatterns = [ path('icspublicall//', views.getICSFileExAll, name="geticsall"), path('updateuserorga/', views.UpdateUserOrga, name="update-user-orga"), # OAUTH - path('oauth/callback/', views.oauthCallBack, name="oauthcallback"), + #path('oauth/callback/', views.oauthCallBack, name="oauthcallback"), ] diff --git a/users/views.py b/users/views.py index 6e6a965..1ba4128 100644 --- a/users/views.py +++ b/users/views.py @@ -67,9 +67,6 @@ import base64 from django.http import HttpResponse -# OAUTH -def oauthCallBack(request): - return redirect('users-dashboard') # NC LOGIN ''' @@ -85,7 +82,7 @@ from django.contrib.auth import login, logout def ncLogin(request, uid): logout(request) nc_login_headers = {'Authorization' : 'Bearer ' + request.COOKIES['nc_session_id']} - r = requests.get("http://localhost:8080/ocs/v2.php/apps/user_status/api/v1/user_status", headers=nc_login_headers) + r = requests.get(settings.NEXTCLOUD_URL + "ocs/v2.php/apps/user_status/api/v1/user_status", headers=nc_login_headers) xpars = xmltodict.parse(r.text) js = json.dumps(xpars) final_json = json.loads(js)