fix: login with account name on old protocol (11.00)

opentibiabr · Oct 26, 2023 · 55ed7c3 · 55ed7c3
1 parent 49de5d6
commit 55ed7c3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/account/account.cpp b/src/account/account.cpp
@@ -36,7 +36,7 @@ namespace account {
 			return ERROR_NO;
 		}
 
-		if (!m_descriptor.empty() && accountRepository.loadByEmail(m_descriptor, m_account)) {
+		if (!m_descriptor.empty() && accountRepository.loadByEmailOrName(getProtocolCompat(), m_descriptor, m_account)) {
 			m_accLoaded = true;
 			return ERROR_NO;
 		}

diff --git a/src/account/account_repository.hpp b/src/account/account_repository.hpp
@@ -17,7 +17,7 @@ namespace account {
 		virtual ~AccountRepository() = default;
 
 		virtual bool loadByID(const uint32_t &id, AccountInfo &acc) = 0;
-		virtual bool loadByEmail(const std::string &email, AccountInfo &acc) = 0;
+		virtual bool loadByEmailOrName(bool oldProtocol, const std::string &emailOrName, AccountInfo &acc) = 0;
 		virtual bool loadBySession(const std::string &email, AccountInfo &acc) = 0;
 		virtual bool save(const AccountInfo &accInfo) = 0;
 

diff --git a/src/account/account_repository_db.cpp b/src/account/account_repository_db.cpp
@@ -19,8 +19,9 @@ namespace account {
 		return load(query, acc);
 	};
 
-	bool AccountRepositoryDB::loadByEmail(const std::string &email, AccountInfo &acc) {
-		auto query = fmt::format("SELECT `id`, `type`, `premdays`, `lastday`, `creation`, `premdays_purchased`, 0 AS `expires` FROM `accounts` WHERE `email` = {}", db.escapeString(email));
+	bool AccountRepositoryDB::loadByEmailOrName(bool oldProtocol, const std::string &emailOrName, AccountInfo &acc) {
+		auto identifier = oldProtocol ? "name" : "email";
+		auto query = fmt::format("SELECT `id`, `type`, `premdays`, `lastday`, `creation`, `premdays_purchased`, 0 AS `expires` FROM `accounts` WHERE `{}` = {}", identifier, db.escapeString(emailOrName));
 		return load(query, acc);
 	};
 

diff --git a/src/account/account_repository_db.hpp b/src/account/account_repository_db.hpp
@@ -21,7 +21,7 @@ namespace account {
 			db(db), logger(logger) { }
 
 		bool loadByID(const uint32_t &id, AccountInfo &acc) override;
-		bool loadByEmail(const std::string &email, AccountInfo &acc) override;
+		bool loadByEmailOrName(bool oldProtocol, const std::string &emailOrName, AccountInfo &acc) override;
 		bool loadBySession(const std::string &esseionKey, AccountInfo &acc) override;
 		bool save(const AccountInfo &accInfo) override;