aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Trim tokens as this is our most common issue (#3870)

Browse source 
Signed-off-by: ZeldaZach <zahalpern+github@gmail.com>
This commit is contained in:
Zach H 2019-11-23 14:18:28 -05:00 committed by GitHub
parent 57c02dcd5a
commit 8fb0baa449
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cockatrice/src/remoteclient.cpp
View file

@ -412,7 +412,7 @@ void RemoteClient::doActivateToServer(const QString &_token)
{ {
doDisconnectFromServer(); doDisconnectFromServer();
token = _token; token = _token.trimmed();
connectToHost(lastHostname, static_cast<unsigned int>(lastPort)); connectToHost(lastHostname, static_cast<unsigned int>(lastPort));
setStatus(StatusActivating); setStatus(StatusActivating);
@ -488,7 +488,7 @@ void RemoteClient::registerToServer(const QString &hostname,
void RemoteClient::activateToServer(const QString &_token) void RemoteClient::activateToServer(const QString &_token)
{ {
emit sigActivateToServer(_token); emit sigActivateToServer(_token.trimmed());
} }
void RemoteClient::disconnectFromServer() void RemoteClient::disconnectFromServer()
@ -550,7 +550,7 @@ void RemoteClient::submitForgotPasswordResetToServer(const QString &hostname,
const QString &_token, const QString &_token,
const QString &_newpassword) const QString &_newpassword)
{ {
emit sigSubmitForgotPasswordResetToServer(hostname, port, _userName, _token, _newpassword); emit sigSubmitForgotPasswordResetToServer(hostname, port, _userName, _token.trimmed(), _newpassword);
} }
void RemoteClient::doRequestForgotPasswordToServer(const QString &hostname, unsigned int port, const QString &_userName) void RemoteClient::doRequestForgotPasswordToServer(const QString &hostname, unsigned int port, const QString &_userName)
@ -590,7 +590,7 @@ void RemoteClient::doSubmitForgotPasswordResetToServer(const QString &hostname,
userName = _userName; userName = _userName;
lastHostname = hostname; lastHostname = hostname;
lastPort = port; lastPort = port;
token = _token; token = _token.trimmed();
password = _newpassword; password = _newpassword;
connectToHost(lastHostname, static_cast<unsigned int>(lastPort)); connectToHost(lastHostname, static_cast<unsigned int>(lastPort));