From ab450b7945025e9a52df51486b0970692d0f405b Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Wed, 28 Sep 2022 11:36:10 +0200 Subject: [PATCH] feat(chalice): session mobsUrl --- api/chalicelib/core/sessions.py | 1 + api/chalicelib/core/sessions_mobs.py | 20 ++++++++++++++++++++ ee/api/chalicelib/core/sessions.py | 1 + 3 files changed, 22 insertions(+) diff --git a/api/chalicelib/core/sessions.py b/api/chalicelib/core/sessions.py index 4a27d0b13..5b43ddbd1 100644 --- a/api/chalicelib/core/sessions.py +++ b/api/chalicelib/core/sessions.py @@ -95,6 +95,7 @@ def get_by_id2_pg(project_id, session_id, user_id, full_data=False, include_fav_ data['userEvents'] = events.get_customs_by_sessionId2_pg(project_id=project_id, session_id=session_id) data['domURL'] = sessions_mobs.get_urls(session_id=session_id, project_id=project_id) + data['mobsUrl'] = sessions_mobs.get_urls_depercated(session_id=session_id) data['devtoolsURL'] = sessions_devtool.get_urls(session_id=session_id, project_id=project_id) data['resources'] = resources.get_by_session_id(session_id=session_id, project_id=project_id, start_ts=data["startTs"], duration=data["duration"]) diff --git a/api/chalicelib/core/sessions_mobs.py b/api/chalicelib/core/sessions_mobs.py index 1107ee6d4..53385f6a6 100644 --- a/api/chalicelib/core/sessions_mobs.py +++ b/api/chalicelib/core/sessions_mobs.py @@ -26,6 +26,26 @@ def get_urls(project_id, session_id): return results +def get_urls_depercated(sessionId): + return [ + client.generate_presigned_url( + 'get_object', + Params={ + 'Bucket': config("sessions_bucket"), + 'Key': str(sessionId) + }, + ExpiresIn=100000 + ), + client.generate_presigned_url( + 'get_object', + Params={ + 'Bucket': config("sessions_bucket"), + 'Key': str(sessionId) + "e" + }, + ExpiresIn=100000 + )] + + def get_ios(session_id): return client.generate_presigned_url( 'get_object', diff --git a/ee/api/chalicelib/core/sessions.py b/ee/api/chalicelib/core/sessions.py index 92c6e8f74..0c908c500 100644 --- a/ee/api/chalicelib/core/sessions.py +++ b/ee/api/chalicelib/core/sessions.py @@ -96,6 +96,7 @@ def get_by_id2_pg(project_id, session_id, user_id, context: schemas_ee.CurrentCo data['userEvents'] = events.get_customs_by_sessionId2_pg(project_id=project_id, session_id=session_id) data['domURL'] = sessions_mobs.get_urls(session_id=session_id, project_id=project_id) + data['mobsUrl'] = sessions_mobs.get_urls_depercated(session_id=session_id) data['devtoolsURL'] = sessions_devtool.get_urls(session_id=session_id, project_id=project_id, context=context) data['resources'] = resources.get_by_session_id(session_id=session_id, project_id=project_id,