Skip to content

Commit 56dd37a

Browse files
committed
[snapshot] addressed review feedback
1 parent ec54ff2 commit 56dd37a

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

components/ide/code/leeway.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN sudo apt-get update \
2828
&& sudo apt-get clean -y \
2929
&& rm -rf /var/lib/apt/lists/*
3030

31-
ENV GP_CODE_COMMIT d6e64cfbe48d4ca5a1fc082b62cbf1ffdb0d12c0
31+
ENV GP_CODE_COMMIT d21dba940267458b26e51febd68cc57a9097baef
3232
RUN mkdir gp-code \
3333
&& cd gp-code \
3434
&& git init \

components/server/src/auth/resource-access.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,13 @@ export namespace ScopedResourceGuard {
233233
case "gitpodToken":
234234
return resource.subject.tokenHash;
235235
case "snapshot":
236-
return resource.subject
237-
? resource.subject.id
238-
: (resource.workspaceID ? SNAPSHOT_WORKSPACE_SUBJECT_ID_PREFIX + resource.workspaceID : undefined);
236+
if (resource.subject) {
237+
return resource.subject.id;
238+
}
239+
if (resource.workspaceID) {
240+
return SNAPSHOT_WORKSPACE_SUBJECT_ID_PREFIX + resource.workspaceID;
241+
}
242+
return undefined;
239243
case "token":
240244
return resource.subject.value;
241245
case "user":

0 commit comments

Comments
 (0)