Peer-at-Code/peer-at-code-backend
5
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'addRoutes' of github.com:Peer-at-Code/peer-at-code-backend into addRoutes

Browse source
This commit is contained in:
Francois G 2023-03-10 11:08:23 +01:00
commit 1c951e8581
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/be/jeffcheasey88/peeratcode/model/Player.java
View file

@ -27,7 +27,7 @@ public class Player implements Comparable<Player> {
public Player(String pseudo, String email, String firstname, String lastname, String description, String sgroup, public Player(String pseudo, String email, String firstname, String lastname, String description, String sgroup,
byte[] avatar) { byte[] avatar) {
this(pseudo, email, firstname, lastname, description, sgroup, null, null); this(pseudo, email, firstname, lastname, description, sgroup, avatar, null);
} }
public Player(String pseudo, String email, String firstname, String lastname, String description, String sgroup, public Player(String pseudo, String email, String firstname, String lastname, String description, String sgroup,
byte[] avatar, String badges) { byte[] avatar, String badges) {

1
src/be/jeffcheasey88/peeratcode/repository/DatabaseRepository.java
View file

@ -16,7 +16,6 @@ import com.password4j.Hash;
import com.password4j.Password; import com.password4j.Password;
import be.jeffcheasey88.peeratcode.Configuration; import be.jeffcheasey88.peeratcode.Configuration;
import be.jeffcheasey88.peeratcode.model.Badge;
import be.jeffcheasey88.peeratcode.model.Chapter; import be.jeffcheasey88.peeratcode.model.Chapter;
import be.jeffcheasey88.peeratcode.model.Completion; import be.jeffcheasey88.peeratcode.model.Completion;
import be.jeffcheasey88.peeratcode.model.Player; import be.jeffcheasey88.peeratcode.model.Player;

4
src/be/jeffcheasey88/peeratcode/routes/PlayerDetails.java
View file

@ -11,6 +11,7 @@ import be.jeffcheasey88.peeratcode.webserver.User;
import org.json.simple.JSONArray; import org.json.simple.JSONArray;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import java.util.Arrays;
import java.util.Base64; import java.util.Base64;
import java.util.SortedSet; import java.util.SortedSet;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@ -45,9 +46,8 @@ public class PlayerDetails implements Response {
playerJSON.put("completions", player.getTotalCompletion()); playerJSON.put("completions", player.getTotalCompletion());
playerJSON.put("tries", player.getTotalTries()); playerJSON.put("tries", player.getTotalTries());
playerJSON.put("badges", player.getBadges()); playerJSON.put("badges", player.getBadges());
//playerJSON.put("avatar", Base64.getEncoder().encode(player.getAvatar()).toString()); if(player.getAvatar() != null) playerJSON.put("avatar", new String(Base64.getEncoder().encode(player.getAvatar())));
writer.write(playerJSON.toJSONString()); writer.write(playerJSON.toJSONString());
writer.write(player.getAvatar());
} else { } else {
HttpUtil.responseHeaders(writer, 400, "Access-Control-Allow-Origin: *"); HttpUtil.responseHeaders(writer, 400, "Access-Control-Allow-Origin: *");
} }