Fixed user revocation incorrect patchset

Change-Id: Ic892c0ee752dc7b13c34813a8d6c407e9ba204e3

jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/user/UserServlet.java

@@ -74,10 +74,10 @@ public class UserServlet extends HttpServlet {
      */
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        StatementList select = new StatementList();
-        StatementElement st = new StatementElement("username","=",req.getAttribute("username").toString(),"");
-        select.addStatement(st);
-        User user = dataStore.getUserDao().getObjects(select).get(0);
+        StatementList statementList = new StatementList();
+        StatementElement st = new StatementElement("username","=",req.getParameter("username").toString(),"");
+        statementList.addStatement(st);
+        User user = dataStore.getUserDao().getObjects(statementList).get(0);
         String password = user.getPassword();
         if (!user.getNeedsPasswordReset()) {
             password = PasswordGenerator.generatePassword();
@@ -90,7 +90,7 @@ public class UserServlet extends HttpServlet {
             StatementElement st2 = new StatementElement("needsPasswordReset","=","true","");
             update.addStatement(st2);
             // refresh variable
-            user = dataStore.getUserDao().getObjects(select).get(0);
+            user = dataStore.getUserDao().getObjects(statementList).get(0);
             dataStore.getUserDao().updateObject(update,constraint);
         }
 

jams-server/src/main/resources/webapp/js/api.js

@@ -33,7 +33,9 @@ var api_path_post_install_server = '/api/install/settings';
 var api_path_get_install_lastKnownStep = '/api/install/lastStep';
 var api_path_get_auth_user_search = '/api/auth/users';
 var api_path_get_auth_devices = '/api/auth/devices';
+var api_path_delete_admin_user_revoke = '/api/admin/user';
 var api_path_delete_auth_user_revoke = '/api/auth/user';
+var api_path_delete_admin_device_revoke = '/api/admin/device';
 var api_path_delete_auth_device_revoke = '/api/auth/device';
 var api_path_rename_device = '/api/auth/device';
 var api_path_get_server_status = '/api/info';

jams-server/src/main/resources/webapp/js/user.js

@@ -70,7 +70,7 @@ $(document).ready(function() {
 
         // revoke user
         $( '.user-information' ).on( 'click', '.de-authorize-user', function () {
-            $('#deAuthorizeModal').modal('show');
+            $('#deAuthorizeModalCenter').modal('show');
         });
 
         //edit user
@@ -104,13 +104,13 @@ $(document).ready(function() {
         });
 
         $('#de-authorize-user').on('click', function() {
-            $('#deAuthorizeModal').modal('hide');
+            $('#deAuthorizeModalCenter').modal('hide');
             var w = $('.de-authorize-user').width();
             isSearch = false;
             $('.de-authorize-user').width(w);
             $('.de-authorize-user').text("");
             $('.de-authorize-user').append("<span class=\"spinner-border text-light spinner-border-sm\" role=\"status\"></span>");
-            ajaxApiCall(api_path_delete_auth_user_revoke + "?username=" + encodeURIComponent(userData["username"]), 'DELETE', null, null, revokeUser);
+            ajaxApiCall(api_path_delete_admin_user_revoke + "?username=" + encodeURIComponent(userData["username"]), 'DELETE', null, null, revokeUser);
         });
 
         $( '.user-information' ).on( 'click', '.reset-password', function (e) {
@@ -346,9 +346,10 @@ function setUserDevices(data) {
 }
 
 function revokeUser(data, statusCode, jqXHR) {
+
     if (jqXHR.status == 200) {
-        $('#user-status').text("Revoked");
-        $('#user-status').addClass("text-danger");
+        $('#status-whatever').text("Revoked");
+        $('#status-whatever').addClass("text-danger");
         $('.de-authorize-user').prop('disabled', true);
         $('.devices-results-container').empty();
         // update User devices information