SB-1196 Use InvalidCredentialsAction to notify UI when submitted login credentials are invalid.

Author: steve-todorov

src/app/modules/core/auth/state/session.state.spec.ts

@@ -10,7 +10,7 @@ import {AuthenticatedUser, UserAuthority, UserCredentials} from '../auth.model';
 import {LoginAction, LogoutAction} from './auth.actions';
 import {AuthService} from '../auth.service';
 
-describe('SessionState', () => {
+describe('State: SessionState', () => {
 
     describe('selectors should work properly', () => {
         it('token() should return a proper value', () => {

src/app/modules/core/auth/state/session.state.ts

@@ -5,7 +5,14 @@ import {catchError, tap} from 'rxjs/operators';
 import {of} from 'rxjs';
 import {plainToClass} from 'class-transformer';
 
-import {CheckCredentialsAction, CredentialsExpiredAction, LoginAction, LogoutAction, UnauthorizedAccessAction} from './auth.actions';
+import {
+    CheckCredentialsAction,
+    CredentialsExpiredAction,
+    InvalidCredentialsAction,
+    LoginAction,
+    LogoutAction,
+    UnauthorizedAccessAction
+} from './auth.actions';
 import {AuthenticatedUser} from '../auth.model';
 import {AuthService} from '../auth.service';
 import {HideSideNavAction, OpenLoginDialogAction} from '../../../../state/app.actions';
@@ -20,34 +27,38 @@ export interface SessionStateModel {
 export const defaultSessionState: SessionStateModel = {
     user: null,
     token: null,
-    state: 'guest',
-    response: null
+    state: 'guest'
 };
 
-let initialState: SessionStateModel = defaultSessionState;
-if (localStorage.getItem('session') !== '') {
-    let session: SessionStateModel = defaultSessionState;
+function initialSessionState() {
+    let state: SessionStateModel = defaultSessionState;
+
+    if (localStorage.getItem('session') !== '') {
+        let session: SessionStateModel = defaultSessionState;
+
+        try {
+            const rawSession: any = JSON.parse(localStorage.getItem('session'));
+            session = {
+                user: plainToClass(AuthenticatedUser, rawSession.user) as any as AuthenticatedUser,
+                token: rawSession.token,
+                state: rawSession.state
+            };
+        } catch (e) {
+            console.warn('Invalid session found in localStorage.');
+            session = defaultSessionState;
+        }
 
-    try {
-        const rawSession: any = JSON.parse(localStorage.getItem('session'));
-        session = {
-            user: plainToClass(AuthenticatedUser, rawSession) as any as AuthenticatedUser,
-            token: rawSession.token,
-            state: rawSession.state
-        };
-    } catch (e) {
-        console.warn('Invalid session found in localStorage.');
-        session = defaultSessionState;
+        if (session !== null && session.token !== '') {
+            state = session;
+        }
     }
 
-    if (session !== null && session.token !== '') {
-        initialState = session;
-    }
+    return state;
 }
 
 @State<SessionStateModel>({
     name: 'session',
-    defaults: initialState
+    defaults: initialSessionState()
 })
 export class SessionState implements NgxsOnInit {
 
@@ -151,5 +162,9 @@ export class SessionState implements NgxsOnInit {
         this.store.dispatch([new OpenLoginDialogAction(payload)]);
     }
 
+    @Action(InvalidCredentialsAction)
+    invalidCredentialsSessionState(ctx: StateContext<SessionStateModel>) {
+        ctx.patchState({state: 'invalid.credentials'});
+    }
 
 }