remove getfamily
This commit is contained in:
parent
1ea2a40a0a
commit
5cb64e205f
@ -70,7 +70,7 @@ public class UsersRessources {
|
|||||||
UsersEntity user = UsersEntity.findById(kid);
|
UsersEntity user = UsersEntity.findById(kid);
|
||||||
Response.Status status = getResponseCheck(ctx, userCookie, user);
|
Response.Status status = getResponseCheck(ctx, userCookie, user);
|
||||||
Response responseHttp = Response.status(status).build();
|
Response responseHttp = Response.status(status).build();
|
||||||
if(status.getFamily().equals(Response.Status.Family.SUCCESSFUL)){
|
if(status.equals(Response.Status.OK)){
|
||||||
responseHttp = Response.ok(UsersEntity.listAll()).build();
|
responseHttp = Response.ok(UsersEntity.listAll()).build();
|
||||||
}
|
}
|
||||||
return responseHttp;
|
return responseHttp;
|
||||||
@ -85,7 +85,7 @@ public class UsersRessources {
|
|||||||
UsersEntity user = UsersEntity.findById(kid);
|
UsersEntity user = UsersEntity.findById(kid);
|
||||||
Response.Status status = getResponseCheck(ctx, userCookie, user);
|
Response.Status status = getResponseCheck(ctx, userCookie, user);
|
||||||
Response responseHttp = Response.status(status).build();
|
Response responseHttp = Response.status(status).build();
|
||||||
if (status.getFamily().equals(Response.Status.Family.SUCCESSFUL)) {
|
if (status.equals(Response.Status.OK)) {
|
||||||
UUID uid = UUID.fromString(id);
|
UUID uid = UUID.fromString(id);
|
||||||
UsersEntity users = UsersEntity.findById(uid);
|
UsersEntity users = UsersEntity.findById(uid);
|
||||||
responseHttp = Response.status(Response.Status.NOT_FOUND).build();
|
responseHttp = Response.status(Response.Status.NOT_FOUND).build();
|
||||||
@ -104,7 +104,7 @@ public class UsersRessources {
|
|||||||
UUID kid = UUID.fromString(jwt.getClaim(Claims.kid));
|
UUID kid = UUID.fromString(jwt.getClaim(Claims.kid));
|
||||||
UsersEntity user = UsersEntity.findById(kid);
|
UsersEntity user = UsersEntity.findById(kid);
|
||||||
Response.Status status = getResponseCheck(ctx, userCookie, user);
|
Response.Status status = getResponseCheck(ctx, userCookie, user);
|
||||||
if (status.getFamily().equals(Response.Status.Family.SUCCESSFUL)) {
|
if (status.equals(Response.Status.OK)) {
|
||||||
if (user == null) {
|
if (user == null) {
|
||||||
status = Response.Status.NOT_FOUND;
|
status = Response.Status.NOT_FOUND;
|
||||||
}
|
}
|
||||||
@ -113,7 +113,7 @@ public class UsersRessources {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
Response responseHttp = Response.status(status).build();
|
Response responseHttp = Response.status(status).build();
|
||||||
if (status.getFamily().equals(Status.Family.SUCCESSFUL)) {
|
if (status.equals(Response.Status.OK)) {
|
||||||
responseHttp = Response.status(status).entity(new UserSingle(user.name, user.pseudo, user.firstName))
|
responseHttp = Response.status(status).entity(new UserSingle(user.name, user.pseudo, user.firstName))
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
@ -131,7 +131,7 @@ public class UsersRessources {
|
|||||||
UsersEntity user = UsersEntity.findById(kid);
|
UsersEntity user = UsersEntity.findById(kid);
|
||||||
Response.Status status = getResponseCheck(ctx, userCookie, user);
|
Response.Status status = getResponseCheck(ctx, userCookie, user);
|
||||||
|
|
||||||
if (status.getFamily().equals(Response.Status.Family.SUCCESSFUL)) {
|
if (status.equals(Response.Status.OK)) {
|
||||||
|
|
||||||
UsersEntity usersOrig = UsersEntity.findByPseudo(users.pseudo);
|
UsersEntity usersOrig = UsersEntity.findByPseudo(users.pseudo);
|
||||||
if (usersOrig != null) {
|
if (usersOrig != null) {
|
||||||
@ -171,7 +171,7 @@ public class UsersRessources {
|
|||||||
|
|
||||||
Response.Status status = getResponseCheck(ctx, userCookie, user);
|
Response.Status status = getResponseCheck(ctx, userCookie, user);
|
||||||
|
|
||||||
if (status.getFamily().equals(Response.Status.Family.SUCCESSFUL)) {
|
if (status.equals(Response.Status.OK)) {
|
||||||
user.status = false;
|
user.status = false;
|
||||||
user.persist();
|
user.persist();
|
||||||
if (!user.isPersistent()) {
|
if (!user.isPersistent()) {
|
||||||
@ -190,12 +190,12 @@ public class UsersRessources {
|
|||||||
UUID kid = UUID.fromString(jwt.getClaim(Claims.kid));
|
UUID kid = UUID.fromString(jwt.getClaim(Claims.kid));
|
||||||
UsersEntity user = UsersEntity.findById(kid);
|
UsersEntity user = UsersEntity.findById(kid);
|
||||||
Response.Status status = getResponseCheck(ctx, userCookie, user);
|
Response.Status status = getResponseCheck(ctx, userCookie, user);
|
||||||
if (status.getFamily().equals(Response.Status.Family.SUCCESSFUL)) {
|
if (status.equals(Response.Status.OK)) {
|
||||||
UsersEntity singleUser = UsersEntity.find("id", UUID.fromString(id)).firstResult();
|
UsersEntity singleUser = UsersEntity.find("id", UUID.fromString(id)).firstResult();
|
||||||
if (singleUser == null) {
|
if (singleUser == null) {
|
||||||
status = Response.Status.NOT_FOUND;
|
status = Response.Status.NOT_FOUND;
|
||||||
}
|
}
|
||||||
if (status.getFamily().equals(Response.Status.Family.SUCCESSFUL)) {
|
else {
|
||||||
singleUser.status = false;
|
singleUser.status = false;
|
||||||
singleUser.persist();
|
singleUser.persist();
|
||||||
if (!singleUser.isPersistent()) {
|
if (!singleUser.isPersistent()) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user