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

Fixed authentication module

Browse Source
This commit is contained in:
Giuseppe Digilio
2018-02-13 12:56:07 +01:00
parent 8df514f39c
commit 4488a450c0
9 changed files with 104 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,11 +10,11 @@ import 'rxjs/add/operator/filter';
import 'rxjs/add/operator/takeWhile';
// actions
import { AuthenticateAction, ResetAuthenticationErrorAction } from '../../core/auth/auth.actions';
import { AuthenticateAction, ResetAuthenticationMessagesAction } from '../../core/auth/auth.actions';
// reducers
import {
getAuthenticationError, getAuthenticationMessage,
getAuthenticationError, getAuthenticationInfo,
isAuthenticated,
isAuthenticationLoading,
} from '../../core/auth/selectors';
@@ -109,7 +109,7 @@ export class LogInComponent implements OnDestroy, OnInit {
});
// set error
this.message = this.store.select(getAuthenticationMessage)
this.message = this.store.select(getAuthenticationInfo)
.map((message) => {
this.hasMessage = (isNotEmpty(message));
return message;
@@ -140,7 +140,7 @@ export class LogInComponent implements OnDestroy, OnInit {
*/
public resetErrorOrMessage() {
if (this.hasError || this.hasMessage) {
this.store.dispatch(new ResetAuthenticationErrorAction());
this.store.dispatch(new ResetAuthenticationMessagesAction());
this.hasError = false;
this.hasMessage = false;
}