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

Changed method name.

Browse Source
This commit is contained in:
Michael W Spalti
2019-09-16 13:14:45 -07:00
parent 6425f6e7d1
commit 8fe617bd74
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/core/auth/auth.service.spec.ts
View File

@@ -249,28 +249,28 @@ describe('AuthService test', () => {
it ('should set redirect url to previous page', () => { it ('should set redirect url to previous page', () => {
spyOn(routeServiceMock, 'getHistory').and.callThrough(); spyOn(routeServiceMock, 'getHistory').and.callThrough();
authService.redirectToPreviousUrl(true); authService.redirectAfterLoginSuccess(true);
expect(routeServiceMock.getHistory).toHaveBeenCalled(); expect(routeServiceMock.getHistory).toHaveBeenCalled();
expect(routerStub.navigate).toHaveBeenCalledWith(['/collection/123']); expect(routerStub.navigate).toHaveBeenCalledWith(['/collection/123']);
}); });
it ('should set redirect url to current page', () => { it ('should set redirect url to current page', () => {
spyOn(routeServiceMock, 'getHistory').and.callThrough(); spyOn(routeServiceMock, 'getHistory').and.callThrough();
authService.redirectToPreviousUrl(false); authService.redirectAfterLoginSuccess(false);
expect(routeServiceMock.getHistory).toHaveBeenCalled(); expect(routeServiceMock.getHistory).toHaveBeenCalled();
expect(routerStub.navigate).toHaveBeenCalledWith(['/home']); expect(routerStub.navigate).toHaveBeenCalledWith(['/home']);
}); });
it ('should redirect to / and not to /login', () => { it ('should redirect to / and not to /login', () => {
spyOn(routeServiceMock, 'getHistory').and.returnValue(of(['/login', '/login'])); spyOn(routeServiceMock, 'getHistory').and.returnValue(of(['/login', '/login']));
authService.redirectToPreviousUrl(true); authService.redirectAfterLoginSuccess(true);
expect(routeServiceMock.getHistory).toHaveBeenCalled(); expect(routeServiceMock.getHistory).toHaveBeenCalled();
expect(routerStub.navigate).toHaveBeenCalledWith(['/']); expect(routerStub.navigate).toHaveBeenCalledWith(['/']);
}); });
it ('should redirect to / when no redirect url is found', () => { it ('should redirect to / when no redirect url is found', () => {
spyOn(routeServiceMock, 'getHistory').and.returnValue(of([''])); spyOn(routeServiceMock, 'getHistory').and.returnValue(of(['']));
authService.redirectToPreviousUrl(true); authService.redirectAfterLoginSuccess(true);
expect(routeServiceMock.getHistory).toHaveBeenCalled(); expect(routeServiceMock.getHistory).toHaveBeenCalled();
expect(routerStub.navigate).toHaveBeenCalledWith(['/']); expect(routerStub.navigate).toHaveBeenCalledWith(['/']);
}); });

2
src/app/core/auth/auth.service.ts
View File

@@ -339,7 +339,7 @@ export class AuthService {
/** /**
* Redirect to the route navigated before the login * Redirect to the route navigated before the login
*/ */
public redirectToPreviousUrl(isStandalonePage: boolean) { public redirectAfterLoginSuccess(isStandalonePage: boolean) {
this.getRedirectUrl().pipe( this.getRedirectUrl().pipe(
take(1)) take(1))
.subscribe((redirectUrl) => { .subscribe((redirectUrl) => {

2
src/app/core/auth/server-auth.service.ts
View File

@@ -54,7 +54,7 @@ export class ServerAuthService extends AuthService {
/** /**
* Redirect to the route navigated before the login * Redirect to the route navigated before the login
*/ */
public redirectToPreviousUrl(isStandalonePage: boolean) { public redirectAfterLoginSuccess(isStandalonePage: boolean) {
this.getRedirectUrl().pipe( this.getRedirectUrl().pipe(
take(1)) take(1))
.subscribe((redirectUrl) => { .subscribe((redirectUrl) => {

14
src/app/shared/log-in/log-in.component.ts
View File

@@ -1,9 +1,9 @@
import {filter, map, takeWhile } from 'rxjs/operators'; import { filter, map, takeWhile } from 'rxjs/operators';
import {Component, Input, OnDestroy, OnInit} from '@angular/core'; import { Component, Input, OnDestroy, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { select, Store } from '@ngrx/store'; import { select, Store } from '@ngrx/store';
import {Observable} from 'rxjs'; import { Observable } from 'rxjs';
import { import {
AuthenticateAction, AuthenticateAction,
ResetAuthenticationMessagesAction ResetAuthenticationMessagesAction
@@ -17,10 +17,10 @@ import {
} from '../../core/auth/selectors'; } from '../../core/auth/selectors';
import { CoreState } from '../../core/core.reducers'; import { CoreState } from '../../core/core.reducers';
import {isNotEmpty} from '../empty.util'; import { isNotEmpty } from '../empty.util';
import { fadeOut } from '../animations/fade'; import { fadeOut } from '../animations/fade';
import {AuthService} from '../../core/auth/auth.service'; import { AuthService } from '../../core/auth/auth.service';
import {Router} from '@angular/router'; import { Router } from '@angular/router';
/** /**
* /users/sign-in * /users/sign-in
@@ -139,7 +139,7 @@ export class LogInComponent implements OnDestroy, OnInit {
takeWhile(() => this.alive), takeWhile(() => this.alive),
filter((authenticated) => authenticated)) filter((authenticated) => authenticated))
.subscribe(() => { .subscribe(() => {
this.authService.redirectToPreviousUrl(this.isStandalonePage); this.authService.redirectAfterLoginSuccess(this.isStandalonePage);
} }
); );
} }