Merge branch '623-user-login-denied-in-proper-branch' into 'devel_12.1.x'

Resolve "New user 1-st log in throw access denied"

See merge request !601

frontend-js/src/main/js/ServerConnector.js

@@ -36,6 +36,7 @@ var SbmlParameter = require('./map/data/SbmlParameter');
 var SecurityError = require('./SecurityError');
 var SessionData = require('./SessionData');
 var User = require('./map/data/User');
+var PrivilegeType = require('./map/data/PrivilegeType');
 
 var GuiConnector = require('./GuiConnector');
 
@@ -1232,9 +1233,17 @@ ServerConnector.updateUser = function (user) {
       connectedToLdap: user.isConnectedToLdap()
     }
   };
-  return self.sendPatchRequest(self.getUserUrl(queryParams), filterParams).then(function () {
+  var canModifyPrivileges = false;
+  return self.sendPatchRequest(self.getUserUrl(queryParams), filterParams).then(function (response) {
+    canModifyPrivileges = JSON.parse(response).privileges.some(function (privilege) {
+      return privilege.type === PrivilegeType.USER_MANAGEMENT
+        || privilege.type === PrivilegeType.PROJECT_MANAGEMENT;
+    });
     return self.getConfiguration();
   }).then(function (configuration) {
+    if (!canModifyPrivileges) {
+      return Promise.resolve(user);
+    }
     return self.updateUserPrivileges({user: user, privileges: user.privilegesToExport(configuration)});
   });
 };