Upgrade to proper user management

src/app/models/session.ts

@@ -0,0 +1,4 @@
+export interface Session {
+	sessionId: number;
+	sessionKey: string;
+}

src/app/models/user.ts

@@ -0,0 +1,7 @@
+export interface User {
+	userId: number;
+	fullName: string;
+	passwordHash: string;
+	email: string;
+	isActive: boolean;
+}

src/app/pages/admin/admin.component.html

@@ -1,12 +1,30 @@
 <div *ngIf="!isLoggedIn">
 	<p>Please log in:</p>
+	<label for="email">Your @nachklang.art email: </label>
+	<input id="email" type="text" aria-label="Your Email" [(ngModel)]="email"><br>
 	<label for="password">Password: </label>
 	<input id="password" type="password" aria-label="Password" (keyup.enter)="login()" [(ngModel)]="password"><br>
+	<button (click)="login()">Login</button>
+	<br><br>
+	<p>If you dont' have an account yet, please use the following form to register:</p>
 	<label for="name">Your full name: </label>
-	<input id="name" type="text" aria-label="Your Name" (keyup.enter)="login()" [(ngModel)]="name">
+	<input id="name" type="text" aria-label="Your Name" [(ngModel)]="name"><br>
+	<label for="registerEmail">Your @nachklang.art email: </label>
+	<input id="registerEmail" type="text" aria-label="Your Email" [(ngModel)]="registerEmail"><br>
+	<label for="registerPassword">Password: </label>
+	<input id="registerPassword" type="password" aria-label="Password" [(ngModel)]="registerPassword"><br>
+	<label for="registerPasswordConfirm">Confirm password: </label>
+	<input id="registerPasswordConfirm" type="password" aria-label="Password" (keyup.enter)="register()" [(ngModel)]="registerPasswordConfirm"><br>
+	<p *ngIf="!checkPasswordPolicy()">Passwords have to use uppercase and lowercase letters, numbers and must have at least 12 characters!</p>
+	<p *ngIf="!checkPasswordsMatch()">Passwords do not match!</p>
+	<button (click)="register()">Register</button>
 </div>
 <div *ngIf="isLoggedIn">
-	<span>Logged in as {{getUserName()}}&nbsp; | &nbsp;</span>
+	<span>Logged in as {{getUserName()}}</span>
+	<span *ngIf="checkUserInactive()">&nbsp;(inactive)</span>
+	<span>&nbsp;</span>
+	<button (click)="logout()">Logout</button>
+	<span>&nbsp; | &nbsp;</span>
 	<span>Calendar: </span>
 	<select [(ngModel)]="selectedCalendar" (change)="handleCalendarChange()">
 		<option value="" disabled selected hidden>Select calendar</option>

src/app/pages/admin/admin.component.ts

@@ -2,6 +2,8 @@ import {Component, OnInit} from '@angular/core';
 import {ApiService} from '../../services/api.service';
 import {UtilsService} from '../../services/utils.service';
 import {Event} from '../../models/event';
+import {Session} from '../../models/session';
+import {User} from '../../models/user';
 
 @Component({
 	selector: 'app-admin',
@@ -15,8 +17,13 @@ export class AdminComponent implements OnInit {
 	selectedCalendar: string = '';
 	password: string = '';
 	name: string = '';
+	email: string = '';
 	eventFilter: string = 'all';
 	eventSorting: string = 'start_asc';
+	isActive: boolean = false;
+	registerEmail: string = '';
+	registerPassword: string = '';
+	registerPasswordConfirm: string = '';
 
 	constructor(
 		private api: ApiService
@@ -24,9 +31,15 @@ export class AdminComponent implements OnInit {
 	}
 
 	ngOnInit(): void {
-		if (UtilsService.getPasswordFromLocalStorage() !== '') {
+		if (UtilsService.getSessionInfoFromLocalStorage().sessionId !== -1) {
-			this.isLoggedIn = true;
+			this.api.checkSession(UtilsService.getSessionInfoFromLocalStorage()).subscribe((user: User) => {
-			this.getEvents();
+				if(user.userId != null && user.userId !== -1) {
+					this.isLoggedIn = true;
+					this.name = user.fullName;
+					this.isActive = user.isActive;
+					this.getEvents();
+				}
+			});
 		}
 	}
 
@@ -51,12 +64,6 @@ export class AdminComponent implements OnInit {
 		});
 	}
 
-	login(): void {
-		UtilsService.saveUserInfoToLocalStorage(this.password, this.name);
-		this.isLoggedIn = true;
-		this.getEvents();
-	}
-
 	handleCalendarChange() {
 		this.getEvents();
 	}
@@ -105,7 +112,7 @@ export class AdminComponent implements OnInit {
 	}
 
 	getUserName(): string {
-		return UtilsService.getNameFromLocalStorage();
+		return this.name;
 	}
 
 	sortEvents(): void {
@@ -127,4 +134,54 @@ export class AdminComponent implements OnInit {
 			return 1;
 		});
 	}
+
+	login(): void {
+		this.api.login(this.email, this.password).subscribe((session: Session): void => {
+			console.log(session);
+			if(session.sessionId != null && session.sessionId !== -1) {
+				UtilsService.saveSessionInfoToLocalStorage(session.sessionId, session.sessionKey);
+				this.isLoggedIn = true;
+				this.getEvents();
+			}
+		});
+	}
+
+	register(): void {
+		this.api.register(this.registerEmail, this.name, this.registerPassword).subscribe((session: Session): void => {
+			if(session.sessionId != null && session.sessionId !== -1) {
+				UtilsService.saveSessionInfoToLocalStorage(session.sessionId, session.sessionKey);
+				this.isLoggedIn = true;
+				this.getEvents();
+				confirm('Please talk to Patrick to activate your account. You can\'t use this application before that.')
+			}
+		});
+	}
+
+	logout(): void {
+		UtilsService.clearSessionInfo();
+		this.isLoggedIn = false;
+	}
+
+	checkUserInactive(): boolean {
+		return !this.isActive;
+	}
+
+	checkPasswordsMatch(): boolean {
+		return this.registerPassword === this.registerPasswordConfirm;
+	}
+
+	checkPasswordPolicy(): boolean {
+		let isLongEnough = this.registerPassword.length >= 12;
+
+		var lowercaseRegex = /[a-z]/g
+		let hasLowercase = lowercaseRegex.test(this.registerPassword);
+
+		var uppercaseRegex = /[A-Z]/g
+		let hasUppercase = uppercaseRegex.test(this.registerPassword);
+
+		var numberRegex = /[0-9]/g
+		let hasNumbers = numberRegex.test(this.registerPassword);
+
+		return isLongEnough && hasLowercase && hasUppercase && hasNumbers;
+	}
 }

src/app/services/api.service.ts

@@ -4,24 +4,66 @@ import {Observable} from 'rxjs';
 import {Event} from '../models/event';
 import {UtilsService} from './utils.service';
 import { environment } from './../../environments/environment';
+import {Session} from '../models/session';
+import {User} from '../models/user';
 
 @Injectable({
 	providedIn: 'root'
 })
 export class ApiService {
 	apiUrl = environment.apiUrl + '/calendar/events/';
+	userApiUrl = environment.apiUrl + '/calendar/users/';
 
 	constructor(
 		private http: HttpClient
 	) {
 	}
 
+	register(email: string, fullName: string, password: string): Observable<Session> {
+		try {
+			let registerEvent: any = {
+				"email": email,
+				"fullName": fullName,
+				"password": password
+			};
+
+			return this.http.post<Session>(this.userApiUrl + 'register', registerEvent);
+		} catch (exception) {
+			console.log('Error fetching events from API');
+		}
+		return new Observable<Session>();
+	}
+
+	login(email: string, password: string): Observable<Session> {
+		try {
+			let loginEvent: any = {
+				"email": email,
+				"password": password
+			};
+
+			return this.http.post<Session>(this.userApiUrl + 'login', loginEvent);
+		} catch (exception) {
+			console.log('Error fetching events from API');
+		}
+		return new Observable<Session>();
+	}
+
+	checkSession(session: Session): Observable<User> {
+		try {
+			return this.http.post<User>(this.userApiUrl + 'checkSessionValid', session);
+		} catch (exception) {
+			console.log('Error fetching events from API');
+		}
+		return new Observable<User>();
+	}
+
 	getEvents(calendar: string): Observable<Event[]> {
 		try {
-			let password = UtilsService.getPasswordFromLocalStorage();
+			let session = UtilsService.getSessionInfoFromLocalStorage();
 
 			let params = new HttpParams();
-			params = params.append('password', password);
+			params = params.append('sessionId', session.sessionId);
+			params = params.append('sessionKey', session.sessionKey);
 			return this.http.get<Event[]>((this.apiUrl + calendar + '/json'), {params});
 		} catch (exception) {
 			console.log('Error fetching events from API');
@@ -31,13 +73,15 @@ export class ApiService {
 
 	updateEvent(event: Event): Observable<any> {
 		try {
-			let password = UtilsService.getPasswordFromLocalStorage();
+			let session = UtilsService.getSessionInfoFromLocalStorage();
+
+			let params = new HttpParams();
+			params = params.append('sessionId', session.sessionId);
+			params = params.append('sessionKey', session.sessionKey);
 
 			let updateEvent: any = event;
 
-			updateEvent.password = password;
+			return this.http.put(this.apiUrl + updateEvent.eventId, updateEvent, {params});
-
-			return this.http.put(this.apiUrl + updateEvent.eventId, updateEvent);
 		} catch (exception) {
 			console.log('Error updating event');
 		}
@@ -46,13 +90,15 @@ export class ApiService {
 
 	createEvent(event: Event): Observable<any> {
 		try {
-			let password = UtilsService.getPasswordFromLocalStorage();
+			let session = UtilsService.getSessionInfoFromLocalStorage();
+
+			let params = new HttpParams();
+			params = params.append('sessionId', session.sessionId);
+			params = params.append('sessionKey', session.sessionKey);
 
 			let createEvent: any = event;
 
-			createEvent.password = password;
+			return this.http.post(this.apiUrl, createEvent, {params});
-
-			return this.http.post(this.apiUrl, createEvent);
 		} catch (exception) {
 			console.log('Error creating event');
 		}
@@ -61,17 +107,20 @@ export class ApiService {
 
 	deleteEvent(event: Event): Observable<any> {
 		try {
-			let password = UtilsService.getPasswordFromLocalStorage();
+			let session = UtilsService.getSessionInfoFromLocalStorage();
+
+			let params = new HttpParams();
+			params = params.append('sessionId', session.sessionId);
+			params = params.append('sessionKey', session.sessionKey);
 
 			let deleteEvent: any = event;
 
-			deleteEvent.password = password;
-
 			return this.http.delete(this.apiUrl + deleteEvent.eventId, {
 				headers: {
 					'Content-Type': 'application/json'
 				},
-				body: deleteEvent
+				body: deleteEvent,
+				params
 			});
 		} catch (exception) {
 			console.log('Error deleting event');

src/app/services/utils.service.ts

@@ -1,4 +1,5 @@
 import {Injectable} from '@angular/core';
+import {Session} from '../models/session';
 
 @Injectable({
 	providedIn: 'root'
@@ -20,4 +21,21 @@ export class UtilsService {
 	static getNameFromLocalStorage(): string {
 		return localStorage.getItem('name') ?? '';
 	}
+
+	static saveSessionInfoToLocalStorage(sessionId: number, sessionKey: string): void {
+		localStorage.setItem('sessionId', sessionId.toString());
+		localStorage.setItem('sessionKey', sessionKey);
+	}
+
+	static getSessionInfoFromLocalStorage(): Session {
+		return {
+			sessionId: parseInt((localStorage.getItem('sessionId') ?? '-1'), 10),
+			sessionKey: localStorage.getItem('sessionKey') ?? ''
+		}
+	}
+
+	static clearSessionInfo(): void {
+		localStorage.setItem('sessionId', '-1');
+		localStorage.setItem('sessionKey', '');
+	}
 }