Skip to content

Commit a145386

Browse files
authored
Remove token refresh feature flags (#19768)
* [server] Drop feature flag opportunistic_token_refresh * [server] Drop feature flag workspace_start_scm_access_token_lifetime
1 parent ee3b5a7 commit a145386

File tree

3 files changed

+3
-28
lines changed

3 files changed

+3
-28
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ describe("TokenService", async () => {
6969
container = createTestContainer();
7070
Experiments.configureTestingClient({
7171
centralizedPermissions: true,
72-
opportunistic_token_refresh: true,
7372
});
7473

7574
// re-overwrite the stuff mocked out in createTestContainer

components/server/src/user/token-service.ts

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import {
1818
reportScmTokenRefreshRequest,
1919
scmTokenRefreshLatencyHistogram,
2020
} from "../prometheus-metrics";
21-
import { getExperimentsClientForBackend } from "@gitpod/gitpod-protocol/lib/experiments/configcat-server";
2221

2322
@injectable()
2423
export class TokenService implements TokenProvider {
@@ -94,9 +93,7 @@ export class TokenService implements TokenProvider {
9493
const { authProvider } = this.hostContextProvider.get(host)!;
9594
if (isValidUntil(token, requestedLifetimeDate)) {
9695
const doOpportunisticRefresh =
97-
(await isOpportunisticTokenRefreshEnabled(userId)) &&
98-
!!authProvider.requiresOpportunisticRefresh &&
99-
authProvider.requiresOpportunisticRefresh();
96+
!!authProvider.requiresOpportunisticRefresh && authProvider.requiresOpportunisticRefresh();
10097
if (!doOpportunisticRefresh) {
10198
// No opportunistic refresh? Update reserveation and we are done.
10299
await updateReservation(tokenEntry.uid, token, requestedLifetimeDate);
@@ -203,14 +200,6 @@ export class TokenService implements TokenProvider {
203200
}
204201
}
205202

206-
export async function isOpportunisticTokenRefreshEnabled(userId: string): Promise<boolean> {
207-
return getExperimentsClientForBackend().getValueAsync("opportunistic_token_refresh", false, {
208-
user: {
209-
id: userId,
210-
},
211-
});
212-
}
213-
214203
function nowPlusMins(mins: number): Date {
215204
const now = new Date();
216205
now.setTime(now.getTime() + mins * 60 * 1000);

components/server/src/workspace/workspace-starter.ts

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ export interface StartWorkspaceOptions extends Omit<GitpodServer.StartWorkspaceO
144144
const MAX_INSTANCE_START_RETRIES = 2;
145145
const INSTANCE_START_RETRY_INTERVAL_SECONDS = 2;
146146
/** [mins] */
147-
const SCM_TOKEN_LIFETIME_MINS = 10;
147+
const SCM_TOKEN_LIFETIME_MINS = 30;
148148

149149
export async function getWorkspaceClassForInstance(
150150
ctx: TraceContext,
@@ -1852,8 +1852,7 @@ export class WorkspaceStarter {
18521852
targetMode = CloneTargetMode.REMOTE_HEAD;
18531853
}
18541854

1855-
const tokenValidityPeriodMins = await getScmAccessTokenLifetimeMins(user);
1856-
const gitToken = await this.tokenProvider.getTokenForHost(user, host, tokenValidityPeriodMins);
1855+
const gitToken = await this.tokenProvider.getTokenForHost(user, host, SCM_TOKEN_LIFETIME_MINS);
18571856
if (!gitToken) {
18581857
throw new Error(`No token for host: ${host}`);
18591858
}
@@ -1979,18 +1978,6 @@ export async function isWorkspaceClassDiscoveryEnabled(user: { id: string }): Pr
19791978
});
19801979
}
19811980

1982-
export async function getScmAccessTokenLifetimeMins(user: { id: string }): Promise<number> {
1983-
const customValue = await getExperimentsClientForBackend().getValueAsync<number | undefined>(
1984-
"workspace_start_scm_access_token_lifetime",
1985-
undefined,
1986-
{
1987-
user: user,
1988-
},
1989-
);
1990-
1991-
return customValue || SCM_TOKEN_LIFETIME_MINS;
1992-
}
1993-
19941981
export class ScmStartError extends Error {
19951982
constructor(public readonly host: string, msg: string) {
19961983
super(`${host}: ` + msg);

0 commit comments

Comments
 (0)