hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into w2p-71809_Add-server-side-X-Forwarded-For-interceptor

Browse Source 
Conflicts:
	src/modules/app/server-app.module.ts
This commit is contained in:
Kristof De Langhe
2020-07-14 13:35:11 +02:00
parent 0fa1e17078 e5742c49d9
commit 35ca785695
16 changed files with 593 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/app/server-app.module.ts
View File

@@ -25,6 +25,8 @@ import { ServerSubmissionService } from '../../app/submission/server-submission.
import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider';
import { Angulartics2RouterlessModule } from 'angulartics2/routerlessmodule';
import { ModuleMapLoaderModule } from '@nguniversal/module-map-ngfactory-loader';
import { ServerLocaleService } from 'src/app/core/locale/server-locale.service';
import { LocaleService } from 'src/app/core/locale/locale.service';
import { HTTP_INTERCEPTORS } from '@angular/common/http';
import { ForwardClientIpInterceptor } from '../../app/core/forward-client-ip/forward-client-ip.interceptor';
@@ -76,6 +78,10 @@ export function createTranslateLoader() {
provide: SubmissionService,
useClass: ServerSubmissionService
},
{
provide: LocaleService,
useClass: ServerLocaleService
},
// register ForwardClientIpInterceptor as HttpInterceptor
{
provide: HTTP_INTERCEPTORS,