diff --git a/x-pack/plugins/security/public/session/session_timeout_http_interceptor.test.ts b/x-pack/plugins/security/public/session/session_timeout_http_interceptor.test.ts index 843ca9c8ed835bd..427bdb04f9c61f8 100644 --- a/x-pack/plugins/security/public/session/session_timeout_http_interceptor.test.ts +++ b/x-pack/plugins/security/public/session/session_timeout_http_interceptor.test.ts @@ -58,7 +58,7 @@ describe('response', () => { http.intercept(interceptor); fetchMock.mock('*', 200); - await http.fetch('/foo-api', { asSystemApi: true }); + await http.fetch('/foo-api', { asSystemRequest: true }); expect(sessionTimeoutMock.extend).not.toHaveBeenCalled(); }); @@ -99,7 +99,7 @@ describe('responseError', () => { http.intercept(interceptor); fetchMock.mock('*', 401); - await expect(http.fetch('/foo-api', { asSystemApi: true })).rejects.toMatchInlineSnapshot( + await expect(http.fetch('/foo-api', { asSystemRequest: true })).rejects.toMatchInlineSnapshot( `[Error: Unauthorized]` ); diff --git a/x-pack/plugins/security/public/session/session_timeout_http_interceptor.ts b/x-pack/plugins/security/public/session/session_timeout_http_interceptor.ts index 705a287b0191649..4033c04378a52f0 100644 --- a/x-pack/plugins/security/public/session/session_timeout_http_interceptor.ts +++ b/x-pack/plugins/security/public/session/session_timeout_http_interceptor.ts @@ -4,7 +4,12 @@ * you may not use this file except in compliance with the Elastic License. */ -import { HttpInterceptor, HttpErrorResponse, HttpResponse, IAnonymousPaths } from 'src/core/public'; +import { + HttpInterceptor, + HttpInterceptorResponseError, + HttpResponse, + IAnonymousPaths, +} from 'src/core/public'; import { ISessionTimeout } from './session_timeout'; @@ -16,19 +21,19 @@ export class SessionTimeoutHttpInterceptor implements HttpInterceptor { return; } - if (httpResponse.fetchOptions.asSystemApi) { + if (httpResponse.fetchOptions.asSystemRequest) { return; } this.sessionTimeout.extend(httpResponse.request.url); } - responseError(httpErrorResponse: HttpErrorResponse) { + responseError(httpErrorResponse: HttpInterceptorResponseError) { if (this.anonymousPaths.isAnonymous(window.location.pathname)) { return; } - if (httpErrorResponse.fetchOptions.asSystemApi) { + if (httpErrorResponse.fetchOptions.asSystemRequest) { return; } diff --git a/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.ts b/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.ts index a0ef2fdb86b47e3..6b5eadcab74418e 100644 --- a/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.ts +++ b/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.ts @@ -6,7 +6,7 @@ import { HttpInterceptor, - HttpErrorResponse, + HttpInterceptorResponseError, IHttpInterceptController, IAnonymousPaths, } from 'src/core/public'; @@ -16,7 +16,10 @@ import { SessionExpired } from './session_expired'; export class UnauthorizedResponseHttpInterceptor implements HttpInterceptor { constructor(private sessionExpired: SessionExpired, private anonymousPaths: IAnonymousPaths) {} - responseError(httpErrorResponse: HttpErrorResponse, controller: IHttpInterceptController) { + responseError( + httpErrorResponse: HttpInterceptorResponseError, + controller: IHttpInterceptController + ) { if (this.anonymousPaths.isAnonymous(window.location.pathname)) { return; }