feat(oauth): wire up api

Author: joe0BAB

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

@@ -4,13 +4,13 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"os"
-	"os/signal"
-	"syscall"
-	secretsapi "github.com/docker/labs-ai-tools-for-devs/pkg/generated/go/client/secrets"
 	"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"
+	"syscall"
 )
 
 func main() {
@@ -45,6 +45,14 @@ func newApiClient() (client.ApiClient, error) {
 	return client.NewApiClient(p), nil
 }
 
+func newOAuthApiClient() (client.OAuthApiClient, error) {
+	p, err := paths.GetToolsApiSocketPath()
+	if err != nil {
+		return nil, err
+	}
+	return client.NewOAuthApiClient(p), nil
+}
+
 type addOptions struct {
 	Name  string
 	Value string
@@ -87,7 +95,7 @@ func ListSecrets(ctx context.Context) *cobra.Command {
 func DeleteSecret(ctx context.Context) *cobra.Command {
 	opts := &deleteOptions{}
 	cmd := &cobra.Command{
-		Use:   "delete",	
+		Use:   "delete",
 		Short: "Delete a secret",
 		Args:  cobra.NoArgs,
 		RunE: func(*cobra.Command, []string) error {

src/extension/host-binary/pkg/client/client.go

@@ -36,12 +36,6 @@ func NewApiClient(socketPath string) ApiClient {
 	}
 }
 
-type Secret struct {
-	Name  string
-	Value string
-	Policies []string
-}
-
 func (d apiClientImpl) SetSecret(ctx context.Context, s secretsapi.Secret) error {
 	apiReq := d.SecretsApi.SetJfsSecret(ctx)
 	req := secretsapi.NewSecret(s.Name, s.Value, s.Policies)

src/extension/host-binary/pkg/client/conn.go

@@ -3,6 +3,7 @@ package client
 import (
 	"context"
 	"github.com/docker/labs-ai-tools-for-devs/pkg/generated/go/client/secrets"
+	oauthapi "github.com/docker/labs-ai-tools-for-devs/pkg/generated/go/client/tools"
 	"net"
 	"net/http"
 )
@@ -25,3 +26,17 @@ func GetConfiguration(addr string) *secretsapi.Configuration {
 	}
 	return cfg
 }
+
+func GetOAuthConfiguration(addr string) *oauthapi.Configuration {
+	cfg := oauthapi.NewConfiguration()
+	cfg.Scheme = HTTPProtocol
+	cfg.Host = DummyHost
+	cfg.HTTPClient = &http.Client{
+		Transport: &http.Transport{
+			DialContext: func(_ context.Context, _, _ string) (net.Conn, error) {
+				return DialSocket(addr)
+			},
+		},
+	}
+	return cfg
+}

src/extension/host-binary/pkg/client/oauth.go

@@ -0,0 +1,97 @@
+package client
+
+import (
+	"context"
+	oauthapi "github.com/docker/labs-ai-tools-for-devs/pkg/generated/go/client/tools"
+)
+
+type OAuthApiClient interface {
+	// DeleteOAuthApp Unauthorizes an app.
+	DeleteOAuthApp(ctx context.Context, app string) error
+	// DeleteOAuthAppTool Remove a tool from an app.
+	DeleteOAuthAppTool(ctx context.Context, app, tool string) error
+	// GetOAuthApp Returns an app object.
+	GetOAuthApp(ctx context.Context, app string) (oauthapi.OAuthApp, error)
+	// ListOAuthApps Lists all app objects.
+	ListOAuthApps(ctx context.Context) ([]oauthapi.OAuthApp, error)
+	// PostOAuthApp Authorize an app.
+	PostOAuthApp(ctx context.Context, app, scopes string) (oauthapi.AuthResponse, error)
+	// PostOAuthAppTool Add a tool to an app.
+	PostOAuthAppTool(ctx context.Context, app, tool string) error
+}
+
+var _ OAuthApiClient = &oauthApiClientImpl{}
+
+type oauthApiClientImpl struct {
+	*oauthapi.APIClient
+}
+
+func NewOAuthApiClient(socketPath string) OAuthApiClient {
+	return &oauthApiClientImpl{
+		APIClient: oauthapi.NewAPIClient(GetOAuthConfiguration(socketPath)),
+	}
+}
+
+func (o oauthApiClientImpl) DeleteOAuthApp(ctx context.Context, app string) error {
+	apiReq := o.ToolsApi.DeleteOAuthApp(ctx, app)
+	_, err := apiReq.Execute()
+	return err
+}
+
+func (o oauthApiClientImpl) DeleteOAuthAppTool(ctx context.Context, app, tool string) error {
+	apiReq := o.ToolsApi.DeleteOAuthAppTool(ctx, app, tool)
+	_, err := apiReq.Execute()
+	return err
+}
+
+func (o oauthApiClientImpl) GetOAuthApp(ctx context.Context, app string) (oauthapi.OAuthApp, error) {
+	apiReq := o.ToolsApi.GetOAuthApp(ctx, app)
+	res, _, err := apiReq.Execute()
+	if err != nil {
+		return oauthapi.OAuthApp{}, err
+	}
+	return *res, nil
+}
+
+func (o oauthApiClientImpl) ListOAuthApps(ctx context.Context) ([]oauthapi.OAuthApp, error) {
+	apiReq := o.ToolsApi.ListOAuthApps(ctx)
+	res, _, err := apiReq.Execute()
+	if err != nil {
+		return nil, err
+	}
+	return res, nil
+}
+
+func (o oauthApiClientImpl) PostOAuthApp(ctx context.Context, app, scopes string) (oauthapi.AuthResponse, error) {
+	apiReq := o.ToolsApi.PostOAuthApp(ctx, app)
+	res, _, err := apiReq.Scopes(scopes).Execute()
+	if err != nil {
+		return oauthapi.AuthResponse{}, err
+	}
+	return *res, nil
+}
+
+func (o oauthApiClientImpl) PostOAuthAppTool(ctx context.Context, app, tool string) error {
+	apiReq := o.ToolsApi.PostOAuthAppTool(ctx, app, tool)
+	_, err := apiReq.Execute()
+	return err
+}
+
+type OAuthApp struct {
+	App        string        `json:"app"`
+	Authorized bool          `json:"authorized"`
+	Provider   string        `json:"provider"`
+	Scopes     []OAuthScopes `json:"scopes,omitempty"`
+	Tools      []string      `json:"tools"`
+}
+
+type OAuthScopes struct {
+	Description string   `json:"description,omitempty"`
+	Metadata    []string `json:"metadata,omitempty"`
+	Name        string   `json:"name,omitempty"`
+}
+
+type AuthResponse struct {
+	AuthType   string `json:"authType,omitempty"`
+	BrowserUrl string `json:"browserUrl,omitempty"`
+}

src/extension/host-binary/pkg/paths/paths_unix.go

@@ -11,3 +11,11 @@ func GetSecretsApiSocketPath() (string, error) {
 	}
 	return filepath.Join(dir, "jfs.sock"), nil
 }
+
+func GetToolsApiSocketPath() (string, error) {
+	dir, err := dockerDesktopSocketDir()
+	if err != nil {
+		return "", err
+	}
+	return filepath.Join(dir, "tools.sock"), nil
+}

src/extension/host-binary/pkg/paths/paths_windows.go

@@ -5,3 +5,7 @@ package paths
 func GetSecretsApiSocketPath() (string, error) {
 	return `//./pipe/dockerJfs`, nil
 }
+
+func GetSecretsApiSocketPath() (string, error) {
+	return `//./pipe/dockerTools`, nil
+}