mist alles

adm/templates/adm/adm_import_flow.html

@@ -24,10 +24,10 @@
         
         $(document).ready(function(){
             // FIRST CALL GROUPS, When Groups finished User will call by Groups
-            createAgencyGroups(groupids[0]);
+            //createAgencyGroups(groupids[0]);
             
             //DEV
-            //addGroupFolder();
+            addGroupFolder();
             //addDirs(dirids[0]);
         })
 
@@ -101,21 +101,13 @@
             $("#cloud_process").show();
             $("#cloud_process_main").show();
             $.ajax({
-                url: "{% url 'api:apiaddgf' %}",
+                url: "{% url 'mig-groupfolder' agency.pk %}",
-                headers: {
-                    'Authorization':'Token {{ ncid }}',
-                    "Access-Control-Allow-Origin" : "*"
-                },
-                method: 'POST',
                 dataType: 'json',
-                data: {
-                    'agencyid' : {{agency.pk}},
-                },
                 success: function(data){
                     console.log(data);
                     if(data['status'] == true){
                         if(files[0] != undefined){
-                            addFiles(files[0]);
+                            //addFiles(files[0]);
                         }
                     }
                 },

adm/urls.py

@@ -25,4 +25,6 @@ urlpatterns = [
 	path('wd/<int:pk>/delete', AdmWorkdayDelete.as_view(), name="adm-workday-delete"),
 	path('wd/break/<int:pk>/delete', AdmBreakDelete.as_view(), name="adm-break-delete"),
 	path('wd/<int:pk>/break/add', AdmAddBreak.as_view(), name="adm-break-add"),
+	# MIGRATION
+	path('mig/aggroupfolder/<int:agencypk>', createAgGroupFolder, name="mig-groupfolder"),
 ]

adm/views.py

@@ -726,4 +726,20 @@ class AdmImportFlow(TemplateView):
 		# LINK TO THE NC-INSTANCE
 		context.update({'nclink' : settings.NEXTCLOUD_URL})
 		context.update({'ncid' : self.request.user.profile.nc_sid})
+		context.update({'nc_url' : settings.NEXTCLOUD_URL})
 		return context
+
+'''
+	Erstellt einen Gruppenordner
+'''
+def createAgGroupFolder(request, agencypk):
+	print("HI!")
+	#agency = Agency.objects.get(pk=agencypk)
+	#data = {
+	#	"gid" : "agencymaingroupid_" + str(agency.pk),
+	#	"aid" : str(agency.pk)
+	#}
+	
+	r = requests.get(settings.NEXTCLOUD_URL +  "apps/agency/createagf", auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API))
+	print(r.text)
+	return JsonResponse({'status' : True, 'message': 'Gruppenordner angelegt!'})	

api/views.py

@@ -162,7 +162,7 @@ def create_group_id(agencygroupname, agency):
 
 
 '''
-	Diese Methode erstellt die Gruppen in Owncloud nach dem Schemata, wie sie auch bei einer Registrierung aufgebaut werden.
+	Diese Methode erstellt die Gruppen in NC nach dem Schemata, wie sie auch bei einer Registrierung aufgebaut werden.
 
 '''
 @api_view(['POST'], )
@@ -257,6 +257,7 @@ def NCAddUser(request):
 
 	return JsonResponse({"status" : "NO AUTH"})
 
+from requests.auth import HTTPBasicAuth
 '''
 	Anlegen des Gruppenordners der Agentur in NC
 '''
@@ -266,16 +267,16 @@ def NCAddGroupFolder(request):
 		agency = Agency.objects.get(pk=request.POST.get('agencyid'))
 		data = {
 			"gid" : "agencymaingroupid_" + str(agency.pk),
-			"aid" : str(agency.pk)
+			"aid" : str(agency.pk),
+			"sk'" : settings.NC_SECRETKEY
 		}
 		headers = {
-			'Accept' : 'application/json',
+			'Authorization': 'Bearer ' + request.COOKIES['nc_session_id']
-			'Access-Control-Allow-Headers' : 'OCS-APIRequest',
-			'OCS-APIRequest' :  'true'
 		}
-		r = requests.post(settings.NEXTCLOUD_URL +  "apps/agency/createagf", data=data, headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API))
+		r = requests.post(settings.NEXTCLOUD_URL +  "apps/agency/createagf", data=data, headers=headers)
 		print(r.text)
-		return JsonResponse({'status' : True, 'message': 'Gruppenordner angelegt!'})	
+		print(r.text)
+		return JsonResponse({'status' : True, 'message': 'Gruppenordner angelegt!' + r.text})	
 		
 	return JsonResponse({"status" : "NO AUTH"})
 
@@ -376,10 +377,8 @@ def NCTest(request):
 # Setting the Users Data for logging
 @api_view(['POST'], )
 def SetUserData(request):
-	try:
+	user = User.objects.get(username=request.POST.get('uid'))
-		user = User.objects.get(username=request.POST.get('uid'))
+	user.profile.nc_sid = request.POST.get('sid')
-		user.profile.nc_sid = request.POST.get('sid')
+	user.save()
-		user.save()
+	return JsonResponse({'message' : 'A user was found in request, sid set!'})
-		return JsonResponse({'message' : 'A user was found in request, sid set!'})
+	
-	except:
-		return JsonResponse({'message' : 'No user is in this request.'})

digitaleagentur/settings.py

@@ -60,6 +60,8 @@ DEFF_FETCH_URL_NAME = 'getdoc'
 USE_X_FORWARDED_HOST = True
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 
+NC_SECRETKEY = "lkjahstaszd76uhjNJABHM65rftzvb323ADSD567tzu9ztz"
+
 # Application definition
 INSTALLED_APPS = [
     'django.contrib.contenttypes',
@@ -135,10 +137,10 @@ TEMPLATES = [
 ]
 
 REST_FRAMEWORK = {
-    'DEFAULT_AUTHENTICATION_CLASSES': (
+    #'DEFAULT_AUTHENTICATION_CLASSES': (
         #'rest_framework.authentication.TokenAuthentication',
         #'rest_framework.permissions.AllowAny',
-    ),
+    #),
     #'DEFAULT_PERMISSION_CLASSES': [
     #    'rest_framework.permissions.IsAuthenticated',
     #],

users/templates/users/login.html

@@ -8,7 +8,7 @@
 <script src="{%static 'users/js/jquery.js' %}" type="text/javascript"></script>
 <script>
     $(document).ready(function(){
-        //window.location.replace("https://cloud.digitale-agentur.com/external/1");
+        window.location.replace("https://cloud.digitale-agentur.com/external/1");
-		//localStorage.clear();		
+		localStorage.clear();		
 	})
 </script>