Merge branch '48-player-queryintermediate' into 'dev'

Resolve "Player QueryIntermediate"

Closes #48

See merge request !45

frontend/core/src/com/gameware/game/QueryIntermediate.java

@@ -24,7 +24,7 @@ import java.util.HashMap;
 import java.util.NoSuchElementException;
 
 public class QueryIntermediate {
-    private static String baseUrl = "http://192.168.0.195:3002/api/";
+    private static String baseUrl = "http://localhost:3001/api/";
     private static Json json = new Json();
     private static JsonReader jsonReader = new JsonReader();
 
@@ -254,4 +254,25 @@ public class QueryIntermediate {
         return player;
     }
 
+    public static Player loginPlayer(String username, String password) throws IOException, NoSuchElementException {
+        String route = "players/login/" + username + "/" + password;
+        String[] response = sendGetRequest(route);
+        checkStatusCode(response);
+        Player player =  json.fromJson(Player.class, response[1].substring(1, response[1].length()-1));
+        checkObjectNotNull(player);
+        return player;
+    }
+
+    public static Player createNewPlayer(String username, String password) throws IOException, NoSuchElementException {
+        String route = "players/";
+        Map<String, String> params = new HashMap<>();
+        params.put("username", username);
+        params.put("password", password);
+        String[] response = sendPutRequest(route, params);
+        checkStatusCode(response);
+        Player player =  json.fromJson(Player.class, response[1]);
+        checkObjectNotNull(player);
+        return player;
+    }
+
 }

frontend/core/src/com/gameware/game/models/Player.java

@@ -7,6 +7,8 @@ import java.util.jar.JarEntry;
 public class Player {
     private String _id;
     private String name;
+    private String password;
+    private String dateJoined;
 
     public Player(String _id, String name) {
         this._id = _id;