public/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2025-12-27 00:22:33 +00:00
Code Issues Releases Wiki Activity

Closes #30: Delete locale & theme concept

Browse Source
This commit is contained in:
jendib
2015-09-07 23:49:12 +02:00
parent 0fe51d355c
commit a95dcf488d
25 changed files with 43 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
docs-web/src/main/java/com/sismics/docs/rest/resource/LocaleResource.java
View File

@@ -1,41 +0,0 @@
package com.sismics.docs.rest.resource;
import java.util.List;
import javax.json.Json;
import javax.json.JsonArrayBuilder;
import javax.json.JsonObjectBuilder;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.core.Response;
import com.sismics.docs.core.dao.jpa.LocaleDao;
import com.sismics.docs.core.model.jpa.Locale;
/**
* Locale REST resources.
*
* @author jtremeaux
*/
@Path("/locale")
public class LocaleResource extends BaseResource {
/**
* Returns the list of all locales.
*
* @return Response
*/
@GET
public Response list() {
LocaleDao localeDao = new LocaleDao();
List<Locale> localeList = localeDao.findAll();
JsonArrayBuilder items = Json.createArrayBuilder();
for (Locale locale : localeList) {
items.add(Json.createObjectBuilder()
.add("id", locale.getId()));
}
JsonObjectBuilder response = Json.createObjectBuilder()
.add("locales", items);
return Response.ok().entity(response.build()).build();
}
}

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

@@ -42,7 +42,6 @@ import com.sismics.rest.exception.ForbiddenClientException;
import com.sismics.rest.exception.ServerException;
import com.sismics.rest.util.ValidationUtil;
import com.sismics.security.UserPrincipal;
import com.sismics.util.LocaleUtil;
import com.sismics.util.filter.TokenBasedSecurityFilter;
/**
@@ -90,8 +89,6 @@ public class UserResource extends BaseResource {
throw new ServerException("PrivateKeyError", "Error while generating a private key", e);
}
user.setCreateDate(new Date());
user.setLocaleId(LocaleUtil.getLocaleIdFromAcceptLanguage(request.getHeader("Accept-Language")));
// Create the user
UserDao userDao = new UserDao();
@@ -116,14 +113,12 @@ public class UserResource extends BaseResource {
*
* @param password Password
* @param email E-Mail
* @param firstConnection True if the user hasn't acknowledged the first connection wizard yet.
* @return Response
*/
@POST
public Response update(
@FormParam("password") String password,
@FormParam("email") String email,
@FormParam("first_connection") Boolean firstConnection) {
@FormParam("email") String email) {
if (!authenticate()) {
throw new ForbiddenClientException();
@@ -139,10 +134,7 @@ public class UserResource extends BaseResource {
if (email != null) {
user.setEmail(email);
}
if (firstConnection != null && hasBaseFunction(BaseFunction.ADMIN)) {
user.setFirstConnection(firstConnection);
}
user = userDao.update(user);
if (StringUtils.isNotBlank(password)) {
@@ -232,7 +224,7 @@ public class UserResource extends BaseResource {
}
/**
* This resource is used to authenticate the user and create a user ession.
* This resource is used to authenticate the user and create a user session.
* The "session" is only used to identify the user, no other data is stored in the session.
*
* @param username Username
@@ -402,9 +394,6 @@ public class UserResource extends BaseResource {
if (!authenticate()) {
response.add("anonymous", true);
String localeId = LocaleUtil.getLocaleIdFromAcceptLanguage(request.getHeader("Accept-Language"));
response.add("locale", localeId);
// Check if admin has the default password
UserDao userDao = new UserDao();
User adminUser = userDao.getById("admin");
@@ -416,9 +405,7 @@ public class UserResource extends BaseResource {
UserDao userDao = new UserDao();
User user = userDao.getById(principal.getId());
response.add("username", user.getUsername())
.add("email", user.getEmail())
.add("locale", user.getLocaleId())
.add("first_connection", user.isFirstConnection());
.add("email", user.getEmail());
JsonArrayBuilder baseFunctions = Json.createArrayBuilder();
for (String baseFunction : ((UserPrincipal) principal).getBaseFunctionSet()) {
baseFunctions.add(baseFunction);
@@ -453,8 +440,7 @@ public class UserResource extends BaseResource {
JsonObjectBuilder response = Json.createObjectBuilder()
.add("username", user.getUsername())
.add("email", user.getEmail())
.add("locale", user.getLocaleId());
.add("email", user.getEmail());
return Response.ok().entity(response.build()).build();
}