Fixes login ests

Author: Pedro Crespo

services/web/server/src/simcore_service_webserver/login/__init__.py

@@ -12,8 +12,9 @@
 from servicelib.application_keys import APP_CONFIG_KEY, APP_DB_POOL_KEY
 
 from ..db import DSN
-from ..email_config import CONFIG_SECTION_NAME as CONFIG_STMP_SECTION
+from ..email_config import CONFIG_SECTION_NAME as SMTP_SECTION
 from ..rest_config import APP_OPENAPI_SPECS_KEY
+from ..db_config import CONFIG_SECTION_NAME as DB_SECTION
 from .cfg import APP_LOGIN_CONFIG, cfg
 from .routes import create_routes
 from .storage import AsyncpgStorage
@@ -22,7 +23,7 @@
 
 
 async def pg_pool(app: web.Application):
-    smtp_config = app[APP_CONFIG_KEY][CONFIG_STMP_SECTION]
+    smtp_config = app[APP_CONFIG_KEY][SMTP_SECTION]
     config = {"SMTP_{}".format(k.upper()): v for k, v in smtp_config.items()}
     #'SMTP_SENDER': None,
     #'SMTP_HOST': REQUIRED,
@@ -34,7 +35,7 @@ async def pg_pool(app: web.Application):
     config = (config or {}).copy()
     config['APP'] = app
 
-    db_config = app[APP_CONFIG_KEY]['postgres']
+    db_config = app[APP_CONFIG_KEY][DB_SECTION]['postgres']
     app[APP_DB_POOL_KEY] = await asyncpg.create_pool(dsn=DSN.format(**db_config), loop=app.loop)
 
     # FIXME: replace by CFG_LOGIN_STORAGE
@@ -48,7 +49,7 @@ def setup(app: web.Application):
     log.debug("Setting up %s ...", __name__)
 
     # TODO: requires rest ready!
-    assert CONFIG_STMP_SECTION in app[APP_CONFIG_KEY]
+    assert SMTP_SECTION in app[APP_CONFIG_KEY]
 
     # routes
     specs = app[APP_OPENAPI_SPECS_KEY]

services/web/server/tests/login/config.yaml

@@ -40,4 +40,4 @@ smtp:
   password: None
 rest:
   version: v0
-  location: api/specs/webserver/v0/openapi.yaml
+  location: ../../../../api/specs/webserver/v0/openapi.yaml

services/web/server/tests/login/conftest.py

@@ -40,7 +40,7 @@ def docker_compose_file(here, app_cfg):
     """
     old = os.environ.copy()
 
-    cfg = app_cfg["postgres"]
+    cfg = app_cfg["db"]["postgres"]
 
     # docker-compose reads these environs
     os.environ['TEST_POSTGRES_DB']=cfg['database']
@@ -56,7 +56,7 @@ def docker_compose_file(here, app_cfg):
 
 @pytest.fixture(scope='session')
 def postgres_service(docker_services, docker_ip, app_cfg):
-    cfg = app_cfg["postgres"]
+    cfg = app_cfg["db"]["postgres"]
     cfg['host'] = docker_ip
     cfg['port'] = docker_services.port_for('postgres', 5432)
 
@@ -79,7 +79,7 @@ def postgres_db(app_cfg, postgres_service): # NOTE: if postgres_services started
 
         In that case, comment postgres_service)
     """
-    cfg = app_cfg["postgres"]
+    cfg = app_cfg["db"]["postgres"]
     url = DSN.format(**cfg)
 
     # NOTE: Comment this to avoid postgres_service

services/web/server/tests/login/test_logout.py

@@ -1,4 +1,4 @@
-from simcore_service_webserver.login import get_storage
+from simcore_service_webserver.login.cfg import get_storage
 
 from utils_login import LoggedUser
 from utils_assert import assert_status

services/web/server/tests/login/test_registration.py

@@ -8,10 +8,9 @@
 
 from servicelib.rest_responses import unwrap_envelope
 from simcore_service_webserver.db_models import ConfirmationAction, UserStatus
-from simcore_service_webserver.login import get_storage
-from simcore_service_webserver.login.cfg import cfg # TODO: remove this by get_storage
-from utils_login import NewUser, parse_link
+from simcore_service_webserver.login.cfg import cfg, get_storage
 from utils_assert import assert_error, assert_status
+from utils_login import NewUser, parse_link
 
 EMAIL, PASSWORD = '[email protected]', 'password'
 

services/web/server/tests/login/utils_login.py

@@ -2,8 +2,7 @@
 from yarl import URL
 
 from simcore_service_webserver.db_models import UserRole, UserStatus
-from simcore_service_webserver.login import get_storage
-from simcore_service_webserver.login.cfg import cfg
+from simcore_service_webserver.login.cfg import cfg, get_storage
 from simcore_service_webserver.login.utils import (encrypt_password,
                                                    get_random_string)
 from utils_assert import assert_status