Skip to content

Commit 0b9db79

Browse files
jeanp413jeanp413
committed
Fix
1 parent da74d6f commit 0b9db79

File tree

1 file changed

+29
-76
lines changed

1 file changed

+29
-76
lines changed

‎components/server/src/user/gitpod-token-service.spec.db.ts

Lines changed: 29 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ describe("GitpodTokenService", async () => {
2828
let stranger: User;
2929
let org: Organization;
3030

31-
const resourceAccessGuard = {
32-
async canAccess() {
33-
return true;
34-
},
35-
};
36-
3731
beforeEach(async () => {
3832
container = createTestContainer();
3933
Experiments.configureTestingClient({
@@ -72,110 +66,69 @@ describe("GitpodTokenService", async () => {
7266
});
7367

7468
it("should generate a new gitpod token", async () => {
75-
const resp1 = await gs.getGitpodTokens(member.id, member.id, resourceAccessGuard);
69+
const resp1 = await gs.getGitpodTokens(member.id, member.id);
7670
expect(resp1.length).to.equal(0);
7771

78-
await gs.generateNewGitpodToken(
79-
member.id,
80-
member.id,
81-
{ name: "token1", type: GitpodTokenType.API_AUTH_TOKEN },
82-
resourceAccessGuard,
83-
);
72+
await gs.generateNewGitpodToken(member.id, member.id, { name: "token1", type: GitpodTokenType.API_AUTH_TOKEN });
8473

85-
const resp2 = await gs.getGitpodTokens(member.id, member.id, resourceAccessGuard);
74+
const resp2 = await gs.getGitpodTokens(member.id, member.id);
8675
expect(resp2.length).to.equal(1);
8776

88-
await expectError(ErrorCodes.NOT_FOUND, gs.getGitpodTokens(stranger.id, member.id, resourceAccessGuard));
77+
await expectError(ErrorCodes.NOT_FOUND, gs.getGitpodTokens(stranger.id, member.id));
8978
await expectError(
9079
ErrorCodes.NOT_FOUND,
91-
gs.generateNewGitpodToken(
92-
stranger.id,
93-
member.id,
94-
{ name: "token2", type: GitpodTokenType.API_AUTH_TOKEN },
95-
resourceAccessGuard,
96-
),
80+
gs.generateNewGitpodToken(stranger.id, member.id, { name: "token2", type: GitpodTokenType.API_AUTH_TOKEN }),
9781
);
9882
});
9983

10084
it("should list gitpod tokens", async () => {
101-
await gs.generateNewGitpodToken(
102-
member.id,
103-
member.id,
104-
{ name: "token1", type: GitpodTokenType.API_AUTH_TOKEN },
105-
resourceAccessGuard,
106-
);
107-
await gs.generateNewGitpodToken(
108-
member.id,
109-
member.id,
110-
{ name: "token2", type: GitpodTokenType.API_AUTH_TOKEN },
111-
resourceAccessGuard,
112-
);
85+
await gs.generateNewGitpodToken(member.id, member.id, { name: "token1", type: GitpodTokenType.API_AUTH_TOKEN });
86+
await gs.generateNewGitpodToken(member.id, member.id, { name: "token2", type: GitpodTokenType.API_AUTH_TOKEN });
11387

114-
const tokens = await gs.getGitpodTokens(member.id, member.id, resourceAccessGuard);
88+
const tokens = await gs.getGitpodTokens(member.id, member.id);
11589
expect(tokens.length).to.equal(2);
11690
expect(tokens.some((t) => t.name === "token1")).to.be.true;
11791
expect(tokens.some((t) => t.name === "token2")).to.be.true;
11892

119-
await expectError(ErrorCodes.NOT_FOUND, gs.getGitpodTokens(stranger.id, member.id, resourceAccessGuard));
93+
await expectError(ErrorCodes.NOT_FOUND, gs.getGitpodTokens(stranger.id, member.id));
12094
});
12195

12296
it("should return gitpod token scopes", async () => {
123-
await gs.generateNewGitpodToken(
124-
member.id,
125-
member.id,
126-
{
127-
name: "token1",
128-
type: GitpodTokenType.API_AUTH_TOKEN,
129-
scopes: ["user:email", "read:user"],
130-
},
131-
resourceAccessGuard,
132-
);
97+
await gs.generateNewGitpodToken(member.id, member.id, {
98+
name: "token1",
99+
type: GitpodTokenType.API_AUTH_TOKEN,
100+
scopes: ["user:email", "read:user"],
101+
});
133102

134-
const tokens = await gs.getGitpodTokens(member.id, member.id, resourceAccessGuard);
103+
const tokens = await gs.getGitpodTokens(member.id, member.id);
135104
expect(tokens.length).to.equal(1);
136105

137-
const scopes = await gs.getGitpodTokenScopes(member.id, member.id, tokens[0].tokenHash, resourceAccessGuard);
106+
const scopes = await gs.getGitpodTokenScopes(member.id, member.id, tokens[0].tokenHash);
138107
expect(scopes.length).to.equal(2);
139108
expect(scopes.some((s) => s === "user:email")).to.be.true;
140109
expect(scopes.some((s) => s === "read:user")).to.be.true;
141110

142-
await expectError(
143-
ErrorCodes.NOT_FOUND,
144-
gs.getGitpodTokenScopes(stranger.id, member.id, tokens[0].tokenHash, resourceAccessGuard),
145-
);
111+
await expectError(ErrorCodes.NOT_FOUND, gs.getGitpodTokenScopes(stranger.id, member.id, tokens[0].tokenHash));
146112
});
147113

148114
it("should delete gitpod tokens", async () => {
149-
await gs.generateNewGitpodToken(
150-
member.id,
151-
member.id,
152-
{
153-
name: "token1",
154-
type: GitpodTokenType.API_AUTH_TOKEN,
155-
},
156-
resourceAccessGuard,
157-
);
158-
await gs.generateNewGitpodToken(
159-
member.id,
160-
member.id,
161-
{
162-
name: "token2",
163-
type: GitpodTokenType.API_AUTH_TOKEN,
164-
},
165-
resourceAccessGuard,
166-
);
115+
await gs.generateNewGitpodToken(member.id, member.id, {
116+
name: "token1",
117+
type: GitpodTokenType.API_AUTH_TOKEN,
118+
});
119+
await gs.generateNewGitpodToken(member.id, member.id, {
120+
name: "token2",
121+
type: GitpodTokenType.API_AUTH_TOKEN,
122+
});
167123

168-
const tokens = await gs.getGitpodTokens(member.id, member.id, resourceAccessGuard);
124+
const tokens = await gs.getGitpodTokens(member.id, member.id);
169125
expect(tokens.length).to.equal(2);
170126

171-
await gs.deleteGitpodToken(member.id, member.id, tokens[0].tokenHash, resourceAccessGuard);
127+
await gs.deleteGitpodToken(member.id, member.id, tokens[0].tokenHash);
172128

173-
const tokens2 = await gs.getGitpodTokens(member.id, member.id, resourceAccessGuard);
129+
const tokens2 = await gs.getGitpodTokens(member.id, member.id);
174130
expect(tokens2.length).to.equal(1);
175131

176-
await expectError(
177-
ErrorCodes.NOT_FOUND,
178-
gs.deleteGitpodToken(stranger.id, member.id, tokens[1].tokenHash, resourceAccessGuard),
179-
);
132+
await expectError(ErrorCodes.NOT_FOUND, gs.deleteGitpodToken(stranger.id, member.id, tokens[1].tokenHash));
180133
});
181134
});

0 commit comments

Comments
 (0)