Realigned Email already exists error return value and removed GetEmail Address

1 files changed, 1 insertions, 24 deletions

diff --git a/src/account-server/accounthandler.cpp b/src/account-server/accounthandler.cpp
index 5083758d..871d1685 100644
--- a/src/account-server/accounthandler.cpp
+++ b/src/account-server/accounthandler.cpp
@@ -408,7 +408,7 @@ static void handleEmailChangeMessage(AccountClient &computer, MessageIn &msg)
     }
     else if (storage->doesEmailAddressExist(emailHash))
     {
-        reply.writeByte(EMAILCHG_EXISTS_EMAIL);
+        reply.writeByte(ERRMSG_EMAIL_ALREADY_EXISTS);
     }
     else
     {
@@ -420,24 +420,6 @@ static void handleEmailChangeMessage(AccountClient &computer, MessageIn &msg)
     computer.send(reply);
 }
 
-static void handleEmailGetMessage(AccountClient &computer)
-{
-    MessageOut reply(APMSG_EMAIL_GET_RESPONSE);
-
-    Account *acc = computer.getAccount();
-    if (!acc)
-    {
-        reply.writeByte(ERRMSG_NO_LOGIN);
-        computer.send(reply);
-        return;
-    }
-
-    reply.writeByte(ERRMSG_OK);
-    reply.writeString(acc->getEmail());
-
-    computer.send(reply);
-}
-
 static void handlePasswordChangeMessage(AccountClient &computer, MessageIn &msg)
 {
     std::string oldPassword = msg.readString();
@@ -754,11 +736,6 @@ void AccountHandler::processMessage(NetComputer *comp, MessageIn &message)
             handleEmailChangeMessage(computer, message);
             break;
 
-        case PAMSG_EMAIL_GET:
-            LOG_DEBUG("Received msg ... PAMSG_EMAIL_GET");
-            handleEmailGetMessage(computer);
-            break;
-
         case PAMSG_PASSWORD_CHANGE:
             LOG_DEBUG("Received msg ... PAMSG_PASSWORD_CHANGE");
             handlePasswordChangeMessage(computer, message);