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 'main' into w2p-71764_Features-support-part-2

Browse Source 
Conflicts:
	src/app/+collection-page/collection-page-routing.module.ts
	src/app/+community-page/community-page-routing.module.ts
	src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
	src/app/+item-page/edit-item-page/item-status/item-status.component.ts
	src/app/+item-page/item-page-routing.module.ts
	src/app/app-routing.module.ts
	src/app/core/core.module.ts
	src/app/shared/log-in/log-in.component.html
	src/app/shared/log-in/log-in.component.spec.ts
	src/app/shared/log-in/log-in.component.ts
This commit is contained in:
Kristof De Langhe
2020-09-22 08:36:16 +02:00
parent 42978931de 9f396f7120
commit dd7f34e541
399 changed files with 11733 additions and 3614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,14 +1,17 @@
import { Component, Input, OnDestroy, OnInit } from '@angular/core';
import { Component, Input, OnInit } from '@angular/core';
import { Observable } from 'rxjs';
import { filter, takeWhile, } from 'rxjs/operators';
import { select, Store } from '@ngrx/store';
import { AuthMethod } from '../../core/auth/models/auth.method';
import { getAuthenticationMethods, isAuthenticated, isAuthenticationLoading } from '../../core/auth/selectors';
import {
getAuthenticationError,
getAuthenticationMethods,
isAuthenticated,
isAuthenticationLoading
} from '../../core/auth/selectors';
import { CoreState } from '../../core/core.reducers';
import { getForgotPasswordRoute, getRegisterRoute } from '../../app-routing-paths';
import { hasValue } from '../empty.util';
import { AuthService } from '../../core/auth/auth.service';
import { getForgotPasswordPath, getRegisterPath } from '../../app-routing.module';
import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
import { FeatureID } from '../../core/data/feature-authorization/feature-id';
@@ -21,7 +24,7 @@ import { FeatureID } from '../../core/data/feature-authorization/feature-id';
templateUrl: './log-in.component.html',
styleUrls: ['./log-in.component.scss']
})
export class LogInComponent implements OnInit, OnDestroy {
export class LogInComponent implements OnInit {
/**
* A boolean representing if LogInComponent is in a standalone page
@@ -47,12 +50,6 @@ export class LogInComponent implements OnInit, OnDestroy {
*/
public loading: Observable<boolean>;
/**
* Component state.
* @type {boolean}
*/
private alive = true;
/**
* Whether or not the current user (or anonymous) is authorized to register an account
*/
@@ -75,28 +72,21 @@ export class LogInComponent implements OnInit, OnDestroy {
// set isAuthenticated
this.isAuthenticated = this.store.pipe(select(isAuthenticated));
// subscribe to success
this.store.pipe(
select(isAuthenticated),
takeWhile(() => this.alive),
filter((authenticated) => authenticated))
.subscribe(() => {
this.authService.redirectAfterLoginSuccess(this.isStandalonePage);
}
);
// Clear the redirect URL if an authentication error occurs and this is not a standalone page
this.store.pipe(select(getAuthenticationError)).subscribe((error) => {
if (hasValue(error) && !this.isStandalonePage) {
this.authService.clearRedirectUrl();
}
});
this.canRegister$ = this.authorizationService.isAuthorized(FeatureID.EPersonRegistration);
}
ngOnDestroy(): void {
this.alive = false;
getRegisterRoute() {
return getRegisterRoute();
}
getRegisterPath() {
return getRegisterPath();
}
getForgotPath() {
return getForgotPasswordPath();
getForgotRoute() {
return getForgotPasswordRoute();
}
}