diff options
| -rw-r--r-- | service/pixelated/config/leap.py | 4 | ||||
| -rw-r--r-- | service/pixelated/register.py | 2 | ||||
| -rw-r--r-- | service/test/support/integration/app_test_client.py | 2 | ||||
| -rw-r--r-- | service/test/support/integration/multi_user_client.py | 3 | ||||
| -rw-r--r-- | service/test/unit/bitmask_libraries/test_smtp_client_certificate.py | 2 | ||||
| -rw-r--r-- | service/test/unit/test_authentication.py | 2 |
6 files changed, 6 insertions, 9 deletions
diff --git a/service/pixelated/config/leap.py b/service/pixelated/config/leap.py index e8814038..0c43fd85 100644 --- a/service/pixelated/config/leap.py +++ b/service/pixelated/config/leap.py @@ -1,10 +1,8 @@ from __future__ import absolute_import -from leap.bitmask.bonafide.provider import Api -from leap.bitmask.bonafide.session import Session from leap.common.events import (server as events_server) from pixelated.adapter.welcome_mail import add_welcome_mail -from pixelated.authentication import Authenticator, Credentials, Authentication +from pixelated.authentication import Authenticator from pixelated.bitmask_libraries.certs import LeapCertificate from pixelated.bitmask_libraries.provider import LeapProvider from pixelated.config import credentials diff --git a/service/pixelated/register.py b/service/pixelated/register.py index a91628e8..994842e9 100644 --- a/service/pixelated/register.py +++ b/service/pixelated/register.py @@ -25,7 +25,7 @@ from pixelated.bitmask_libraries.certs import LeapCertificate from pixelated.bitmask_libraries.provider import LeapProvider from pixelated.config import arguments from pixelated.config import logger as logger_config -from pixelated.config.leap import Authentication +from pixelated.authentication import Authentication from pixelated.config.sessions import LeapSessionFactory from twisted.internet.defer import inlineCallbacks from twisted.logger import Logger diff --git a/service/test/support/integration/app_test_client.py b/service/test/support/integration/app_test_client.py index 93dfd812..e4169584 100644 --- a/service/test/support/integration/app_test_client.py +++ b/service/test/support/integration/app_test_client.py @@ -21,7 +21,7 @@ import time import uuid import random -from pixelated.config.leap import Authentication +from pixelated.authentication import Authentication from tempdir import TempDir from mock import Mock diff --git a/service/test/support/integration/multi_user_client.py b/service/test/support/integration/multi_user_client.py index 28316d5b..79ab64c1 100644 --- a/service/test/support/integration/multi_user_client.py +++ b/service/test/support/integration/multi_user_client.py @@ -16,8 +16,7 @@ from leap.bitmask.bonafide._srp import SRPAuthError from mock import patch from mockito import mock, when, any as ANY -from pixelated.authentication import Authenticator -from pixelated.config.leap import Authentication +from pixelated.authentication import Authenticator, Authentication from twisted.internet import defer from pixelated.application import UserAgentMode, set_up_protected_resources diff --git a/service/test/unit/bitmask_libraries/test_smtp_client_certificate.py b/service/test/unit/bitmask_libraries/test_smtp_client_certificate.py index 346fd956..241dcbae 100644 --- a/service/test/unit/bitmask_libraries/test_smtp_client_certificate.py +++ b/service/test/unit/bitmask_libraries/test_smtp_client_certificate.py @@ -18,7 +18,7 @@ import unittest import tempdir import leap.common.certs as certs from mockito import mock, unstub, when, any as ANY -from pixelated.config.leap import Authentication +from pixelated.authentication import Authentication from pixelated.config.sessions import SmtpClientCertificate diff --git a/service/test/unit/test_authentication.py b/service/test/unit/test_authentication.py index b729e64f..90ef0a7c 100644 --- a/service/test/unit/test_authentication.py +++ b/service/test/unit/test_authentication.py @@ -8,7 +8,7 @@ from mock import patch, Mock from pixelated.authentication import Authenticator from pixelated.bitmask_libraries.provider import LeapProvider -from pixelated.config.leap import Authentication +from pixelated.authentication import Authentication PROVIDER_JSON = { "api_uri": "https://api.domain.org:4430", |