diff --git a/packages/common/http/public_api.ts b/packages/common/http/public_api.ts index 531ff077f1..8ac2b95de8 100644 --- a/packages/common/http/public_api.ts +++ b/packages/common/http/public_api.ts @@ -11,9 +11,9 @@ export {HttpClient} from './src/client'; export {HttpHeaders} from './src/headers'; export {HTTP_INTERCEPTORS, HttpInterceptor} from './src/interceptor'; export {JsonpClientBackend, JsonpInterceptor} from './src/jsonp'; -export {HttpClientJsonpModule, HttpClientModule, HttpXsrfModule, interceptingHandler as ɵinterceptingHandler} from './src/module'; +export {HttpClientJsonpModule, HttpClientModule, HttpClientXsrfModule, interceptingHandler as ɵinterceptingHandler} from './src/module'; export {HttpParameterCodec, HttpParams, HttpUrlEncodingCodec} from './src/params'; export {HttpRequest} from './src/request'; export {HttpDownloadProgressEvent, HttpErrorResponse, HttpEvent, HttpEventType, HttpHeaderResponse, HttpProgressEvent, HttpResponse, HttpResponseBase, HttpSentEvent, HttpUserEvent} from './src/response'; export {HttpXhrBackend, XhrFactory} from './src/xhr'; -export {HttpXsrfTokenExtractor} from './src/xsrf'; \ No newline at end of file +export {HttpXsrfTokenExtractor} from './src/xsrf'; diff --git a/packages/common/http/src/module.ts b/packages/common/http/src/module.ts index fa63fc491d..f3e64b1ed0 100644 --- a/packages/common/http/src/module.ts +++ b/packages/common/http/src/module.ts @@ -70,13 +70,13 @@ export function jsonpCallbackContext(): Object { {provide: XSRF_HEADER_NAME, useValue: 'X-XSRF-TOKEN'}, ], }) -export class HttpXsrfModule { +export class HttpClientXsrfModule { /** * Disable the default XSRF protection. */ static disable(): ModuleWithProviders { return { - ngModule: HttpXsrfModule, + ngModule: HttpClientXsrfModule, providers: [ {provide: HttpXsrfInterceptor, useClass: NoopInterceptor}, ], @@ -92,7 +92,7 @@ export class HttpXsrfModule { headerName?: string, } = {}): ModuleWithProviders { return { - ngModule: HttpXsrfModule, + ngModule: HttpClientXsrfModule, providers: [ options.cookieName ? {provide: XSRF_COOKIE_NAME, useValue: options.cookieName} : [], options.headerName ? {provide: XSRF_HEADER_NAME, useValue: options.headerName} : [], @@ -111,7 +111,7 @@ export class HttpXsrfModule { */ @NgModule({ imports: [ - HttpXsrfModule.withOptions({ + HttpClientXsrfModule.withOptions({ cookieName: 'XSRF-TOKEN', headerName: 'X-XSRF-TOKEN', }), diff --git a/tools/public_api_guard/common/http.d.ts b/tools/public_api_guard/common/http.d.ts index bf1dc4a0b2..789e548bbf 100644 --- a/tools/public_api_guard/common/http.d.ts +++ b/tools/public_api_guard/common/http.d.ts @@ -1004,6 +1004,15 @@ export declare class HttpClientJsonpModule { export declare class HttpClientModule { } +/** @experimental */ +export declare class HttpClientXsrfModule { + static disable(): ModuleWithProviders; + static withOptions(options?: { + cookieName?: string; + headerName?: string; + }): ModuleWithProviders; +} + /** @experimental */ export interface HttpDownloadProgressEvent extends HttpProgressEvent { partialText?: string; @@ -1246,15 +1255,6 @@ export declare class HttpXhrBackend implements HttpBackend { handle(req: HttpRequest): Observable>; } -/** @experimental */ -export declare class HttpXsrfModule { - static disable(): ModuleWithProviders; - static withOptions(options?: { - cookieName?: string; - headerName?: string; - }): ModuleWithProviders; -} - /** @experimental */ export declare abstract class HttpXsrfTokenExtractor { abstract getToken(): string | null;