Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 15 additions & 1 deletion projects/kit/offline/src/lib/offline.interceptor.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { HttpContext, HttpErrorResponse, HttpRequest, HttpResponse } from '@angular/common/http';
import { HttpContext, HttpErrorResponse, HttpHeaders, HttpRequest, HttpResponse } from '@angular/common/http';
import { TestBed } from '@angular/core/testing';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { firstValueFrom, of, throwError } from 'rxjs';
Expand Down Expand Up @@ -40,6 +40,20 @@ describe('offlineInterceptor', () => {
expect(markApiSuccess).toHaveBeenCalledOnce();
});

it('inner interceptorのlocal responseを実API成功として扱わない', async () => {
resolve.mockReturnValue({ kind: 'read', readLocal: vi.fn() });
const response = new HttpResponse({
body: { userId: 1 },
status: 200,
headers: new HttpHeaders().set(OFFLINE_RESPONSE_HEADER, 'local'),
});

await expect(firstValueFrom(run(new HttpRequest('GET', '/bootstrap'), () => of(response)))).resolves.toBe(response);

expect(markApiSuccess).not.toHaveBeenCalled();
expect(markApiFailure).toHaveBeenCalledOnce();
});

it('status=0だけlocal replica responseへfallbackする', async () => {
const local = new HttpResponse({ body: { dataFrom: 'api' }, status: 200 });
const readLocal = vi.fn(async () => local);
Expand Down
7 changes: 6 additions & 1 deletion projects/kit/offline/src/lib/offline.interceptor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@ function observeTransport(source: Observable<HttpEvent<unknown>>, network: Offli
return source.pipe(
tap({
next: (event) => {
if (event instanceof AngularHttpResponse) network.markApiSuccess();
if (!(event instanceof AngularHttpResponse)) return;
if (event.headers.get(OFFLINE_RESPONSE_HEADER) === 'local') {
network.markApiFailure();
return;
}
network.markApiSuccess();
},
error: (error: unknown) => {
if (isOfflineFallbackError(error)) network.markApiFailure();
Expand Down