Skip to content

refactor!: Remove legacy FGA package #1559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gjtorikian merged 2 commits into from
Apr 17, 2026
Merged

refactor!: Remove legacy FGA package #1559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afc3a0d
Remove legacy FGA package
atainter Apr 15, 2026
7c1b98b
Update http-client.ts
atainter Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 7 additions & 75 deletions src/common/net/fetch-client.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,73 +15,6 @@ describe('Fetch client', () => {
beforeEach(() => fetch.resetMocks());

describe('fetchRequestWithRetry', () => {
it('get for FGA path should call fetchRequestWithRetry and return response', async () => {
fetchOnce({ data: 'response' });
const mockFetchRequestWithRetry = jest.spyOn(
FetchHttpClient.prototype as any,
'fetchRequestWithRetry',
);

const response = await fetchClient.get('/fga/v1/resources', {});

expect(mockFetchRequestWithRetry).toHaveBeenCalledTimes(1);
expect(fetchURL()).toBe('https://test.workos.com/fga/v1/resources');
expect(await response.toJSON()).toEqual({ data: 'response' });
});

it('post for FGA path should call fetchRequestWithRetry and return response', async () => {
fetchOnce({ data: 'response' });
const mockFetchRequestWithRetry = jest.spyOn(
FetchHttpClient.prototype as any,
'fetchRequestWithRetry',
);

const response = await fetchClient.post('/fga/v1/resources', {}, {});

expect(mockFetchRequestWithRetry).toHaveBeenCalledTimes(1);
expect(fetchURL()).toBe('https://test.workos.com/fga/v1/resources');
expect(await response.toJSON()).toEqual({ data: 'response' });
});

it('put for FGA path should call fetchRequestWithRetry and return response', async () => {
fetchOnce({ data: 'response' });
const mockFetchRequestWithRetry = jest.spyOn(
FetchHttpClient.prototype as any,
'fetchRequestWithRetry',
);

const response = await fetchClient.put(
'/fga/v1/resources/user/user-1',
{},
{},
);

expect(mockFetchRequestWithRetry).toHaveBeenCalledTimes(1);
expect(fetchURL()).toBe(
'https://test.workos.com/fga/v1/resources/user/user-1',
);
expect(await response.toJSON()).toEqual({ data: 'response' });
});

it('delete for FGA path should call fetchRequestWithRetry and return response', async () => {
fetchOnce({ data: 'response' });
const mockFetchRequestWithRetry = jest.spyOn(
FetchHttpClient.prototype as any,
'fetchRequestWithRetry',
);

const response = await fetchClient.delete(
'/fga/v1/resources/user/user-1',
{},
);

expect(mockFetchRequestWithRetry).toHaveBeenCalledTimes(1);
expect(fetchURL()).toBe(
'https://test.workos.com/fga/v1/resources/user/user-1',
);
expect(await response.toJSON()).toEqual({ data: 'response' });
});

it('get for Vault path should call fetchRequestWithRetry and return response', async () => {
fetchOnce({ data: 'response' });
const mockFetchRequestWithRetry = jest.spyOn(
Expand Down Expand Up @@ -153,7 +86,7 @@ describe('Fetch client', () => {
const mockSleep = jest.spyOn(fetchClient, 'sleep');
mockSleep.mockImplementation(() => Promise.resolve());

const response = await fetchClient.get('/fga/v1/resources', {});
const response = await fetchClient.get('/vault/v1/kv', {});

expect(mockShouldRetryRequest).toHaveBeenCalledTimes(2);
expect(mockSleep).toHaveBeenCalledTimes(1);
Expand All @@ -175,7 +108,7 @@ describe('Fetch client', () => {
const mockSleep = jest.spyOn(fetchClient, 'sleep');
mockSleep.mockImplementation(() => Promise.resolve());

const response = await fetchClient.get('/fga/v1/resources', {});
const response = await fetchClient.get('/vault/v1/kv', {});

expect(mockShouldRetryRequest).toHaveBeenCalledTimes(2);
expect(mockSleep).toHaveBeenCalledTimes(1);
Expand All @@ -197,7 +130,7 @@ describe('Fetch client', () => {
const mockSleep = jest.spyOn(fetchClient, 'sleep');
mockSleep.mockImplementation(() => Promise.resolve());

const response = await fetchClient.get('/fga/v1/resources', {});
const response = await fetchClient.get('/vault/v1/kv', {});

expect(mockShouldRetryRequest).toHaveBeenCalledTimes(2);
expect(mockSleep).toHaveBeenCalledTimes(1);
Expand Down Expand Up @@ -236,7 +169,7 @@ describe('Fetch client', () => {
const mockSleep = jest.spyOn(fetchClient, 'sleep');
mockSleep.mockImplementation(() => Promise.resolve());

await expect(fetchClient.get('/fga/v1/resources', {})).rejects.toThrow(
await expect(fetchClient.get('/vault/v1/kv', {})).rejects.toThrow(
'Gateway Timeout',
);

Expand All @@ -256,7 +189,7 @@ describe('Fetch client', () => {
'shouldRetryRequest',
);

await expect(fetchClient.get('/fga/v1/resources', {})).rejects.toThrow(
await expect(fetchClient.get('/vault/v1/kv', {})).rejects.toThrow(
'Bad Request',
);

Expand All @@ -275,7 +208,7 @@ describe('Fetch client', () => {
const mockSleep = jest.spyOn(fetchClient, 'sleep');
mockSleep.mockImplementation(() => Promise.resolve());

const response = await fetchClient.get('/fga/v1/resources', {});
const response = await fetchClient.get('/vault/v1/kv', {});

expect(mockFetchRequest).toHaveBeenCalledTimes(2);
expect(mockSleep).toHaveBeenCalledTimes(1);
Expand Down Expand Up @@ -314,8 +247,7 @@ describe('Fetch client', () => {
}
});

it('should throw ParseError for non-FGA endpoints with invalid JSON response', async () => {
// Test with a non-FGA endpoint to ensure the error handling works for regular requests too
it('should throw ParseError for endpoints with invalid JSON response', async () => {
fetch.mockResponseOnce('Not JSON content', {
status: 400,
statusText: 'Bad Request',
Expand Down
6 changes: 1 addition & 5 deletions src/common/net/http-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,7 @@ export abstract class HttpClient implements HttpClientInterface {
}

static isPathRetryable(path: string): boolean {
return (
path.startsWith('/fga/') ||
path.startsWith('/vault/') ||
path.startsWith('/audit_logs/events')
);
return path.startsWith('/vault/') || path.startsWith('/audit_logs/events');
}

private getSleepTimeInMilliseconds(retryAttempt: number): number {
Expand Down
Loading
Loading