[public-api] Implement experimental TeamsService

Author: easyCZ

components/dashboard/package.json

@@ -4,7 +4,9 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
+    "@bufbuild/connect-web": "^0.2.1",
     "@gitpod/gitpod-protocol": "0.1.5",
+    "@gitpod/public-api": "0.1.5",
     "@stripe/react-stripe-js": "^1.7.2",
     "@stripe/stripe-js": "^1.29.0",
     "configcat-js": "^6.0.0",

components/dashboard/src/projects/NewProject.tsx

@@ -21,6 +21,7 @@ import { trackEvent } from "../Analytics";
 import exclamation from "../images/exclamation.svg";
 import ErrorMessage from "../components/ErrorMessage";
 import Spinner from "../icons/Spinner.svg";
+import { teamsService } from "../service/public-api";
 
 export default function NewProject() {
     const location = useLocation();
@@ -729,6 +730,26 @@ function NewTeam(props: { onSuccess: (team: Team) => void }) {
         if (!teamName) {
             return;
         }
+
+        try {
+            const response = await teamsService.createTeam({
+                name: teamName,
+            });
+            const team = response.team;
+            setTeams(await getGitpodService().server.getTeams());
+
+            const mappedTeam: Team = {
+                id: team?.id || "",
+                name: team?.name || "",
+                slug: team?.slug || "",
+                creationTime: "",
+            };
+            props.onSuccess(mappedTeam);
+            return;
+        } catch (error) {
+            console.error(error);
+        }
+
         try {
             const team = await getGitpodService().server.createTeam(teamName);
             setTeams(await getGitpodService().server.getTeams());

components/dashboard/src/service/public-api.ts

@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2022 Gitpod GmbH. All rights reserved.
+ * Licensed under the GNU Affero General Public License (AGPL).
+ * See License-AGPL.txt in the project root for license information.
+ */
+
+import { createConnectTransport, createPromiseClient, Interceptor } from "@bufbuild/connect-web";
+
+// Import service definition that you want to connect to.
+import { TeamService } from "@gitpod/public-api/lib/gitpod/experimental/v1/teams_connectweb";
+import { getGitpodService } from "./service";
+
+let token: string | undefined;
+
+const authInterceptor: Interceptor = (next) => async (req) => {
+    if (!token) {
+        const newToken = await getGitpodService().server.generateNewGitpodToken({
+            type: 1,
+            scopes: [
+                "function:getGitpodTokenScopes",
+                "function:getWorkspace",
+                "function:getWorkspaces",
+                "function:listenForWorkspaceInstanceUpdates",
+                "resource:default",
+            ],
+        });
+        token = newToken;
+    }
+
+    req.header.set("Authorization", `Bearer ${token}`);
+    return await next(req);
+};
+
+const transport = createConnectTransport({
+    baseUrl: `${window.location.protocol}api.${window.location.host}`,
+    interceptors: [authInterceptor],
+});
+
+export const teamsService = createPromiseClient(TeamService, transport);

components/gitpod-protocol/go/gitpod-service.go

@@ -81,6 +81,9 @@ type APIInterface interface {
 	TrackEvent(ctx context.Context, event *RemoteTrackMessage) (err error)
 	GetSupportedWorkspaceClasses(ctx context.Context) (res []*SupportedWorkspaceClass, err error)
 
+	CreateTeam(ctx context.Context, params *CreateTeamParams) (*Team, error)
+	GetTeamMembers(ctx context.Context, params *GetTeamMembersParams) ([]*TeamMemberInfo, error)
+
 	InstanceUpdates(ctx context.Context, instanceID string) (<-chan *WorkspaceInstance, error)
 }
 
@@ -1379,6 +1382,30 @@ func (gp *APIoverJSONRPC) GetSupportedWorkspaceClasses(ctx context.Context) (res
 	return
 }
 
+func (gp *APIoverJSONRPC) CreateTeam(ctx context.Context, params *CreateTeamParams) (res *Team, err error) {
+	if gp == nil {
+		err = errNotConnected
+		return
+	}
+	var _params []interface{}
+
+	_params = append(_params, params)
+	err = gp.C.Call(ctx, "createTeam", _params, &res)
+	return
+}
+
+func (gp *APIoverJSONRPC) GetTeamMembers(ctx context.Context, params *GetTeamMembersParams) (res []*TeamMemberInfo, err error) {
+	if gp == nil {
+		err = errNotConnected
+		return
+	}
+	var _params []interface{}
+
+	_params = append(_params, params)
+	err = gp.C.Call(ctx, "getTeamMembers", _params, &res)
+	return
+}
+
 // PermissionName is the name of a permission
 type PermissionName string
 
@@ -2071,3 +2098,34 @@ type UserMessage struct {
 	Title string `json:"title,omitempty"`
 	URL   string `json:"url,omitempty"`
 }
+
+type CreateTeamParams struct {
+	Name string `json:"name,omitempty"`
+}
+
+type Team struct {
+	ID           string `json:"id,omitempty"`
+	Name         string `json:"name,omitempty"`
+	Slug         string `json:"slug,omitempty"`
+	CreationTime string `json:"creationTime,omitempty"`
+}
+
+type GetTeamMembersParams struct {
+	TeamID string `json:"teamId,omitempty"`
+}
+
+type TeamMemberRole string
+
+const (
+	TeamMember_Owner  TeamMemberRole = "owner"
+	TeamMember_Member TeamMemberRole = "member"
+)
+
+type TeamMemberInfo struct {
+	UserId       string         `json:"userId,omitempty"`
+	FullName     string         `json:"fullName,omitempty"`
+	PrimaryEmail string         `json:"primaryEmail,omitempty"`
+	AvatarUrl    string         `json:"avatarUrl,omitempty"`
+	Role         TeamMemberRole `json:"role,omitempty"`
+	MemberSince  string         `json:"memberSince,omitempty"`
+}

components/gitpod-protocol/go/mock.go

@@ -0,0 +1,61 @@
+// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
+// Licensed under the GNU Affero General Public License (AGPL).
+// See License-AGPL.txt in the project root for license information.
+
+package apiv1
+
+import (
+	"context"
+	"fmt"
+
+	connect "github.com/bufbuild/connect-go"
+	"github.com/gitpod-io/gitpod/common-go/log"
+	protocol "github.com/gitpod-io/gitpod/gitpod-protocol"
+	"github.com/gitpod-io/gitpod/public-api-server/pkg/auth"
+	"github.com/gitpod-io/gitpod/public-api-server/pkg/proxy"
+	v1 "github.com/gitpod-io/gitpod/public-api/experimental/v1"
+	"github.com/gitpod-io/gitpod/public-api/experimental/v1/v1connect"
+)
+
+func NewTeamsService(pool proxy.ServerConnectionPool) *TeamService {
+	return &TeamService{
+		connectionPool: pool,
+	}
+}
+
+var _ v1connect.TeamServiceHandler = (*TeamService)(nil)
+
+type TeamService struct {
+	connectionPool proxy.ServerConnectionPool
+
+	v1connect.UnimplementedTeamServiceHandler
+}
+
+func (s *TeamService) CreateTeam(ctx context.Context, req *connect.Request[v1.CreateTeamRequest]) (*connect.Response[v1.CreateTeamResponse], error) {
+	token := auth.TokenFromContext(ctx)
+
+	if req.Msg.GetName() == "" {
+		return nil, connect.NewError(connect.CodeInvalidArgument, fmt.Errorf("Name is a required argument when creating a team."))
+	}
+
+	server, err := s.connectionPool.Get(ctx, token)
+	if err != nil {
+		log.Log.WithError(err).Error("Failed to get connection to server.")
+		return nil, connect.NewError(connect.CodeInternal, err)
+	}
+
+	team, err := server.CreateTeam(ctx, &protocol.CreateTeamParams{
+		Name: req.Msg.GetName(),
+	})
+	if err != nil {
+		return nil, proxy.ConvertError(err)
+	}
+
+	return connect.NewResponse(&v1.CreateTeamResponse{
+		Team: &v1.Team{
+			Id:   team.ID,
+			Name: team.Name,
+			Slug: team.Slug,
+		},
+	}), nil
+}

components/public-api-server/pkg/apiv1/team.go

@@ -99,6 +99,9 @@ func register(srv *baseserver.Server, connPool proxy.ServerConnectionPool) error
 	workspacesRoute, workspacesServiceHandler := v1connect.NewWorkspacesServiceHandler(apiv1.NewWorkspaceService(connPool), handlerOptions...)
 	srv.HTTPMux().Handle(workspacesRoute, workspacesServiceHandler)
 
+	teamsRoute, teamsServiceHandler := v1connect.NewTeamServiceHandler(apiv1.NewTeamsService(connPool), handlerOptions...)
+	srv.HTTPMux().Handle(teamsRoute, teamsServiceHandler)
+
 	return nil
 }