Get the user from the host-binary

Signed-off-by: David Gageot <[email protected]>

Author: dgageot

src/extension/host-binary/cmd/commands/currentuser.go

@@ -0,0 +1,25 @@
+package commands
+
+import (
+	"context"
+	"fmt"
+	"os/user"
+
+	"github.com/spf13/cobra"
+)
+
+func CurrentUser(ctx context.Context) *cobra.Command {
+	return &cobra.Command{
+		Use:   "current-user",
+		Short: "Get the current user",
+		Args:  cobra.NoArgs,
+		RunE: func(*cobra.Command, []string) error {
+			user, err := user.Current()
+			if err != nil {
+				return err
+			}
+			fmt.Print(user.Username)
+			return nil
+		},
+	}
+}

src/extension/host-binary/cmd/main.go

@@ -4,14 +4,16 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/docker/labs-ai-tools-for-devs/pkg/client"
-	secretsapi "github.com/docker/labs-ai-tools-for-devs/pkg/generated/go/client/secrets"
-	"github.com/docker/labs-ai-tools-for-devs/pkg/paths"
-	"github.com/spf13/cobra"
 	"os"
 	"os/signal"
 	"slices"
 	"syscall"
+
+	"github.com/docker/labs-ai-tools-for-devs/cmd/commands"
+	"github.com/docker/labs-ai-tools-for-devs/pkg/client"
+	secretsapi "github.com/docker/labs-ai-tools-for-devs/pkg/generated/go/client/secrets"
+	"github.com/docker/labs-ai-tools-for-devs/pkg/paths"
+	"github.com/spf13/cobra"
 )
 
 func main() {
@@ -25,6 +27,7 @@ func main() {
 	cmd.AddCommand(UnauthorizeApp(ctx))
 	cmd.AddCommand(ListOAuthApps(ctx))
 	cmd.AddCommand(DeriveSecret(ctx))
+	cmd.AddCommand(commands.CurrentUser(ctx))
 	if err := cmd.Execute(); err != nil {
 		fmt.Println(err)
 		os.Exit(1)

src/extension/ui/src/utils/Files.ts

@@ -36,32 +36,18 @@ let user: string | null = null;
 
 export const getUser = async (client: v1.DockerDesktopClient) => {
   if (user == null) {
-    if (client.host.platform === "win32") {
-      const result = await tryRunImageSync(client, [
-        "--rm",
-        "--network=none",
-        "-e",
-        "USERNAME",
-        BUSYBOX,
-        "/bin/sh",
-        "-c",
-        `\"echo $USERNAME\"`,
-      ]);
-      user = result.trim();
-    } else {
-      const result = await tryRunImageSync(client, [
-        "--rm",
-        "--network=none",
-        "-e",
-        "USER",
-        BUSYBOX,
-        "/bin/sh",
-        "-c",
-        `'echo $USER'`,
-      ]);
-      user = result.trim();
-    }
+    try {
+      const result = await client.extension.host?.cli.exec("host-binary", ["current-user"]);
+      if (result) {
+        user = result.stdout.trim();
+        return user;
+      }
+    } catch { }
+
+    client.desktopUI.toast.error("Unable to get current user");
+    return ""
   }
+
   return user;
 };