make private ids private

OpenLiberty · Oct 10, 2019 · 9e6e746 · 9e6e746
1 parent 8981188
commit 9e6e746
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 8 deletions.
diff --git a/frontend/.gitignore b/frontend/.gitignore
diff --git a/frontend/prebuild/src/app/login/login.component.ts b/frontend/prebuild/src/app/login/login.component.ts
@@ -432,8 +432,7 @@ export class LoginComponent implements OnInit, OnDestroy {
     }
     name = name.trim();
 
-    let userId = this.makeId();
-    console.log(`id: ${userId}`);
+    let userid = `BOT:${this.makeId()}`;
     // register a new user
     let key: any = await this.http.post(`${environment.API_URL_PLAYERS}?name=${name}&id=${userId}`, '', {
       responseType: 'text'

diff --git a/game-service/src/main/java/org/libertybikes/game/round/service/GameRoundWebsocket.java b/game-service/src/main/java/org/libertybikes/game/round/service/GameRoundWebsocket.java
@@ -106,7 +106,7 @@ else if (!round.isPlayer(session))
                 if (playerResponse == null)
                     closeWithError(session, roundId, "Unable to add player " + msg.playerJoinedId +
                                                      " to game. This is probably because the player has not been registered yet");
-                else if (!round.addPlayer(session, msg.playerJoinedId, playerResponse.name, msg.hasGameBoard == null ? true : msg.hasGameBoard))
+                else if (!round.addPlayer(session, playerResponse.id, playerResponse.name, msg.hasGameBoard == null ? true : msg.hasGameBoard))
                     closeWithError(session, roundId, "Unable to add player " + playerResponse.name
                                                      + " to game. This is probably because someone else with the same name is already in the game.");
             } else if (Boolean.TRUE == msg.isSpectator) {

diff --git a/player-service/src/main/java/org/libertybikes/player/data/InMemPlayerDB.java b/player-service/src/main/java/org/libertybikes/player/data/InMemPlayerDB.java
@@ -28,7 +28,13 @@ public void update(Player p) {
 
     @Override
     public Player get(String id) {
-        return allPlayers.get(id);
+        Player p = allPlayers.get(id);
+        if (p != null) {
+            if (p.key == null)
+                return p;
+            return null;
+        }
+        return getBot(id);
     }
 
     @Override
@@ -50,4 +56,13 @@ public boolean exists(String id) {
         return allPlayers.containsKey(id);
     }
 
+    private Player getBot(String secret) {
+        for (Map.Entry<String, Player> entry : allPlayers.entrySet()) {
+            if (secret.equals(entry.getValue().key)) {
+                return entry.getValue();
+            }
+        }
+        return null;
+    }
+
 }
diff --git a/player-service/src/main/java/org/libertybikes/player/data/PersistentPlayerDB.java b/player-service/src/main/java/org/libertybikes/player/data/PersistentPlayerDB.java
@@ -22,6 +22,7 @@ public class PersistentPlayerDB implements PlayerDB {
 
     private static final String TABLE_NAME = "PLAYERS";
     private static final String COL_ID = "id";
+    private static final String COL_KEY = "key";
     private static final String COL_NAME = "name";
     private static final String COL_NUM_GAMES = "totalGames";
     private static final String COL_NUM_WINS = "totalWins";
@@ -40,6 +41,8 @@ public boolean isAvailable() {
                             .append(" (")
                             .append(COL_ID)
                             .append(" varchar(30) not null, ")
+                            .append(COL_KEY)
+                            .append(" varchar(30) not null, ")
                             .append(COL_NAME)
                             .append(" varchar(20) not null, ")
                             .append(COL_NUM_GAMES)
@@ -109,15 +112,22 @@ public void update(Player p) {
 
     @Override
     public Player get(String id) {
+        Player p = null;
         try (Connection con = ds.getConnection()) {
             PreparedStatement ps = con.prepareStatement("SELECT * FROM " + TABLE_NAME + " WHERE " + COL_ID + " = ?");
             ps.setString(1, id);
             ResultSet rs = ps.executeQuery();
-            return rs.next() ? inflate(rs) : null;
+            p = rs.next() ? inflate(rs) : null;
         } catch (SQLException e) {
             e.printStackTrace();
             return null;
         }
+        if (p != null) {
+            if (p.key == null)
+                return p;
+            return null;
+        }
+        return getBot(id);
     }
 
     @Override
@@ -172,8 +182,20 @@ private static Player inflate(ResultSet rs) throws SQLException {
         stats.totalGames = rs.getInt(COL_NUM_GAMES);
         stats.numWins = rs.getInt(COL_NUM_WINS);
         stats.rating = rs.getInt(COL_RATING);
-        Player p = new Player(rs.getString(COL_NAME), rs.getString(COL_ID), stats);
+        Player p = new Player(rs.getString(COL_NAME), rs.getString(COL_ID), null, stats);
         return p;
     }
 
+    public Player getBot(String key) {
+        try (Connection con = ds.getConnection()) {
+            PreparedStatement ps = con.prepareStatement("SELECT * FROM " + TABLE_NAME + " WHERE " + COL_KEY + " = ?");
+            ps.setString(1, key);
+            ResultSet rs = ps.executeQuery();
+            return rs.next() ? inflate(rs) : null;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
 }
diff --git a/player-service/src/main/java/org/libertybikes/player/data/PlayerDB.java b/player-service/src/main/java/org/libertybikes/player/data/PlayerDB.java
@@ -26,4 +26,6 @@ public interface PlayerDB {
 
     public boolean exists(String id);
 
+    //   public Player getBot(String key);
+
 }
diff --git a/player-service/src/main/java/org/libertybikes/player/service/Player.java b/player-service/src/main/java/org/libertybikes/player/service/Player.java
@@ -26,6 +26,8 @@ public String toString() {
 
     public final String name;
 
+    public final String key;
+
     public final PlayerStats stats;
 
     public Player(String name) {
@@ -35,13 +37,18 @@ public Player(String name) {
     @JsonbCreator
     public Player(@JsonbProperty("name") String name,
                   @JsonbProperty("id") String id) {
-        this(name, id, new PlayerStats());
+        this(name, id, null, new PlayerStats());
+    }
+
+    public Player(String name, String id, String key) {
+        this(name, id, key, new PlayerStats());
     }
 
-    public Player(String name, String id, PlayerStats stats) {
+    public Player(String name, String id, String key, PlayerStats stats) {
         this.id = (id == null || id.equals("null")) ? createDefaultId(name) : id;
         this.name = name;
         this.stats = stats;
+        this.key = key;
     }
 
     public static int compareByWins(Player a, Player b) {

diff --git a/player-service/src/main/java/org/libertybikes/player/service/PlayerService.java b/player-service/src/main/java/org/libertybikes/player/service/PlayerService.java
@@ -58,6 +58,17 @@ public String createPlayer(@QueryParam("name") String name, @QueryParam("id") St
         if (name.length() > 20)
             name = name.substring(0, 20);
 
+        String key = null;
+        if (id != null && id.startsWith("BOT:")) {
+            key = id.substring(4);
+            id = "BOT:" + key.substring(0, 4);
+            Player p = new Player(name, id, key);
+            if (db.create(p))
+                System.out.println("Created a new bot with id=" + p.id);
+            else
+                System.out.println("A player already existed with id=" + p.id);
+            return p.key;
+        }
         Player p = new Player(name, id);
         if (db.create(p))
             System.out.println("Created a new player with id=" + p.id);