Use join result username

Author: christianalfoni

src/Sandbox.ts

@@ -151,8 +151,6 @@ export class Sandbox {
       ? await this.createSession(customSession)
       : this.globalSession;
 
-    console.log("SESSION", session);
-
     const pitcherClient = await initPitcherClient(
       {
         appId: "sdk",
@@ -210,7 +208,10 @@ export class Sandbox {
     );
 
     return new WebSocketSession(pitcherClient, {
-      sessionId: customSession?.id,
+      username: customSession
+        ? // @ts-ignore
+          pitcherClient["joinResult"].client.username
+        : undefined,
       env: customSession?.env,
       hostToken: customSession?.hostToken,
     });

src/browser.ts

@@ -46,6 +46,10 @@ export async function connectToSandbox(options: {
   );
 
   return new WebSocketSession(pitcherClient, {
+    username: options.session.sessionId
+      ? // @ts-ignore
+        pitcherClient["joinResult"].client.username
+      : undefined,
     env: options.session.env,
     hostToken: options.session.hostToken,
   });

src/sessions/WebSocketSession/filesystem.ts

@@ -43,7 +43,7 @@ export class FileSystem {
   constructor(
     sessionDisposable: Disposable,
     private pitcherClient: IPitcherClient,
-    private sessionId?: string
+    private username?: string
   ) {
     sessionDisposable.onWillDispose(() => {
       this.disposable.dispose();
@@ -214,14 +214,11 @@ export class FileSystem {
       path,
       options,
       (event) => {
-        if (this.sessionId) {
+        if (this.username) {
           emitter.fire({
             ...event,
             paths: event.paths.map((path) =>
-              path.replace(
-                `home/csb-session-${this.sessionId}/workspace/`,
-                "sandbox/"
-              )
+              path.replace(`home/${this.username}/workspace/`, "sandbox/")
             ),
           });
         } else {

src/sessions/WebSocketSession/index.ts

@@ -78,11 +78,11 @@ export class WebSocketSession {
     {
       env,
       hostToken,
-      sessionId,
+      username,
     }: {
       env?: Record<string, string>;
       hostToken?: HostToken;
-      sessionId?: string;
+      username?: string;
     }
   ) {
     // TODO: Bring this back once metrics polling does not reset inactivity
@@ -92,7 +92,7 @@ export class WebSocketSession {
     // };
 
     // this.addDisposable(metricsDisposable);
-    this.fs = new FileSystem(this.disposable, this.pitcherClient, sessionId);
+    this.fs = new FileSystem(this.disposable, this.pitcherClient, username);
     this.terminals = new Terminals(this.disposable, this.pitcherClient, env);
     this.commands = new Commands(this.disposable, this.pitcherClient, env);