Angular Security course

Author: jhades

server/read-all-lessons.route.ts

@@ -1,11 +1,21 @@
 
 
 import {db} from "./database";
+import {sessionStore} from "./session-storage";
 
 
 
 export function readAllLessons(req, res) {
 
+    const sessionId = req.cookies['SESSIONID'];
+
+    const isSessionValid = sessionStore.isSessionValid(sessionId);
+
+    if (!isSessionValid) {
+        res.sendStatus(403);
+    }
+    else {
+        res.status(200).json(db.readAllLessons());
+    }
 
-    return res.status(200).json(db.readAllLessons());
 }

server/session-storage.ts

@@ -48,11 +48,19 @@ class SessionStore {
 
     findUserbySession(sessionId:string) : User {
 
+        const isSessionValid = this.isSessionValid(sessionId);
+
+        return isSessionValid ? this.sessions[sessionId].user : undefined;
+    }
+
+    isSessionValid(sessionId:string) {
+
         const session = this.sessions[sessionId];
 
         const isSessionValid = session && session.isValid();
 
         return isSessionValid ? session.user : undefined;
+
     }
 
 }

src/app/app.component.html

@@ -6,8 +6,6 @@
                      src="https://angular-academy.s3.amazonaws.com/main-logo/main-page-logo-small-hat.png">
             </a>
         </li>
-
-
         <li>
             <a routerLink="/lessons">Lessons</a>
         </li>
@@ -20,13 +18,9 @@
         <li *ngIf="isLoggedIn$ | async" (click)="logout()">
             <a>Logout</a>
         </li>
-
-
     </ul>
-
 </header>
 
-
 <main>
 
     <div class="course-header">
@@ -35,7 +29,6 @@ <h3>Angular Security MasterClass</h3>
              src="https://s3-us-west-1.amazonaws.com/angular-university/course-images/angular-security-thumbnail.png">
     </div>
 
-
     <router-outlet></router-outlet>
 
 </main>

src/app/app.component.ts

@@ -8,31 +8,23 @@ import {User} from "./model/user";
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.css']
 })
-export class AppComponent  implements OnInit{
+export class AppComponent  implements OnInit {
 
     isLoggedIn$: Observable<boolean>;
     isLoggedOut$: Observable<boolean>;
 
-
     constructor(private authService:AuthService) {
 
     }
 
-
     ngOnInit() {
-
         this.isLoggedIn$ = this.authService.isLoggedIn$;
         this.isLoggedOut$ = this.authService.isLoggedOut$;
-
     }
 
-
-
     logout() {
-
-        this.authService.logout()
-            .subscribe();
-
+        this.authService.logout().subscribe();
     }
 
 }
+

src/app/login/login.component.ts

@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import {FormBuilder, FormGroup, Validators} from "@angular/forms";
+import {AuthService} from "../services/auth.service";
 
 @Component({
   selector: 'login',
@@ -10,7 +11,7 @@ export class LoginComponent implements OnInit {
 
     form:FormGroup;
 
-    constructor(private fb:FormBuilder) {
+    constructor(private fb:FormBuilder, private authService:AuthService) {
 
         this.form = this.fb.group({
             email: ['',Validators.required],
@@ -28,7 +29,8 @@ export class LoginComponent implements OnInit {
 
         const formValue = this.form.value;
 
-        //TODO
+
+
 
 
     }

src/app/services/auth.service.ts

@@ -21,27 +21,23 @@ export class AuthService {
 
     isLoggedOut$: Observable<boolean> = this.isLoggedIn$.map(isLoggedIn => !isLoggedIn);
 
-
     constructor(private http: HttpClient) {
         http.get<User>('/api/user')
             .subscribe(user => this.subject.next(user ? user : ANONYMOUS_USER));
     }
 
-
     signUp(email: string, password: string) {
         return this.http.post<User>('/api/signup', {email, password})
             .shareReplay()
             .do(user => this.subject.next(user));
     }
 
-
     logout(): Observable<any> {
         return this.http.post('/api/logout', null)
             .shareReplay()
             .do(user => this.subject.next(ANONYMOUS_USER));
     }
 
-
 }