Merge remote-tracking branch 'origin/server_instance' into server_instance
This commit is contained in:
commit
8759a5cea3
|
@ -14,10 +14,9 @@ from hub.imports.db_factory import DBFactory
|
|||
class Config:
|
||||
|
||||
def __init__(self):
|
||||
dotenv_path = "{}/.env".format(os.path.expanduser('~'))
|
||||
dotenv_path = "{}".format(os.path.expanduser('~'))
|
||||
if platform.system() == 'Linux':
|
||||
dotenv_path = Path('/.local/etc/hub_api/.env').resolve()
|
||||
|
||||
dotenv_path = f'{dotenv_path}/.local/etc/hub_api/.env'
|
||||
environment = 'TEST'
|
||||
database_name = 'montreal_retrofit_test'
|
||||
|
||||
|
|
|
@ -25,7 +25,6 @@ class SessionStart(Resource, Config):
|
|||
application_uuid = request.headers.get('application-uuid', None)
|
||||
ip = request.remote_addr
|
||||
user_info = self.export_db_factory.user_login(name=username, password=password, application_uuid=application_uuid)
|
||||
print(user_info, username, password, application_uuid)
|
||||
if user_info:
|
||||
session_id = str(uuid.uuid4())
|
||||
token = str(uuid.uuid4())
|
||||
|
|
Loading…
Reference in New Issue
Block a user