Angular Security course

Author: jhades

package.json

@@ -7,7 +7,7 @@
   },
   "scripts": {
     "ng": "ng",
-    "start": "ng serve --proxy-config ./proxy.json --ssl 1 --ssl-key key.pem --ssl-cert cert.pem",
+    "start": "ng serve --proxy-config ./proxy.json",
     "start-server": "./node_modules/.bin/ts-node ./server/server.ts --secure",
     "server": "./node_modules/.bin/nodemon  -w ./server --ext \".ts\" --exec \"npm run start-server\"",
     "hash": "node ./demos/hash.js",

server/create-user.route.ts

@@ -1,14 +1,13 @@
+
 import {Request, Response} from "express";
 import {db} from "./database";
 import {USERS} from "./database-data";
 import * as argon2 from 'argon2';
 import {validatePassword} from "./password-validation";
-import {sessionStore} from "./session-storage";
-import {initializeUserSession, randomBytes} from "./security.utils";
 
 
 
-export function createUser(req: Request, res: Response) {
+export function createUser(req: Request, res:Response) {
 
     const credentials = req.body;
 
@@ -18,24 +17,16 @@ export function createUser(req: Request, res: Response) {
         res.status(400).json({errors});
     }
     else {
+        argon2.hash(credentials.password)
+            .then(passwordDigest => {
 
-        createUserAndSession(res, credentials)
-            .catch(err => res.status(500).json({errors: ["err_user"]}));
-
-    }
-
-}
-
-async function createUserAndSession(res: Response, credentials) {
+                const user = db.createUser(credentials.email, passwordDigest);
 
-    const passwordDigest = await argon2.hash(credentials.password);
+                console.log(USERS);
 
-    console.log("passwordDigest", passwordDigest);
-
-    const user = db.createUser(credentials.email, passwordDigest);
-
-    return initializeUserSession(user, res);
-
-}
+                res.status(200).json({id:user.id, email:user.email});
 
+            });
+    }
 
+}

server/get-user.route.ts

@@ -1,21 +1,9 @@
 
-
 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());
-    }
+    res.status(200).json(db.readAllLessons());
 
 }

server/login.route.ts

@@ -6,9 +6,6 @@ import * as fs from 'fs';
 import * as https from 'https';
 import {readAllLessons} from "./read-all-lessons.route";
 import {createUser} from "./create-user.route";
-import {getUser} from "./get-user.route";
-import {logout} from "./logout.route";
-import {login} from "./login.route";
 const bodyParser = require('body-parser');
 const cookieParser = require('cookie-parser');
 
@@ -34,14 +31,6 @@ app.route('/api/lessons')
 app.route('/api/signup')
     .post(createUser);
 
-app.route('/api/user')
-    .get(getUser);
-
-app.route('/api/logout')
-    .post(logout);
-
-app.route('/api/login')
-    .post(login);
 
 if (options.secure) {
 

server/logout.route.ts

@@ -23,7 +23,7 @@ export class AppComponent  implements OnInit {
     }
 
     logout() {
-        this.authService.logout().subscribe();
+
     }
 
 }

server/read-all-lessons.route.ts

@@ -1,5 +1,5 @@
 
-<div class="lessons-list-container v-h-center-block-parent" *ngIf="isLoggedIn$ | async">
+<div class="lessons-list-container v-h-center-block-parent">
 
     <h2>All Lessons</h2>
 

server/security.utils.ts

@@ -37,14 +37,7 @@ export class LoginComponent implements OnInit {
 
         if (val.email && val.password) {
 
-            this.authService.login(val.email, val.password)
-                .subscribe(
-                    () => {
-                        console.log("User logged in successfully");
-                        this.router.navigateByUrl('/');
-                    },
-                    response => this.errors = response.error.errors
-                );
+            //TODO
 
         }
 

server/server.ts

@@ -13,40 +13,25 @@ export const ANONYMOUS_USER: User = {
 @Injectable()
 export class AuthService {
 
-    private subject = new BehaviorSubject<User>(undefined);
+    private subject = new BehaviorSubject<User>(ANONYMOUS_USER);
 
-    user$: Observable<User> = this.subject.asObservable().filter(user => !!user);
+    user$: Observable<User> = this.subject.asObservable();
 
     isLoggedIn$: Observable<boolean> = this.user$.map(user => !!user.id);
 
     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) {
+    signUp(email:string, password:string ) {
+
         return this.http.post<User>('/api/signup', {email, password})
             .shareReplay()
             .do(user => this.subject.next(user));
-    }
 
-    login(email: string, password: string) {
-        return this.http.post<User>('/api/login', {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));
-    }
-
-}
-
-
-
-
-
+}

server/session-storage.ts

@@ -22,7 +22,7 @@ export class SignupComponent implements OnInit {
     };
 
 
-    constructor(private fb: FormBuilder, private authService: AuthService, private router:Router) {
+    constructor(private fb: FormBuilder, private authService: AuthService) {
         this.form = this.fb.group({
             email: ['',Validators.required],
             password: ['',Validators.required],
@@ -43,12 +43,7 @@ export class SignupComponent implements OnInit {
 
             this.authService.signUp(val.email, val.password)
                 .subscribe(
-                    () => {
-                        console.log("User created successfully");
-
-                        this.router.navigateByUrl('/');
-
-                    },
+                    () => console.log("User created successfully"),
                     response => this.errors = response.error.errors
                 );