Remove user token #4715

This commit is contained in:
Jerry (Xinyu Hou) 2015-11-18 15:09:09 -08:00
parent b1c5a83bfb
commit 0e58bfc5fe
3 changed files with 0 additions and 10 deletions

View File

@ -130,7 +130,6 @@ void AppConfig::loadSettings()
m_AutoConfigPrompted = settings().value("autoConfigPrompted", false).toBool(); m_AutoConfigPrompted = settings().value("autoConfigPrompted", false).toBool();
m_Edition = settings().value("edition", Unknown).toInt(); m_Edition = settings().value("edition", Unknown).toInt();
m_ActivateEmail = settings().value("activateEmail", "").toString(); m_ActivateEmail = settings().value("activateEmail", "").toString();
m_UserToken = settings().value("userToken", "").toString();
m_CryptoEnabled = settings().value("cryptoEnabled", false).toBool(); m_CryptoEnabled = settings().value("cryptoEnabled", false).toBool();
m_AutoHide = settings().value("autoHide", false).toBool(); m_AutoHide = settings().value("autoHide", false).toBool();
m_Serialkey = settings().value("serialKey", "").toString(); m_Serialkey = settings().value("serialKey", "").toString();
@ -153,7 +152,6 @@ void AppConfig::saveSettings()
settings().setValue("autoConfigPrompted", m_AutoConfigPrompted); settings().setValue("autoConfigPrompted", m_AutoConfigPrompted);
settings().setValue("edition", m_Edition); settings().setValue("edition", m_Edition);
settings().setValue("activateEmail", m_ActivateEmail); settings().setValue("activateEmail", m_ActivateEmail);
settings().setValue("userToken", m_UserToken);
settings().setValue("cryptoEnabled", m_CryptoEnabled); settings().setValue("cryptoEnabled", m_CryptoEnabled);
settings().setValue("autoHide", m_AutoHide); settings().setValue("autoHide", m_AutoHide);
settings().setValue("serialKey", m_Serialkey); settings().setValue("serialKey", m_Serialkey);

View File

@ -76,8 +76,6 @@ class AppConfig
int edition() { return m_Edition; } int edition() { return m_Edition; }
void setActivateEmail(QString e) { m_ActivateEmail = e; } void setActivateEmail(QString e) { m_ActivateEmail = e; }
QString activateEmail() { return m_ActivateEmail; } QString activateEmail() { return m_ActivateEmail; }
void setUserToken(QString t) { m_UserToken = t; }
QString userToken() { return m_UserToken; }
void setSerialKey(QString serial) { m_Serialkey = serial; } void setSerialKey(QString serial) { m_Serialkey = serial; }
QString serialKey() { return m_Serialkey; } QString serialKey() { return m_Serialkey; }
int lastExpiringWarningTime() const { return m_LastExpiringWarningTime; } int lastExpiringWarningTime() const { return m_LastExpiringWarningTime; }
@ -131,7 +129,6 @@ class AppConfig
bool m_AutoConfigPrompted; bool m_AutoConfigPrompted;
int m_Edition; int m_Edition;
QString m_ActivateEmail; QString m_ActivateEmail;
QString m_UserToken;
bool m_CryptoEnabled; bool m_CryptoEnabled;
bool m_AutoHide; bool m_AutoHide;
QString m_Serialkey; QString m_Serialkey;

View File

@ -199,11 +199,6 @@ void SetupWizard::accept()
if (m_pRadioButtonActivate->isChecked()) { if (m_pRadioButtonActivate->isChecked()) {
appConfig.setActivateEmail(m_pLineEditEmail->text()); appConfig.setActivateEmail(m_pLineEditEmail->text());
QString mac = getFirstMacAddress();
QString hashSrc = m_pLineEditEmail->text() + mac;
QString hashResult = hash(hashSrc);
appConfig.setUserToken(hashResult);
appConfig.setEdition(m_Edition);
CoreInterface coreInterface; CoreInterface coreInterface;
coreInterface.notifyActivation("login:" + m_pLineEditEmail->text()); coreInterface.notifyActivation("login:" + m_pLineEditEmail->text());