From 4d8baafe6bb30cb3c7976cd16aec37c68b480a1a Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Sun, 31 Mar 2013 20:38:38 +0000 Subject: [PATCH] Users can login again. --- .../async/handler/LoginRequestHandler.java | 6 +--- .../async/handler/RegisterRequestHandler.java | 31 ++++++++++--------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/LoginRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/LoginRequestHandler.java index 3c58a8be6..1cf710d7c 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/LoginRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/LoginRequestHandler.java @@ -25,11 +25,7 @@ public class LoginRequestHandler extends LotroServerRequestHandler implements Ur Player player = _playerDao.loginUser(login, password); if (player != null) { if (player.getType().contains("u")) { - if (player.getType().contains("a")) { - responseWriter.writeXmlResponse(null, logUserReturningHeaders(e, login)); - } else { - responseWriter.writeError(503); - } + responseWriter.writeXmlResponse(null, logUserReturningHeaders(e, login)); } else { responseWriter.writeError(403); } diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/RegisterRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/RegisterRequestHandler.java index c98df1a2a..04670a807 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/RegisterRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/RegisterRequestHandler.java @@ -1,9 +1,12 @@ package com.gempukku.lotro.async.handler; +import com.gempukku.lotro.async.HttpProcessingException; import com.gempukku.lotro.async.ResponseWriter; +import com.gempukku.lotro.db.LoginInvalidException; import org.jboss.netty.channel.MessageEvent; import org.jboss.netty.handler.codec.http.HttpMethod; import org.jboss.netty.handler.codec.http.HttpRequest; +import org.jboss.netty.handler.codec.http.multipart.HttpPostRequestDecoder; import java.lang.reflect.Type; import java.util.Map; @@ -16,21 +19,19 @@ public class RegisterRequestHandler extends LotroServerRequestHandler implements @Override public void handleRequest(String uri, HttpRequest request, Map context, ResponseWriter responseWriter, MessageEvent e) throws Exception { if (uri.equals("") && request.getMethod() == HttpMethod.POST) { - responseWriter.writeError(503); -// -// HttpPostRequestDecoder postDecoder = new HttpPostRequestDecoder(request); -// String login = getFormParameterSafely(postDecoder, "login"); -// String password = getFormParameterSafely(postDecoder, "password"); -// try { -// if (_playerDao.registerUser(login, password, e.getRemoteAddress().toString())) { -// responseWriter.writeXmlResponse(null, logUserReturningHeaders(e, login)); -// } else { -// throw new HttpProcessingException(409); -// } -// } catch (LoginInvalidException exp) { -// throw new HttpProcessingException(400); -// } -// + HttpPostRequestDecoder postDecoder = new HttpPostRequestDecoder(request); + String login = getFormParameterSafely(postDecoder, "login"); + String password = getFormParameterSafely(postDecoder, "password"); + try { + if (_playerDao.registerUser(login, password, e.getRemoteAddress().toString())) { + responseWriter.writeXmlResponse(null, logUserReturningHeaders(e, login)); + } else { + throw new HttpProcessingException(409); + } + } catch (LoginInvalidException exp) { + throw new HttpProcessingException(400); + } + } else { responseWriter.writeError(404); }