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

fix base64 to json send

Browse source
This commit is contained in:
Francois G 2023-03-17 21:19:34 +01:00
parent d74013a13a
commit 77283bdf75
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -1,4 +1,6 @@
.settings/ .settings/
bin/ bin/
.project .project
config.txt config.txt
dist/
testApi/

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

@ -34,10 +34,10 @@ public class BadgeDetails implements Response {
JSONObject badgeJSON = new JSONObject(); JSONObject badgeJSON = new JSONObject();
if (badge != null) { if (badge != null) {
badgeJSON.put("name", badge.getName()); badgeJSON.put("name", badge.getName());
if(badge.getLogo() != null) badgeJSON.put("logo", new String(Base64.getEncoder().encode(badge.getLogo()))); if(badge.getLogo() != null) badgeJSON.put("logo", Base64.getEncoder().encodeToString(badge.getLogo()));
badgeJSON.put("level", badge.getLevel()); badgeJSON.put("level", badge.getLevel());
} }
writer.write(badgeJSON.toJSONString()); writer.write(badgeJSON.toJSONString().replace("\\", ""));
} }
else { else {
HttpUtil.responseHeaders(writer, 400, "Access-Control-Allow-Origin: *"); HttpUtil.responseHeaders(writer, 400, "Access-Control-Allow-Origin: *");

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

@ -34,14 +34,14 @@ public class Leaderboard implements Response {
JSONObject playerJSON = new JSONObject(); JSONObject playerJSON = new JSONObject();
playerJSON.put("pseudo", player.getPseudo()); playerJSON.put("pseudo", player.getPseudo());
playerJSON.put("group", player.getGroup()); playerJSON.put("group", player.getGroup());
if(player.getAvatar() != null) playerJSON.put("avatar", new String(Base64.getEncoder().encode(player.getAvatar()))); if(player.getAvatar() != null) playerJSON.put("avatar", Base64.getEncoder().encodeToString(player.getAvatar()));
playerJSON.put("score", player.getTotalScore()); playerJSON.put("score", player.getTotalScore());
playerJSON.put("completions", player.getTotalCompletion()); playerJSON.put("completions", player.getTotalCompletion());
playerJSON.put("tries", player.getTotalTries()); playerJSON.put("tries", player.getTotalTries());
playersJSON.add(playerJSON); playersJSON.add(playerJSON);
} }
} }
writer.write(playersJSON.toJSONString()); writer.write(playersJSON.toJSONString().replace("\\", ""));
} }
@Override @Override

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

@ -46,8 +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());
if(player.getAvatar() != null) playerJSON.put("avatar", new String(Base64.getEncoder().encode(player.getAvatar()))); if(player.getAvatar() != null) playerJSON.put("avatar", Base64.getEncoder().encodeToString(player.getAvatar()));
writer.write(playerJSON.toJSONString()); writer.write(playerJSON.toJSONString().replace("\\", ""));
} else { } else {
HttpUtil.responseHeaders(writer, 400, "Access-Control-Allow-Origin: *"); HttpUtil.responseHeaders(writer, 400, "Access-Control-Allow-Origin: *");
} }
@ -55,6 +55,6 @@ public class PlayerDetails implements Response {
@Override @Override
public Pattern getPattern() { public Pattern getPattern() {
return Pattern.compile("^\\/player\\/(.+)?$"); return Pattern.compile("^\\/player\\/?(.+)?$");
} }
} }