1
0

Merge branch 'w2p-72699_Hard-redirect-after-log-in' into w2p-72541_User-agreement-and-Privacy-statement

Conflicts:
	src/app/app-routing.module.ts
	src/app/core/core.module.ts
This commit is contained in:
Kristof De Langhe
2020-08-28 10:40:01 +02:00
83 changed files with 2541 additions and 583 deletions

View File

@@ -162,6 +162,7 @@ import { SubmissionCcLicenceUrl } from './submission/models/submission-cc-licens
import { SubmissionCcLicenseUrlDataService } from './submission/submission-cc-license-url-data.service';
import { ConfigurationDataService } from './data/configuration-data.service';
import { ConfigurationProperty } from './shared/configuration-property.model';
import { ReloadGuard } from './reload/reload.guard';
import { EndUserAgreementGuard } from './end-user-agreement/end-user-agreement.guard';
import { EndUserAgreementService } from './end-user-agreement/end-user-agreement.service';
@@ -291,6 +292,7 @@ const PROVIDERS = [
MetadataSchemaDataService,
MetadataFieldDataService,
TokenResponseParsingService,
ReloadGuard,
EndUserAgreementGuard,
EndUserAgreementService,
// register AuthInterceptor as HttpInterceptor