public/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2025-12-13 01:36:18 +00:00
Code Issues Releases Wiki Activity

extensible authentication system

Browse Source
This commit is contained in:
Benjamin Gamard
2018-03-26 22:07:26 +02:00
parent c9606f98d3
commit 99d44f2a92
10 changed files with 132 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@ import com.sismics.docs.core.model.context.AppContext;
import com.sismics.docs.core.model.jpa.*;
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.jpa.SortCriteria;
import com.sismics.docs.rest.constant.BaseFunction;
import com.sismics.rest.exception.ClientException;
@@ -38,7 +39,6 @@ import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.NewCookie;
import javax.ws.rs.core.Response;
import java.security.NoSuchAlgorithmException;
import java.util.Date;
import java.util.List;
import java.util.Set;
@@ -101,11 +101,7 @@ public class UserResource extends BaseResource {
user.setEmail(email);
user.setStorageQuota(storageQuota);
user.setStorageCurrent(0L);
try {
user.setPrivateKey(EncryptionUtil.generatePrivateKey());
} catch (NoSuchAlgorithmException e) {
throw new ServerException("PrivateKeyError", "Error while generating a private key", e);
}
user.setPrivateKey(EncryptionUtil.generatePrivateKey());
user.setCreateDate(new Date());
// Create the user
@@ -339,7 +335,7 @@ public class UserResource extends BaseResource {
}
} else {
// Login as a normal user
user = userDao.authenticate(username, password);
user = AuthenticationUtil.authenticate(username, password);
}
if (user == null) {
throw new ForbiddenClientException();