delete user

Author: kshvakov

app-server.go

@@ -20,7 +20,7 @@ const usage = `
 Postgres-CI app-server
 
 Usage:
-    -c /path/to/config.yaml (if empty app will use environment variables)
+    -c /path/to/config.yaml (if not setted app will use environment variables)
     -debug (enable debug mode)
 
 Environment variables:

assets/static/js/app.js

@@ -1,10 +1,13 @@
 $('#confirmAction').on('show.bs.modal', function (event) {
 
-    var button = $(event.relatedTarget);
- 
-    $(this).find('.modal-content form').attr('action', button.data('action'));
+    $(this).find('.modal-content form').attr('action', $(event.relatedTarget).data('action'));
+    
+}).on('hide.bs.modal', function (event) {
+
+    $(this).find('.modal-content form input[type=password]').val('');
 });
 
+
 $('#confirmAction').find('.modal-content form').on('submit', function(event) {
 
     $.ajax({
@@ -18,9 +21,12 @@ $('#confirmAction').find('.modal-content form').on('submit', function(event) {
         error: function(request, status, error) {
 
             switch (request.status) {
-                case 403:
+                case 401:
                     alert("Authentication failed");
                     break;
+                case 403:
+                    alert("Access denied");
+                    break;
                 default:
                     alert(error);
                     break;
@@ -29,4 +35,4 @@ $('#confirmAction').find('.modal-content form').on('submit', function(event) {
     });
 
     return false
-});
+});

src/app/controllers/users/delete.go

@@ -0,0 +1,32 @@
+package users
+
+import (
+	"github.com/postgres-ci/app-server/src/app/models/auth"
+	"github.com/postgres-ci/app-server/src/app/models/users"
+	"github.com/postgres-ci/app-server/src/tools/params"
+	"github.com/postgres-ci/app-server/src/tools/render"
+	"github.com/postgres-ci/http200ok"
+
+	"net/http"
+)
+
+func deleteHandler(c *http200ok.Context) {
+
+	currentUser := c.Get("CurrentUser").(*auth.User)
+
+	if !currentUser.IsSuperuser {
+
+		render.JSONError(c, http.StatusForbidden, "Access denied")
+
+		return
+	}
+
+	if err := users.Delete(params.ToInt32(c, "UserID")); err != nil {
+
+		render.JSONError(c, http.StatusInternalServerError, err.Error())
+
+		return
+	}
+
+	render.JSONok(c)
+}

src/app/controllers/users/route.go

@@ -2,13 +2,10 @@ package users
 
 import (
 	"github.com/postgres-ci/app-server/src/app/middleware"
-	"github.com/postgres-ci/app-server/src/tools/render"
 	"github.com/postgres-ci/http200ok"
 )
 
 func Route(server *http200ok.Server) {
 	server.Get("/users/", listHandler)
-	server.Post("/users/delete/:UserID/", middleware.CheckPassword, func(c *http200ok.Context) {
-		render.JSONok(c)
-	})
+	server.Post("/users/delete/:UserID/", middleware.CheckPassword, deleteHandler)
 }

src/app/middleware/check_password.go

@@ -19,7 +19,7 @@ func CheckPassword(c *http200ok.Context) {
 		}
 	}
 
-	render.JSONError(c, http.StatusForbidden, "Authentication failed")
+	render.JSONError(c, http.StatusUnauthorized, "Authentication failed")
 
 	c.Stop()
 }

src/app/models/users/delete.go

@@ -0,0 +1,18 @@
+package users
+
+import (
+	log "github.com/Sirupsen/logrus"
+	"github.com/postgres-ci/app-server/src/env"
+)
+
+func Delete(userID int32) error {
+
+	if _, err := env.Connect().Exec("SELECT users.delete($1)", userID); err != nil {
+
+		log.Errorf("Could not delete user %d, err: %v", userID, err)
+
+		return err
+	}
+
+	return nil
+}