Skip to content

Commit 1b57801

Browse files
committed
fix: provide actor context to ws event
1 parent 9600823 commit 1b57801

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

src/backend/src/helpers.js

+1
Original file line numberDiff line numberDiff line change
@@ -1115,6 +1115,7 @@ async function jwt_auth(req){
11151115
}
11161116

11171117
return {
1118+
actor,
11181119
user: actor.type.user,
11191120
token: token,
11201121
};

src/backend/src/modules/web/WebServerService.js

+8-2
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ class WebServerService extends BaseService {
233233
try {
234234
let auth_res = await jwt_auth(socket);
235235
// successful auth
236+
socket.actor = auth_res.actor;
236237
socket.user = auth_res.user;
237238
socket.token = auth_res.token;
238239
// join user room
@@ -249,6 +250,7 @@ class WebServerService extends BaseService {
249250
}
250251
});
251252

253+
const context = Context.get();
252254
socketio.on('connection', (socket) => {
253255
/**
254256
* Starts the web server and associated services.
@@ -268,8 +270,12 @@ class WebServerService extends BaseService {
268270
});
269271
socket.on('puter_is_actually_open', async (msg) => {
270272
const svc_event = this.services.get('event');
271-
await svc_event.emit('web.socket.user-connected', {
272-
user: socket.user
273+
await context.sub({
274+
actor: socket.actor,
275+
}).arun(async () => {
276+
await svc_event.emit('web.socket.user-connected', {
277+
user: socket.user
278+
});
273279
});
274280
});
275281
});

0 commit comments

Comments
 (0)