Skip to content

Commit 4e069a6

Browse files
committed
Cath getTeams error response
1 parent 736db6f commit 4e069a6

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

gitpod-shared/src/features.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import { ILogService } from './logService';
2424
import { isGRPCErrorStatus } from './common/utils';
2525
import { GitpodConnection, GitpodExtensionContext, SupervisorConnection } from './gitpodContext';
2626
import { ExperimentalSettings } from './experiments';
27+
import { Team } from '@gitpod/gitpod-protocol';
2728

2829
export async function createGitpodExtensionContext(context: vscode.ExtensionContext): Promise<GitpodExtensionContext | undefined> {
2930
const logger = vscode.window.createOutputChannel('Gitpod Workspace', { log: true });
@@ -98,7 +99,10 @@ export async function createGitpodExtensionContext(context: vscode.ExtensionCont
9899
const ipcHookCli = installCLIProxy(context, logger);
99100

100101
const pendingGetOwner = gitpodService.server.getLoggedInUser();
101-
const pendingGetUserTeams = gitpodService.server.getTeams();
102+
const pendingGetUserTeams = gitpodService.server.getTeams().catch(() => {
103+
// Collaborator role doesn't have permission
104+
return [] as Team[];
105+
});
102106
const experiments = new ExperimentalSettings('gitpod', context, logger, gitpodHost, pendingGetOwner, pendingGetUserTeams);
103107
context.subscriptions.push(experiments);
104108

@@ -114,7 +118,6 @@ export async function createGitpodExtensionContext(context: vscode.ExtensionCont
114118
workspaceInfo,
115119
pendingGetOwner,
116120
userId,
117-
pendingGetUserTeams,
118121
pendingInstanceListener,
119122
workspaceOwned,
120123
logger,

gitpod-shared/src/gitpodContext.ts

-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import { GitpodClient, GitpodServer, GitpodServiceImpl, WorkspaceInstanceUpdateListener } from '@gitpod/gitpod-protocol/lib/gitpod-service';
66
import { User } from '@gitpod/gitpod-protocol/lib/protocol';
7-
import { Team } from '@gitpod/gitpod-protocol/lib/teams-projects-protocol';
87
import { ControlServiceClient } from '@gitpod/supervisor-api-grpc/lib/control_grpc_pb';
98
import { ExposePortRequest } from '@gitpod/supervisor-api-grpc/lib/control_pb';
109
import { InfoServiceClient } from '@gitpod/supervisor-api-grpc/lib/info_grpc_pb';
@@ -209,7 +208,6 @@ export class GitpodExtensionContext implements vscode.ExtensionContext {
209208
readonly info: WorkspaceInfoResponse.AsObject,
210209
readonly owner: Promise<User>,
211210
readonly userId: string,
212-
readonly userTeams: Promise<Team[]>,
213211
readonly instanceListener: Promise<WorkspaceInstanceUpdateListener>,
214212
readonly workspaceOwned: boolean,
215213
readonly logger: ILogService,

gitpod-web/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"displayName": "%displayName%",
44
"description": "%description%",
55
"publisher": "gitpod",
6-
"version": "0.0.6",
6+
"version": "0.0.7",
77
"license": "MIT",
88
"icon": "resources/gitpod.png",
99
"repository": {

0 commit comments

Comments
 (0)