Skip to content

Commit 5236a5c

Browse files
committed
fix(azure-devops): ignore REST refusals from a previous account
1 parent b29525e commit 5236a5c

2 files changed

Lines changed: 47 additions & 3 deletions

File tree

‎packages/source-control-azure-devops/src/server/AzureDevOpsRest.test.ts‎

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { assert, expect, it, vi } from "@effect/vitest";
22
import * as DateTime from "effect/DateTime";
3+
import * as Deferred from "effect/Deferred";
34
import * as Effect from "effect/Effect";
45
import * as FileSystem from "effect/FileSystem";
56
import * as Fiber from "effect/Fiber";
@@ -32,7 +33,9 @@ const SIGNED_IN = DateTime.toDateUtc(DateTime.makeUnsafe(1_000));
3233
const SWITCHED = DateTime.toDateUtc(DateTime.makeUnsafe(2_000));
3334

3435
function setup(input: {
35-
readonly respond: (request: HttpClientRequest.HttpClientRequest) => Response;
36+
readonly respond: (
37+
request: HttpClientRequest.HttpClientRequest,
38+
) => Response | Effect.Effect<Response>;
3639
readonly issue?: () => Effect.Effect<string, VcsProcessExitError>;
3740
readonly profile?: { mtime: Date };
3841
}) {
@@ -42,7 +45,12 @@ function setup(input: {
4245
),
4346
);
4447
const execute = vi.fn((request: HttpClientRequest.HttpClientRequest) =>
45-
Effect.succeed(HttpClientResponse.fromWeb(request, input.respond(request))),
48+
Effect.suspend(() => {
49+
const response = input.respond(request);
50+
return (Effect.isEffect(response) ? response : Effect.succeed(response)).pipe(
51+
Effect.map((response) => HttpClientResponse.fromWeb(request, response)),
52+
);
53+
}),
4654
);
4755
const layer = AzureDevOpsRest.layer.pipe(
4856
Layer.provide(TestSourceControlHost.layer({ process: { run } })),
@@ -203,3 +211,34 @@ it.effect("asks az for a token again after the az login account changes", () =>
203211
expect(run).toHaveBeenCalledTimes(2);
204212
}).pipe(Effect.provide(layer));
205213
});
214+
215+
it.effect("ignores a delayed refusal from the previous az login account", () =>
216+
Effect.gen(function* () {
217+
const started = yield* Deferred.make<void>();
218+
const release = yield* Deferred.make<Response>();
219+
const profile = { mtime: SIGNED_IN };
220+
const { run, execute, layer, read } = setup({
221+
profile,
222+
issue: () => Effect.sync(() => tokenJson(profile.mtime === SIGNED_IN ? "old" : "new", 3600)),
223+
respond: (request) =>
224+
request.headers.authorization === "Bearer old"
225+
? Deferred.succeed(started, undefined).pipe(Effect.andThen(Deferred.await(release)))
226+
: ok({ value: [] }),
227+
});
228+
yield* Effect.gen(function* () {
229+
const previousAccount = yield* Effect.forkChild(read(ACME));
230+
yield* Deferred.await(started);
231+
profile.mtime = SWITCHED;
232+
assert.isTrue(Option.isSome(yield* read(GLOBEX)));
233+
yield* Deferred.succeed(release, new Response(null, { status: 401 }));
234+
assert.isTrue(Option.isNone(yield* Fiber.join(previousAccount)));
235+
assert.isTrue(Option.isSome(yield* read(ACME)));
236+
expect(run).toHaveBeenCalledTimes(2);
237+
expect(execute.mock.calls.map(([request]) => request.headers.authorization)).toEqual([
238+
"Bearer old",
239+
"Bearer new",
240+
"Bearer new",
241+
]);
242+
}).pipe(Effect.provide(layer));
243+
}),
244+
);

‎packages/source-control-azure-devops/src/server/AzureDevOpsRest.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ const make = Effect.gen(function* () {
8181
"azureProfile.json",
8282
);
8383
let profileVersion: number | null | undefined;
84+
let accountGeneration = 0;
8485

8586
// `az login` and `az account set` rewrite the profile. Whatever the old account was given or
8687
// refused no longer applies, so the next read asks az again.
@@ -89,6 +90,7 @@ const make = Effect.gen(function* () {
8990
Effect.orElseSucceed(() => null),
9091
Effect.map((version) => {
9192
if (profileVersion !== undefined && version !== profileVersion) {
93+
accountGeneration += 1;
9294
held = null;
9395
tokenRetryAt = 0;
9496
refusedUntil.clear();
@@ -148,6 +150,7 @@ const make = Effect.gen(function* () {
148150
if (url === null || !isAzureDevOpsServicesUrl(url)) return Option.none();
149151
const organization = organizationKey(url);
150152
yield* tokenLock.withPermit(followAccount);
153+
const generation = accountGeneration;
151154
const now = yield* Clock.currentTimeMillis;
152155
if ((refusedUntil.get(organization) ?? 0) > now) return Option.none();
153156

@@ -170,7 +173,9 @@ const make = Effect.gen(function* () {
170173
) {
171174
return Clock.currentTimeMillis.pipe(
172175
Effect.map((at) => {
173-
refusedUntil.set(organization, at + ORGANIZATION_RETRY_MS);
176+
if (generation === accountGeneration) {
177+
refusedUntil.set(organization, at + ORGANIZATION_RETRY_MS);
178+
}
174179
return Option.none<string>();
175180
}),
176181
);

0 commit comments

Comments
 (0)