DigitaleAgentur___ALT
/
digitaleagenturnc
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

oauth raus

This commit is contained in:
holger.trampe 2021-07-25 13:04:56 +02:00
parent 58cbe7bf68
commit d9d41248dd
5 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
digitaleagentur/__pycache__/settings.cpython-38.pyc
View File

Binary file not shown.

2
digitaleagentur/settings.py
View File

@ -110,7 +110,7 @@ MIDDLEWARE = [
'django_user_agents.middleware.UserAgentMiddleware', 'django_user_agents.middleware.UserAgentMiddleware',
'simple_history.middleware.HistoryRequestMiddleware', 'simple_history.middleware.HistoryRequestMiddleware',
'auditlog.middleware.AuditlogMiddleware', 'auditlog.middleware.AuditlogMiddleware',
'users.middleware.oauth.OAuthMiddleware' #'users.middleware.oauth.OAuthMiddleware'
] ]
ROOT_URLCONF = 'digitaleagentur.urls' ROOT_URLCONF = 'digitaleagentur.urls'

8
users/models.py
View File

@ -532,11 +532,11 @@ class UserFullName(User):
return f'{self.first_name + " " + self.last_name}' return f'{self.first_name + " " + self.last_name}'
# Hier Audit-Logeinträge einbauen für die versch. Models # Hier Audit-Logeinträge einbauen für die versch. Models
from django.utils.six import python_2_unicode_compatible #from django.utils.six import python_2_unicode_compatible
from auditlog.registry import auditlog #from auditlog.registry import auditlog
auditlog.register(User) #auditlog.register(User)
auditlog.register(Agency) #auditlog.register(Agency)

2
users/urls.py
View File

@ -43,7 +43,7 @@ urlpatterns = [
path('icspublicall/<slug:code>/<int:ag>', views.getICSFileExAll, name="geticsall"), path('icspublicall/<slug:code>/<int:ag>', views.getICSFileExAll, name="geticsall"),
path('updateuserorga/', views.UpdateUserOrga, name="update-user-orga"), path('updateuserorga/', views.UpdateUserOrga, name="update-user-orga"),
# OAUTH # OAUTH
path('oauth/callback/', views.oauthCallBack, name="oauthcallback"), #path('oauth/callback/', views.oauthCallBack, name="oauthcallback"),
] ]

5
users/views.py
View File

@ -67,9 +67,6 @@ import base64
from django.http import HttpResponse from django.http import HttpResponse
# OAUTH
def oauthCallBack(request):
return redirect('users-dashboard')
# NC LOGIN # NC LOGIN
''' '''
@ -85,7 +82,7 @@ from django.contrib.auth import login, logout
def ncLogin(request, uid): def ncLogin(request, uid):
logout(request) logout(request)
nc_login_headers = {'Authorization' : 'Bearer ' + request.COOKIES['nc_session_id']} 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) xpars = xmltodict.parse(r.text)
js = json.dumps(xpars) js = json.dumps(xpars)
final_json = json.loads(js) final_json = json.loads(js)