mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-15 18:57:52 -06:00
Make login parametrized with a force_logout boolean
Instead of using a separate function to force logging out before login, login now has a boolean parameter that instructs it to logout before loging in again, if the user is alread logged in. It then starts the authorization with a force browser logout first. CURA-7427
This commit is contained in:
parent
898ca852f0
commit
eac4d3e463
3 changed files with 20 additions and 32 deletions
|
@ -19,35 +19,23 @@ def test_login():
|
|||
account = Account(MagicMock())
|
||||
mocked_auth_service = MagicMock()
|
||||
account._authorization_service = mocked_auth_service
|
||||
account.logout = MagicMock()
|
||||
|
||||
account.login()
|
||||
mocked_auth_service.startAuthorizationFlow.assert_called_once_with()
|
||||
mocked_auth_service.startAuthorizationFlow.assert_called_once_with(False)
|
||||
|
||||
# Fake a successful login
|
||||
account._onLoginStateChanged(True)
|
||||
|
||||
# Attempting to log in again shouldn't change anything.
|
||||
account.login()
|
||||
mocked_auth_service.startAuthorizationFlow.assert_called_once_with()
|
||||
mocked_auth_service.startAuthorizationFlow.assert_called_once_with(False)
|
||||
|
||||
|
||||
def test_loginWithForcedLogout():
|
||||
account = Account(MagicMock())
|
||||
mocked_auth_service = MagicMock()
|
||||
account._authorization_service = mocked_auth_service
|
||||
account.logout = MagicMock()
|
||||
|
||||
# Fake a successful login
|
||||
account._onLoginStateChanged(True)
|
||||
account.loginWithForcedLogout()
|
||||
# Make sure logout is called once
|
||||
account.logout.assert_called_once_with()
|
||||
mocked_auth_service.startAuthorizationFlow.assert_called_once_with(True)
|
||||
|
||||
account._onLoginStateChanged(False)
|
||||
account.loginWithForcedLogout()
|
||||
# If we are not logged in previously, logout shouldn't be called again
|
||||
# Attempting to log in with force_logout_before_login as True should call the logout before calling the
|
||||
# startAuthorizationFlow(True).
|
||||
account.login(force_logout_before_login=True)
|
||||
account.logout.assert_called_once_with()
|
||||
mocked_auth_service.startAuthorizationFlow.assert_called_with(True)
|
||||
assert mocked_auth_service.startAuthorizationFlow.call_count == 2
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue