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

Merge branch 'Hard-redirect-after-log-in' into w2p-72635_cookie-preferences

Browse Source
This commit is contained in:
lotte
2020-09-15 09:39:23 +02:00
parent 99b84223e2 5965f4e929
commit fc35c9fd67
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/core/services/browser-hard-redirect.service.ts
View File

@@ -1,7 +1,12 @@
import { Inject, Injectable } from '@angular/core'; import { Inject, Injectable, InjectionToken } from '@angular/core';
import { LocationToken } from '../../../modules/app/browser-app.module';
import { HardRedirectService } from './hard-redirect.service'; import { HardRedirectService } from './hard-redirect.service';
export const LocationToken = new InjectionToken('Location');
export function locationProvider(): Location {
return window.location;
}
/** /**
* Service for performing hard redirects within the browser app module * Service for performing hard redirects within the browser app module
*/ */

13
src/modules/app/browser-app.module.ts
View File

@@ -1,5 +1,5 @@
import { HttpClient, HttpClientModule } from '@angular/common/http'; import { HttpClient, HttpClientModule } from '@angular/common/http';
import { InjectionToken, NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { BrowserModule, makeStateKey, TransferState } from '@angular/platform-browser'; import { BrowserModule, makeStateKey, TransferState } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
@@ -24,7 +24,10 @@ import { StatisticsModule } from '../../app/statistics/statistics.module';
import { BrowserKlaroService } from '../../app/shared/cookies/browser-klaro.service'; import { BrowserKlaroService } from '../../app/shared/cookies/browser-klaro.service';
import { KlaroService } from '../../app/shared/cookies/klaro.service'; import { KlaroService } from '../../app/shared/cookies/klaro.service';
import { HardRedirectService } from '../../app/core/services/hard-redirect.service'; import { HardRedirectService } from '../../app/core/services/hard-redirect.service';
import { BrowserHardRedirectService } from '../../app/core/services/browser-hard-redirect.service'; import {
BrowserHardRedirectService,
LocationToken, locationProvider
} from '../../app/core/services/browser-hard-redirect.service';
export const REQ_KEY = makeStateKey<string>('req'); export const REQ_KEY = makeStateKey<string>('req');
@@ -36,12 +39,6 @@ export function getRequest(transferState: TransferState): any {
return transferState.get<any>(REQ_KEY, {}); return transferState.get<any>(REQ_KEY, {});
} }
export const LocationToken = new InjectionToken('Location');
export function locationProvider(): Location {
return window.location;
}
@NgModule({ @NgModule({
bootstrap: [AppComponent], bootstrap: [AppComponent],
imports: [ imports: [