vmario/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2024-11-22 14:07:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleanup user creation

Browse Source
This commit is contained in:
Benjamin Gamard 2018-03-26 22:28:22 +02:00
parent 99d44f2a92
commit 4aca4ad495
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs-core/src/main/java/com/sismics/docs/core/dao/jpa/UserDao.java
View File

@ -6,6 +6,7 @@ import com.sismics.docs.core.dao.jpa.criteria.UserCriteria;
import com.sismics.docs.core.dao.jpa.dto.UserDto; import com.sismics.docs.core.dao.jpa.dto.UserDto;
import com.sismics.docs.core.model.jpa.User; import com.sismics.docs.core.model.jpa.User;
import com.sismics.docs.core.util.AuditLogUtil; import com.sismics.docs.core.util.AuditLogUtil;
import com.sismics.docs.core.util.EncryptionUtil;
import com.sismics.docs.core.util.jpa.QueryParam; import com.sismics.docs.core.util.jpa.QueryParam;
import com.sismics.docs.core.util.jpa.QueryUtil; import com.sismics.docs.core.util.jpa.QueryUtil;
import com.sismics.docs.core.util.jpa.SortCriteria; import com.sismics.docs.core.util.jpa.SortCriteria;
@ -71,6 +72,8 @@ public class UserDao {
// Create the user // Create the user
user.setCreateDate(new Date()); user.setCreateDate(new Date());
user.setPassword(hashPassword(user.getPassword())); user.setPassword(hashPassword(user.getPassword()));
user.setPrivateKey(EncryptionUtil.generatePrivateKey());
user.setStorageCurrent(0L);
em.persist(user); em.persist(user);
// Create audit log // Create audit log

4
docs-core/src/test/java/com/sismics/docs/core/dao/jpa/TestJpa.java
View File

@ -22,9 +22,7 @@ public class TestJpa extends BaseTransactionalTest {
user.setPassword("12345678"); user.setPassword("12345678");
user.setEmail("toto@docs.com"); user.setEmail("toto@docs.com");
user.setRoleId("admin"); user.setRoleId("admin");
user.setStorageCurrent(0l); user.setStorageQuota(10L);
user.setStorageQuota(10l);
user.setPrivateKey("AwesomePrivateKey");
String id = userDao.create(user, "me"); String id = userDao.create(user, "me");
TransactionUtil.commit(); TransactionUtil.commit();

6
docs-web/src/main/java/com/sismics/docs/rest/resource/UserResource.java
View File

@ -15,7 +15,6 @@ import com.sismics.docs.core.event.PasswordLostEvent;
import com.sismics.docs.core.model.context.AppContext; import com.sismics.docs.core.model.context.AppContext;
import com.sismics.docs.core.model.jpa.*; import com.sismics.docs.core.model.jpa.*;
import com.sismics.docs.core.util.ConfigUtil; import com.sismics.docs.core.util.ConfigUtil;
import com.sismics.docs.core.util.EncryptionUtil;
import com.sismics.docs.core.util.authentication.AuthenticationUtil; import com.sismics.docs.core.util.authentication.AuthenticationUtil;
import com.sismics.docs.core.util.jpa.SortCriteria; import com.sismics.docs.core.util.jpa.SortCriteria;
import com.sismics.docs.rest.constant.BaseFunction; import com.sismics.docs.rest.constant.BaseFunction;
@ -100,10 +99,7 @@ public class UserResource extends BaseResource {
user.setPassword(password); user.setPassword(password);
user.setEmail(email); user.setEmail(email);
user.setStorageQuota(storageQuota); user.setStorageQuota(storageQuota);
user.setStorageCurrent(0L);
user.setPrivateKey(EncryptionUtil.generatePrivateKey());
user.setCreateDate(new Date());
// Create the user // Create the user
UserDao userDao = new UserDao(); UserDao userDao = new UserDao();
try { try {