diff --git a/api/views.py b/api/views.py index bbf0b1d..b96d0f0 100644 --- a/api/views.py +++ b/api/views.py @@ -249,7 +249,8 @@ def NCAddUser(request): r = requests.post(settings.NEXTCLOUD_URL + "ocs/v1.php/cloud/users", data=data, headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API)) try: r_status = json.loads(r.text) - if(r_status['ocs']['meta']['statuscode'] == 100): + if(r_status['ocs']['meta']['statuscode'] == 100): + return JsonResponse({'status' : True, 'message': 'Benutzer ' + user.first_name + " " + user.last_name + ' angelegt und in die Gruppen gepackt.'}) else: return JsonResponse({'status' : True, 'message': 'Benutzer ' + user.first_name + " " + user.last_name + ' konnte nicht angelegt werden. Bitte manuell prüfen!', 'message' : r.text}) diff --git a/digitaleagentur/utils.py b/digitaleagentur/utils.py index b6096cf..fc3962a 100644 --- a/digitaleagentur/utils.py +++ b/digitaleagentur/utils.py @@ -181,7 +181,17 @@ def getNCLoggedUserBySession(sid): final_json = json.loads(js) # New user login - set initial status - if(final_json['ocs']['meta']['status'] == 'failure'): + try: + if(final_json['ocs']['meta']['status'] == 'failure'): + nc_login_headers = {'Authorization' : 'Bearer ' + sid, 'OCS-APIREQUEST' : 'true'} + r = requests.get(settings.NEXTCLOUD_URL + "ocs/v2.php/apps/user_status/api/v1/user_status/status", headers=nc_login_headers, data={'statusType' : 'dnd'}) + + 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) + except: nc_login_headers = {'Authorization' : 'Bearer ' + sid, 'OCS-APIREQUEST' : 'true'} r = requests.get(settings.NEXTCLOUD_URL + "ocs/v2.php/apps/user_status/api/v1/user_status/status", headers=nc_login_headers, data={'statusType' : 'dnd'}) @@ -191,5 +201,6 @@ def getNCLoggedUserBySession(sid): js = json.dumps(xpars) final_json = json.loads(js) - return final_json['ocs']['data']['userId'] + return final_json['ocs']['data']['userId'] + \ No newline at end of file