delete user: ref https://github.com/usmannasir/cyberpanel/issues/335

cli/cyberPanel.py

@@ -24,7 +24,6 @@ from plogical.ftpUtilities import FTPUtilities
 from plogical.sslUtilities import sslUtilities
 from plogical.processUtilities import ProcessUtilities
 from plogical.backupSchedule import backupSchedule
-from django.http import HttpRequest
 
 # All that we see or seem is but a dream within a dream.
 
@@ -1379,6 +1378,24 @@ def main():
 
         print(response.content.decode())
 
+    elif args.function == "deleteUser":
+
+        completeCommandExample = 'cyberpanel deleteUser --userName cyberpanel'
+
+        if not args.userName:
+            print("\n\nPlease enter User Name. For example:\n\n" + completeCommandExample + "\n\n")
+            return
+
+        from userManagment.views import submitUserDeletion
+
+        data = {}
+        data['accountUsername'] = args.userName
+        data['userID'] = 1
+
+        response = submitUserDeletion(data)
+
+        print(response.content.decode())
+
 
 
 if __name__ == "__main__":

userManagment/views.py

@@ -255,7 +255,6 @@ def modifyUsers(request):
     except KeyError:
         return redirect(loadLoginPage)
 
-
 def fetchUserDetails(request):
     try:
         val = request.session['userID']
@@ -316,7 +315,6 @@ def fetchUserDetails(request):
         json_data = json.dumps(data_ret)
         return HttpResponse(json_data)
 
-
 def saveModifications(request):
     try:
         val = request.session['userID']
@@ -386,7 +384,6 @@ def saveModifications(request):
         json_data = json.dumps(data_ret)
         return HttpResponse(json_data)
 
-
 def deleteUser(request):
     try:
         userID = request.session['userID']
@@ -405,14 +402,20 @@ def deleteUser(request):
     except KeyError:
         return redirect(loadLoginPage)
 
-
 def submitUserDeletion(request):
+
+    try:
         try:
             userID = request.session['userID']
+        except:
+            userID = request['userID']
         try:
 
-            if request.method == 'POST':
+            try:
                 data = json.loads(request.body)
+            except:
+                data = request
+
             accountUsername = data['accountUsername']
 
             currentACL = ACLManager.loadedACL(userID)
@@ -438,6 +441,7 @@ def submitUserDeletion(request):
                 json_data = json.dumps(data_ret)
                 return HttpResponse(json_data)
 
+
         except BaseException as msg:
             data_ret = {'status': 0, 'deleteStatus': 0, 'error_message': str(msg)}
             json_data = json.dumps(data_ret)