1.1 --- a/webidor/src/main/java/cz/xelfi/quoridor/webidor/resources/Quoridor.java	Sat Nov 07 15:23:14 2009 +0100
     1.2 +++ b/webidor/src/main/java/cz/xelfi/quoridor/webidor/resources/Quoridor.java	Sat Nov 07 23:26:03 2009 +0100
     1.3 @@ -31,6 +31,7 @@
     1.4  import com.sun.jersey.api.core.ResourceConfig;
     1.5  import com.sun.jersey.spi.resource.Singleton;
     1.6  import com.sun.net.httpserver.HttpServer;
     1.7 +import cz.xelfi.quoridor.webidor.User;
     1.8  import java.io.File;
     1.9  import java.io.FileInputStream;
    1.10  import java.io.IOException;
    1.11 @@ -86,7 +87,7 @@
    1.12  
    1.13      @Path("login")
    1.14      @PUT
    1.15 -    @Produces({ MediaType.TEXT_PLAIN, MediaType.APPLICATION_JSON, MediaType.TEXT_XML })
    1.16 +    @Produces({ MediaType.TEXT_PLAIN })
    1.17      public String login(
    1.18          @QueryParam("name") String name,
    1.19          @QueryParam("password") String password
    1.20 @@ -110,7 +111,7 @@
    1.21  
    1.22      @Path("login")
    1.23      @GET
    1.24 -    @Produces({ MediaType.TEXT_PLAIN, MediaType.APPLICATION_JSON, MediaType.TEXT_XML })
    1.25 +    @Produces({ MediaType.TEXT_PLAIN })
    1.26      public String isLoggedIn(
    1.27          @QueryParam("id") String id
    1.28      ) {
    1.29 @@ -125,6 +126,23 @@
    1.30          return ret == null ? "" : ret;
    1.31      }
    1.32  
    1.33 +    @Path("login")
    1.34 +    @GET
    1.35 +    @Produces({ MediaType.APPLICATION_JSON, MediaType.TEXT_XML })
    1.36 +    public User loggedInInfo(
    1.37 +        @QueryParam("id") String id
    1.38 +    ) throws IOException {
    1.39 +        String ret = null;
    1.40 +        try {
    1.41 +            if (id != null) {
    1.42 +                ret = loggedIn.get(UUID.fromString(id));
    1.43 +            }
    1.44 +        } catch (IllegalArgumentException ex) {
    1.45 +            // OK, happens for invalid ids
    1.46 +        }
    1.47 +        return ret == null ? null : getUsers().getUserInfo(id, ret);
    1.48 +    }
    1.49 +
    1.50      //
    1.51      // start the server
    1.52      //