From d9d41248dd52d54862426aee14bf7eb055b39079 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Sun, 25 Jul 2021 13:04:56 +0200
Subject: [PATCH] oauth raus

---
 .../__pycache__/settings.cpython-38.pyc       | Bin 4620 -> 4576 bytes
 digitaleagentur/settings.py                   |   2 +-
 users/models.py                               |   8 ++++----
 users/urls.py                                 |   2 +-
 users/views.py                                |   5 +----
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc
index 3b397f4a5370ff6458318d1abacd98d9d6df9e48..86845891a112fe3a3a993583adaddfa6ec3b78e7 100644
GIT binary patch
delta 304
zcmX|*$xgyx5XZl1DwQS;;pB=NxFER0(Y<cCi@1!URR7JFa?nS>cr;!J*B<QIBQM}9
z7+=7b(3{53#yFGtCG(qPW*$@TNvmX8rchC~zbYSfD?u;y%v(*G+>Tl9z#MmCUJAsp
zfJH1}8Mf3t!iuj;;x4RW%_Hu{Iw!EfJt$yPO$*oxxgB!HBdK#QcK?&G=SR2?``nKM
z9zc<kh;d5Qpt?AO+9404#3MN3G>&=HrE1GlBxJ^I4JaU-v<c3JX3WjvG|+e)%oBem
ziZf*<an4h}RxO=InP+f;n0hydOH|<C%GXqvhgKBnYbQrSn0D2<k+;ondN!J`(Y!&T
NVZ`s~v+)qW{{gi>Sy})9

delta 336
zcmX|*%P#|Q5XW~`sa7`S<XNv)sn&Yc5iRwoqNsWds>^q?w(&?>jbp{xrRjAK`Ug1m
zKkzR&OZ*XBBoaRxF_ZZu^O<C3-hGdLC8H>ANkk&>o%^ULUV5p7Udxy@TDSvq+=+Sa
zLe!ApK@1C6L>x<o!z3(Q4uiNGD_Av&dyrr+*0>i*tcz(98#Xs>rc5#%+=s3IBy3wv
z+>ad|K$-`!%RYG6FKS3!EC-O`VeIh;_Bn_H9@Qz|_|#-Gq&L^7MmTJjIBc6SJq)hN
ztm25r|BMUA!c5?VCx5M2I)yAx;}jn8ZUi}KIK#Omi*5#TS_(pokR-X|dF{IXMbA!e
rpj6ZgMfJ)AF7-RDpsP1p>GncR#RTh?E9xY<`qp~iK=Nlb+xGASqkCk?

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/<slug:code>/<int:ag>', 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)