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

Commit for server test

Browse Source
This commit is contained in:
Julius Gruber
2019-10-16 13:14:24 +02:00
parent 331596968b
commit a59aafb1f4
3 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ import { select, Store } from '@ngrx/store';
import { getAuthenticationMethods, isAuthenticated, isAuthenticationLoading } from '../../core/auth/selectors';
import { CoreState } from '../../core/core.reducers';
import { InjectedAuthMethodModel } from './injectedAuthMethodModel/injectedAuthMethodModel';
import { filter, takeWhile } from 'rxjs/operators';
import { filter, takeWhile, tap } from 'rxjs/operators';
import { AuthService } from '../../core/auth/auth.service';
@Component({
@@ -51,16 +51,29 @@ export class LogInComponent implements OnInit, OnDestroy {
}
ngOnInit(): void {
this.authMethodData = this.store.pipe(select(getAuthenticationMethods));
/* this.store.pipe(
select(getAuthenticationMethods),
tap((authMethods) => console.log('authMethods: ', authMethods))
).subscribe(
(authMethods) => this.authMethodData = authMethods
);*/
this.subscription = this.authMethodData.subscribe((methods) => this.authMethods = methods);
this.injectedAuthMethods = new Array<InjectedAuthMethodModel>();
// tslint:disable-next-line:forin
for (const index in this.authMethods) {
const injectedAuthMethod = new InjectedAuthMethodModel(this.authMethods[index].authMethodType, this.authMethods[index].location, this.isStandalonePage);
this.injectedAuthMethods.push(injectedAuthMethod);
}
console.log('injectedAuthMethods in ngOnInit(): ', this.injectedAuthMethods);
this.authMethodData = this.store.pipe(
select(getAuthenticationMethods),
/* tap((authMethods) => authMethods.forEach((method) => {
method.isStandalonePage = this.isStandalonePage;
}))*/
);
/*
this.subscription = this.authMethodData.subscribe((methods) => this.authMethods = methods);
this.injectedAuthMethods = new Array<InjectedAuthMethodModel>();
// tslint:disable-next-line:forin
for (const index in this.authMethods) {
const injectedAuthMethod = new InjectedAuthMethodModel(this.authMethods[index].authMethodType, this.authMethods[index].location, this.isStandalonePage);
this.injectedAuthMethods.push(injectedAuthMethod);
}
console.log('injectedAuthMethods in ngOnInit(): ', this.injectedAuthMethods);
*/
// set loading
this.loading = this.store.pipe(select(isAuthenticationLoading));
@@ -81,7 +94,7 @@ export class LogInComponent implements OnInit, OnDestroy {
}
ngOnDestroy(): void {
this.subscription.unsubscribe();
// this.subscription.unsubscribe();
this.alive = false;
}