Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🎨 Emit proper product name on socketio connection #5285

Merged
Merged
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
db23f5e
listen to wallet events in payment system
matusdrobuliak66 Nov 10, 2023
5fe1d79
Merge branch 'master' into is922/auto-recharge-emit-msg
matusdrobuliak66 Nov 10, 2023
bd38e85
fix test
matusdrobuliak66 Nov 10, 2023
d5ae4c4
Merge branch 'is922/auto-recharge-emit-msg' of github.com:matusdrobul…
matusdrobuliak66 Nov 10, 2023
caefaf1
fix tests
matusdrobuliak66 Nov 10, 2023
caf251d
Merge branch 'master' into is922/auto-recharge-emit-msg
matusdrobuliak66 Nov 10, 2023
ee3d0ff
Merge branch 'master' into is922/auto-recharge-emit-msg
matusdrobuliak66 Nov 12, 2023
1967ea4
review @sanderegg
matusdrobuliak66 Nov 12, 2023
ff86c8c
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Nov 13, 2023
99d879c
a
matusdrobuliak66 Nov 14, 2023
98238ef
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Nov 15, 2023
6348a64
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Nov 16, 2023
f91448a
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Nov 16, 2023
4511242
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Nov 17, 2023
7002724
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Nov 20, 2023
2e8a8c5
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Nov 22, 2023
861844a
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Nov 23, 2023
a856d44
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Nov 28, 2023
09e7c3e
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Nov 30, 2023
589f4e6
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Dec 1, 2023
64abe63
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Dec 4, 2023
b762a6b
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Dec 4, 2023
c900653
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Dec 5, 2023
73938a8
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Dec 5, 2023
f5351cf
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Dec 5, 2023
295b3e4
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Dec 5, 2023
49d5a4e
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Dec 6, 2023
0fe74c3
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Dec 7, 2023
776c18c
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Dec 8, 2023
39c0720
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Dec 11, 2023
ce5965b
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Dec 12, 2023
9cdb81a
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Dec 12, 2023
6261cf9
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Dec 13, 2023
149a31d
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Dec 14, 2023
cf33f09
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Dec 19, 2023
e034076
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Dec 21, 2023
702e008
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Dec 21, 2023
a413ee4
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Dec 22, 2023
ee24f3c
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Dec 22, 2023
be6c0e3
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Jan 8, 2024
a8d17cf
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Jan 9, 2024
9752187
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Jan 11, 2024
aa7feb0
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Jan 14, 2024
0fd4c0c
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Jan 18, 2024
98a0f4c
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Jan 19, 2024
8116448
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Jan 23, 2024
33f0a1e
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Jan 25, 2024
8634e9e
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Jan 26, 2024
37f4746
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Jan 28, 2024
b79a252
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Jan 29, 2024
425c350
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Jan 29, 2024
feecf43
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Jan 30, 2024
5db7e70
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Jan 30, 2024
b814067
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
matusdrobuliak66 Jan 30, 2024
0b6a9c1
removing hardcoded product
matusdrobuliak66 Jan 30, 2024
b81b6b2
Merge branch 'master' into remove-hardcoded-product
matusdrobuliak66 Jan 31, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

from aiohttp import web
from models_library.api_schemas_webserver.socketio import SocketIORoomStr
from models_library.products import ProductName
from models_library.socketio import SocketMessageDict
from models_library.users import UserID
from servicelib.aiohttp.observer import emit
Expand All @@ -18,6 +19,7 @@

from ..groups.api import list_user_groups
from ..login.decorators import login_required
from ..products.api import Product, get_current_product
from ..resource_manager.user_sessions import managed_resource
from ._utils import EnvironDict, SocketID, get_socket_server, register_socketio_handler
from .messages import SOCKET_IO_HEARTBEAT_EVENT, send_messages
Expand All @@ -41,14 +43,15 @@

def auth_user_factory(socket_id: SocketID):
@login_required
async def _handler(request: web.Request) -> UserID:
async def _handler(request: web.Request) -> tuple[UserID, ProductName]:
"""
Raises:
web.HTTPUnauthorized: when the user is not recognized. Keeps the original request
"""
app = request.app
user_id = UserID(request.get(RQT_USERID_KEY, _ANONYMOUS_USER_ID))
client_session_id = request.query.get("client_session_id", None)
product: Product = get_current_product(request)

_logger.debug(
"client %s,%s authenticated", f"{user_id=}", f"{client_session_id=}"
Expand Down Expand Up @@ -76,7 +79,7 @@ async def _handler(request: web.Request) -> UserID:
)
await resource_registry.set_socket_id(socket_id)

return user_id
return user_id, product.name

return _handler

Expand Down Expand Up @@ -121,7 +124,7 @@ async def connect(

try:
auth_user_handler = auth_user_factory(socket_id)
user_id = await auth_user_handler(environ["aiohttp.request"])
user_id, product_name = await auth_user_handler(environ["aiohttp.request"])

await _set_user_in_group_rooms(app, user_id, socket_id)

Expand All @@ -132,7 +135,7 @@ async def connect(
"SIGNAL_USER_CONNECTED",
user_id,
app,
"s4l", # NOTE: will be changed after https://github.com/ITISFoundation/osparc-simcore/issues/4776
product_name,
)

heart_beat_messages: list[SocketMessageDict] = [
Expand Down
Loading