summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/base/auth.py2
-rw-r--r--src/leap/baseapp/mainwindow.py6
-rwxr-xr-xsrc/leap/gui/firstrun/wizard.py8
-rw-r--r--src/leap/gui/tests/test_firstrun_wizard.py2
4 files changed, 9 insertions, 9 deletions
diff --git a/src/leap/base/auth.py b/src/leap/base/auth.py
index ecc24179..563a0b2a 100644
--- a/src/leap/base/auth.py
+++ b/src/leap/base/auth.py
@@ -275,7 +275,7 @@ def srpauth_protected(user=None, passwd=None, server=None, verify=True):
def get_leap_credentials():
settings = QtCore.QSettings()
- full_username = settings.value('eip_username')
+ full_username = settings.value('username')
username, domain = full_username.split('@')
seed = settings.value('%s_seed' % domain, None)
password = leapkeyring.leap_get_password(full_username, seed=seed)
diff --git a/src/leap/baseapp/mainwindow.py b/src/leap/baseapp/mainwindow.py
index 02adab65..dd2ecdf0 100644
--- a/src/leap/baseapp/mainwindow.py
+++ b/src/leap/baseapp/mainwindow.py
@@ -57,10 +57,10 @@ class LeapWindow(QtGui.QMainWindow,
settings = QtCore.QSettings()
self.provider_domain = settings.value("provider_domain", None)
- self.eip_username = settings.value("eip_username", None)
+ self.username = settings.value("username", None)
logger.debug('provider: %s', self.provider_domain)
- logger.debug('eip_username: %s', self.eip_username)
+ logger.debug('username: %s', self.username)
provider = self.provider_domain
EIPConductorAppMixin.__init__(
@@ -160,7 +160,7 @@ class LeapWindow(QtGui.QMainWindow,
wizard = FirstRunWizard(
self.conductor,
parent=self,
- eip_username=self.eip_username,
+ username=self.username,
start_eipconnection_signal=self.start_eipconnection,
eip_statuschange_signal=self.eipStatusChange,
quitcallback=self.onWizardCancel)
diff --git a/src/leap/gui/firstrun/wizard.py b/src/leap/gui/firstrun/wizard.py
index 89209401..408d4597 100755
--- a/src/leap/gui/firstrun/wizard.py
+++ b/src/leap/gui/firstrun/wizard.py
@@ -72,7 +72,7 @@ class FirstRunWizard(QtGui.QWizard):
conductor_instance,
parent=None,
pages_dict=None,
- eip_username=None,
+ username=None,
providers=None,
success_cb=None, is_provider_setup=False,
trusted_certs=None,
@@ -92,7 +92,7 @@ class FirstRunWizard(QtGui.QWizard):
# in the connection page, before the wizard has ended.
self.conductor = conductor_instance
- self.eip_username = eip_username
+ self.username = username
self.providers = providers
# success callback
@@ -129,7 +129,7 @@ class FirstRunWizard(QtGui.QWizard):
# by setting 1st page??
#self.is_previously_registered = is_previously_registered
# XXX ??? ^v
- self.is_previously_registered = bool(self.eip_username)
+ self.is_previously_registered = bool(self.username)
self.from_login = False
pages_dict = pages_dict or get_pages_dict()
@@ -233,7 +233,7 @@ class FirstRunWizard(QtGui.QWizard):
settings.setValue("remember_user_and_pass", remember_pass)
if remember_pass:
- settings.setValue("eip_username", full_username)
+ settings.setValue("username", full_username)
seed = self.get_random_str(10)
settings.setValue("%s_seed" % provider, seed)
diff --git a/src/leap/gui/tests/test_firstrun_wizard.py b/src/leap/gui/tests/test_firstrun_wizard.py
index 091cd932..d51e9945 100644
--- a/src/leap/gui/tests/test_firstrun_wizard.py
+++ b/src/leap/gui/tests/test_firstrun_wizard.py
@@ -94,7 +94,7 @@ class FirstRunWizardTestCase(qunittest.TestCase):
calls = [call("FirstRunWizardDone", True),
call("provider_domain", "testprovider"),
call("remember_user_and_pass", True),
- call("eip_username", "testuser@testprovider"),
+ call("username", "testuser@testprovider"),
call("testprovider_seed", RANDOMSTR)]
mqs().setValue.assert_has_calls(calls, any_order=True)