Compare commits
No commits in common. "087cf59ae0ca83736b9bd2ab041a68f55d20b8aa" and "7fb0408b52990f5adfb698ff5ffd5941f5f5891b" have entirely different histories.
087cf59ae0
...
7fb0408b52
5 changed files with 3 additions and 17 deletions
Binary file not shown.
|
@ -10,16 +10,14 @@ import dev.peerat.backend.model.Chapter;
|
|||
import dev.peerat.backend.model.Group;
|
||||
import dev.peerat.backend.model.PeerAtUser;
|
||||
import dev.peerat.backend.repository.DatabaseRepository;
|
||||
import dev.peerat.backend.utils.FormResponse;
|
||||
import dev.peerat.framework.Context;
|
||||
import dev.peerat.framework.HttpReader;
|
||||
import dev.peerat.framework.HttpWriter;
|
||||
import dev.peerat.framework.Locker;
|
||||
import dev.peerat.framework.Response;
|
||||
import dev.peerat.framework.Route;
|
||||
import dev.peerat.framework.utils.json.JsonMap;
|
||||
|
||||
public class GroupCreate extends FormResponse {
|
||||
public class GroupCreate implements Response {
|
||||
|
||||
private Locker<Group> locker;
|
||||
private DatabaseRepository repo;
|
||||
|
@ -29,8 +27,6 @@ public class GroupCreate extends FormResponse {
|
|||
this.repo = repo;
|
||||
this.locker = locker;
|
||||
this.groupDelay = groupDelay;
|
||||
|
||||
validator("name", "[a-zA-Z0-9&|!?{}\\[\\]%/*\\-+=:;,_#@ ]{3,100}");
|
||||
}
|
||||
|
||||
@RouteDoc(path = "/groupCreate", responseCode = 200, responseDescription = "Le groupe a été créé")
|
||||
|
@ -39,12 +35,7 @@ public class GroupCreate extends FormResponse {
|
|||
|
||||
@Route(path = "^\\/groupCreate$", type = POST, needLogin = true)
|
||||
public void exec(Matcher matcher, Context context, HttpReader reader, HttpWriter writer) throws Exception{
|
||||
JsonMap json = json(reader);
|
||||
if(!areValids("name")){
|
||||
context.response(403);
|
||||
return;
|
||||
}
|
||||
Group newGroup = new Group(json);
|
||||
Group newGroup = new Group(reader.readJson());
|
||||
PeerAtUser user = context.getUser();
|
||||
|
||||
if (this.repo.getPlayerGroup(user.getId(), newGroup.getLinkToChapter()) == null) {
|
||||
|
|
|
@ -66,9 +66,6 @@ public class MailConfirmation extends FormResponse {
|
|||
generator.initialize(4096);
|
||||
encoder = Base64.getEncoder();
|
||||
|
||||
validator("pseudo", "[a-zA-Z0-9&|!?{}\\[\\]%/*\\-+=:;,_#@ ]{3,100}");
|
||||
validator("firstname", "^(?>[a-zA-Z]+ ?)+$");
|
||||
validator("lastname", "^(?>[a-zA-Z]+ ?)+$");
|
||||
}
|
||||
|
||||
@RouteDoc(path = "/confirmation", responseCode = 200, responseDescription = "L'utilisateur est inscrit")
|
||||
|
|
|
@ -20,8 +20,6 @@ public class ProfileSettings extends FormResponse{
|
|||
|
||||
public ProfileSettings(DatabaseRepository repo){
|
||||
this.repo = repo;
|
||||
|
||||
validator("pseudo", "[a-zA-Z0-9&|!?{}\\[\\]%/*\\-+=:;,_#@ ]{3,100}");
|
||||
}
|
||||
|
||||
@RouteDoc(path = "/user/settings", responseCode = 200, responseDescription = "L'utilisateur a mis à jours sont profile")
|
||||
|
|
|
@ -19,7 +19,7 @@ public abstract class FormResponse implements Response{
|
|||
}
|
||||
|
||||
public void validator(String key, String regex){
|
||||
this.checker.put(key, Pattern.compile(regex, Pattern.CASE_INSENSITIVE));
|
||||
this.checker.put(key, Pattern.compile(regex));
|
||||
}
|
||||
|
||||
public <T extends Json> T json(HttpReader reader) throws Exception{
|
||||
|
|
Loading…
Add table
Reference in a new issue