# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1252865252 -7200
# Node ID 8dd8b041a3e153e88f06cb82dfae8db42b7da105
# Parent  9ac7acee7d9f34dc1b6cc7b36bb4197ae3042c15
Necessary fixes to make the system work at least a bit

diff -r 9ac7acee7d9f -r 8dd8b041a3e1 freemarkerdor/pom.xml
--- a/freemarkerdor/pom.xml	Sun Sep 13 16:48:54 2009 +0200
+++ b/freemarkerdor/pom.xml	Sun Sep 13 20:07:32 2009 +0200
@@ -100,7 +100,7 @@
     </plugin>
   </plugins>
   </build>
-  <version>1.5</version>
+  <version>1.6</version>
 </project>
 
 
diff -r 9ac7acee7d9f -r 8dd8b041a3e1 freemarkerdor/src/main/java/cz/xelfi/quoridor/freemarkerdor/UI.java
--- a/freemarkerdor/src/main/java/cz/xelfi/quoridor/freemarkerdor/UI.java	Sun Sep 13 16:48:54 2009 +0200
+++ b/freemarkerdor/src/main/java/cz/xelfi/quoridor/freemarkerdor/UI.java	Sun Sep 13 20:07:32 2009 +0200
@@ -75,10 +75,14 @@
 
     private Viewable checkLogin() {
         if (headers.getCookies().containsKey("login")) {
-            uuid = headers.getCookies().get("login").getValue();
-            user = base.path("login").queryParam("id", uuid).
+            String id = headers.getCookies().get("login").getValue();
+            String us = base.path("login").queryParam("id", id).
                 accept(MediaType.TEXT_PLAIN).get(String.class);
-            return null;
+            if (us.length() > 0) {
+                user = us;
+                uuid = id;
+                return null;
+            }
         }
         return viewable("login.fmt", null);
     }
diff -r 9ac7acee7d9f -r 8dd8b041a3e1 webidor/src/main/java/cz/xelfi/quoridor/webidor/resources/Quoridor.java
--- a/webidor/src/main/java/cz/xelfi/quoridor/webidor/resources/Quoridor.java	Sun Sep 13 16:48:54 2009 +0200
+++ b/webidor/src/main/java/cz/xelfi/quoridor/webidor/resources/Quoridor.java	Sun Sep 13 20:07:32 2009 +0200
@@ -105,7 +105,11 @@
     public String isLoggedIn(
         @QueryParam("id") String id
     ) {
-        return id == null ? null : loggedIn.get(UUID.fromString(id));
+        try {
+            return id == null ? "" : loggedIn.get(UUID.fromString(id));
+        } catch (IllegalArgumentException ex) {
+            return "";
+        }
     }
 
     //
diff -r 9ac7acee7d9f -r 8dd8b041a3e1 webidor/src/test/java/cz/xelfi/quoridor/webidor/FinishedGameTest.java
--- a/webidor/src/test/java/cz/xelfi/quoridor/webidor/FinishedGameTest.java	Sun Sep 13 16:48:54 2009 +0200
+++ b/webidor/src/test/java/cz/xelfi/quoridor/webidor/FinishedGameTest.java	Sun Sep 13 20:07:32 2009 +0200
@@ -76,6 +76,13 @@
         }
         dir.delete();
     }
+    @Test public void testNotLoggedIn() {
+        webResource = webResource.path("api");
+        String status  = webResource.path("login").queryParam("id", "not-logged-in").
+                accept(MediaType.TEXT_PLAIN).get(String.class);
+        assertEquals("Nobody is logged in", "", status);
+    }
+
 
     @Test public void testCreateAGame() throws Exception {
         webResource = webResource.path("api");