add jwt token back to wsl connections

Author: sawka

pkg/shellexec/shellexec.go

@@ -262,6 +262,10 @@ func StartWslShellProc(ctx context.Context, termSize waveobj.TermSize, cmdStr st
 		conn.Debugf(ctx, "packed swaptoken %s\n", packedToken)
 		cmdCombined = fmt.Sprintf(`%s=%s %s`, wavebase.WaveSwapTokenVarName, packedToken, cmdCombined)
 	}
+	jwtToken := cmdOpts.SwapToken.Env[wavebase.WaveJwtTokenVarName]
+	if jwtToken != "" {
+		cmdCombined = fmt.Sprintf(`%s=%s %s`, wavebase.WaveJwtTokenVarName, jwtToken, cmdCombined)
+	}
 	log.Printf("full combined command: %s", cmdCombined)
 	ecmd := exec.Command("wsl.exe", "~", "-d", client.Name(), "--", "sh", "-c", cmdCombined)
 	if termSize.Rows == 0 || termSize.Cols == 0 {

pkg/util/shellutil/tokenswap.go

@@ -20,7 +20,6 @@ type TokenSwapEntry struct {
 	Token      string             `json:"token"`
 	SockName   string             `json:"sockname,omitempty"`
 	RpcContext *wshrpc.RpcContext `json:"rpccontext,omitempty"`
-	JwtToken   string             `json:"jwttoken,omitempty"`
 	Env        map[string]string  `json:"env,omitempty"`
 	ScriptText string             `json:"scripttext,omitempty"`
 	Exp        time.Time          `json:"-"`