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

Boolean isStandalonePage injected

Browse Source
This commit is contained in:
Julius Gruber
2019-10-08 16:00:24 +02:00
parent 43933771c0
commit 71fbf28984
8 changed files with 59 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/shared/log-in/methods/password/log-in-password.component.ts
View File

@@ -1,5 +1,5 @@
import { filter, map, takeWhile } from 'rxjs/operators';
import { Component, OnDestroy, OnInit } from '@angular/core';
import { Component, Inject, Input, OnDestroy, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { select, Store } from '@ngrx/store';
@@ -22,6 +22,7 @@ import { fadeOut } from '../../../animations/fade';
import { AuthService } from '../../../../core/auth/auth.service';
import { AuthMethodType } from '../authMethods-type';
import { renderAuthMethodFor } from '../authMethods-decorator';
import { AuthMethodModel } from '../../../../core/auth/models/auth-method.model';
/**
* /users/sign-in
@@ -84,6 +85,8 @@ export class LogInPasswordComponent implements OnDestroy, OnInit {
*/
private alive = true;
@Input() authMethodModel: AuthMethodModel;
/**
* @constructor
* @param {AuthService} authService
@@ -91,10 +94,12 @@ export class LogInPasswordComponent implements OnDestroy, OnInit {
* @param {Store<State>} store
*/
constructor(
@Inject('authMethodModelProvider') public injectedAuthMethodModel: AuthMethodModel,
private authService: AuthService,
private formBuilder: FormBuilder,
private store: Store<CoreState>,
private store: Store<CoreState>
) {
this.authMethodModel = injectedAuthMethodModel;
}
/**
@@ -102,7 +107,6 @@ export class LogInPasswordComponent implements OnDestroy, OnInit {
* @method ngOnInit
*/
public ngOnInit() {
// set isAuthenticated
this.isAuthenticated = this.store.pipe(select(isAuthenticated));
@@ -139,7 +143,7 @@ export class LogInPasswordComponent implements OnDestroy, OnInit {
takeWhile(() => this.alive),
filter((authenticated) => authenticated))
.subscribe(() => {
this.authService.redirectAfterLoginSuccess(true); // HARDCODED FOR DEV _ CHANGE IT
this.authService.redirectAfterLoginSuccess(this.authMethodModel.isStandalonePage);
}
);