From b9928d6ce002c661e6cb4224098085af26e477ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20G=C3=B3reczny?= <lukgor@st.amu.edu.pl>
Date: Sun, 13 Dec 2020 11:19:01 +0100
Subject: [PATCH 1/3] SES-89 Added api connection  service and display error

---
 .../ClientApp/src/app.routing.ts              |  6 +++++
 .../ClientApp/src/app/app.module.ts           |  7 ++++-
 .../components/sign-in/sign-in.component.html | 11 +++++---
 .../components/sign-in/sign-in.component.ts   | 17 +++++++++---
 .../ClientApp/src/services/user.service.ts    | 22 +++++++++++++++
 .../ClientApp/src/types/Either.ts             |  5 ++++
 .../ClientApp/src/types/ErrorResponse.ts      |  4 +++
 .../Controllers/UserController.cs             | 27 ++++++++++++++++---
 .../SessionCompanion/SessionCompanion.xml     |  8 ++++++
 9 files changed, 95 insertions(+), 12 deletions(-)
 create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/services/user.service.ts
 create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/types/Either.ts
 create mode 100644 SessionCompanion/SessionCompanion/ClientApp/src/types/ErrorResponse.ts

diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts
index 344501c..a2f9ceb 100644
--- a/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts
+++ b/SessionCompanion/SessionCompanion/ClientApp/src/app.routing.ts
@@ -3,6 +3,7 @@ import { SelectRoleComponent } from './app/components/select-role/select-role.co
 import { SignInComponent } from './app/components/sign-in/sign-in.component';
 import { RegistrationComponent } from './app/components/registration/registration.component';
 import {GameMasterDashboardComponent} from './app/components/game-master-dashboard/game-master-dashboard.component';
+import {PlayerDashboardComponent} from './app/components/player-dashboard/player-dashboard.component';
 
 const routes: Routes = [
   {
@@ -24,6 +25,11 @@ const routes: Routes = [
     path: 'gamemaster',
     component: GameMasterDashboardComponent,
     pathMatch: 'full'
+  },
+  {
+    path: 'player',
+    component: PlayerDashboardComponent,
+    pathMatch: 'full'
   }
 ];
 
diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts
index 5587ba6..c0eccab 100644
--- a/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts
+++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/app.module.ts
@@ -9,6 +9,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { SignInComponent } from './components/sign-in/sign-in.component';
 import { RegistrationComponent } from './components/registration/registration.component';
 import { GameMasterDashboardComponent} from './components/game-master-dashboard/game-master-dashboard.component';
+import {PlayerDashboardComponent} from './components/player-dashboard/player-dashboard.component';
 import {
   MatCardModule,
   MatTabsModule,
@@ -18,6 +19,7 @@ import {
   MatCheckboxModule,
   MatIconModule, MatSidenavModule, MatToolbarModule, MatListModule
 } from '@angular/material';
+import {UserService} from '../services/user.service';
 
 @NgModule({
   declarations: [
@@ -26,6 +28,7 @@ import {
     SignInComponent,
     RegistrationComponent,
     GameMasterDashboardComponent,
+    PlayerDashboardComponent
   ],
   imports: [
 BrowserModule.withServerTransition({ appId: 'ng-cli-universal' }),
@@ -45,7 +48,9 @@ BrowserModule.withServerTransition({ appId: 'ng-cli-universal' }),
     MatToolbarModule,
     MatListModule,
   ],
-  providers: [],
+  providers: [
+    UserService
+  ],
   bootstrap: [AppComponent]
 })
 export class AppModule { }
diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.html
index efeb015..d9feec4 100644
--- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.html
+++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.html
@@ -6,7 +6,7 @@
       <mat-form-field class="form-container">
         <input
           matInput
-          formControlName="username" 
+          formControlName="username"
           placeholder="Username"
           type="text"
           required
@@ -18,9 +18,9 @@
       </mat-form-field>
 
       <mat-form-field class="form-container">
-        <input 
-          matInput 
-          formControlName="password" 
+        <input
+          matInput
+          formControlName="password"
           required
           placeholder="Password"
           type="password"
@@ -31,6 +31,9 @@
         </mat-error>
       </mat-form-field>
 
+      <mat-error *ngIf="apiError">
+        {{apiErrorMessage}}
+      </mat-error>
       <button
         mat-raised-button
         class="btn-primary form-container"
diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.ts
index bb7c5af..61488ad 100644
--- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.ts
+++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.ts
@@ -1,6 +1,7 @@
 import { Component } from '@angular/core';
 import { FormGroup, Validators, FormBuilder } from '@angular/forms';
 import { Router } from '@angular/router';
+import {UserService} from '../../../services/user.service';
 
 @Component({
   selector: 'app-sign-in',
@@ -9,8 +10,10 @@ import { Router } from '@angular/router';
 })
 export class SignInComponent {
   isExpanded = false;
+  apiError = false;
+  apiErrorMessage = '';
 
-  constructor(private router: Router, private formBuilder: FormBuilder) {}
+  constructor(private router: Router, private formBuilder: FormBuilder, private userService: UserService) {}
 
   public signInFormGroup: FormGroup = this.formBuilder.group({
     signIn: this.formBuilder.group({
@@ -21,8 +24,16 @@ export class SignInComponent {
     })
   });
 
-  onLoginButtonClick(){
-    //TODO connect with backend and added router
+  async onLoginButtonClick() {
+    const result = await this.userService.tryLogin(
+      this.signInFormGroup.get('signIn').value['username'],
+      this.signInFormGroup.get('signIn').value['password']);
+    if (result.isLeft) {
+      await this.router.navigate(['player']);
+    } else {
+      this.apiError = true;
+      this.apiErrorMessage = result.right.message;
+    }
   }
 
   onRegisterButtonClick(){
diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/services/user.service.ts b/SessionCompanion/SessionCompanion/ClientApp/src/services/user.service.ts
new file mode 100644
index 0000000..08718fe
--- /dev/null
+++ b/SessionCompanion/SessionCompanion/ClientApp/src/services/user.service.ts
@@ -0,0 +1,22 @@
+import {Inject, Injectable} from '@angular/core';
+import {HttpClient, HttpParams} from '@angular/common/http';
+import {Observable} from 'rxjs';
+import {ErrorResponse} from '../types/ErrorResponse';
+import {Either} from '../types/Either';
+
+Injectable({
+  providedIn: 'root'
+})
+export class UserService {
+  private baseUrl = 'api/user/';
+  constructor(private http: HttpClient, @Inject('BASE_URL') baseUrl: string) {
+    this.baseUrl = baseUrl + this.baseUrl;
+  }
+
+  async tryLogin(login: string, password: string): Promise<Either<number, ErrorResponse>> {
+    const params = new HttpParams()
+      .set('userName', login)
+      .set('password', password);
+     return await this.http.get<Either<number, ErrorResponse>>(this.baseUrl + 'login', { params }).toPromise();
+  }
+}
diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/types/Either.ts b/SessionCompanion/SessionCompanion/ClientApp/src/types/Either.ts
new file mode 100644
index 0000000..9fc3031
--- /dev/null
+++ b/SessionCompanion/SessionCompanion/ClientApp/src/types/Either.ts
@@ -0,0 +1,5 @@
+export interface Either<TL, TR> {
+  left: TL;
+  right: TR;
+  isLeft: boolean;
+}
diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/types/ErrorResponse.ts b/SessionCompanion/SessionCompanion/ClientApp/src/types/ErrorResponse.ts
new file mode 100644
index 0000000..c85a9e8
--- /dev/null
+++ b/SessionCompanion/SessionCompanion/ClientApp/src/types/ErrorResponse.ts
@@ -0,0 +1,4 @@
+export interface ErrorResponse {
+  code: number;
+  message: string;
+}
diff --git a/SessionCompanion/SessionCompanion/Controllers/UserController.cs b/SessionCompanion/SessionCompanion/Controllers/UserController.cs
index 00dff03..0c37ab4 100644
--- a/SessionCompanion/SessionCompanion/Controllers/UserController.cs
+++ b/SessionCompanion/SessionCompanion/Controllers/UserController.cs
@@ -4,6 +4,10 @@ using System.Threading.Tasks;
 
 namespace SessionCompanion.Controllers
 {
+    using SessionCompanion.Extensions.EitherType;
+    using SessionCompanion.ViewModels.ApiResponses;
+    using SessionCompanion.ViewModels.UserViewModels;
+
     [Route("api/user")]
     [ApiController]
     public class UserController : Controller
@@ -15,12 +19,27 @@ namespace SessionCompanion.Controllers
             this._service = service;
         }
 
+        /// <summary>
+        /// Metoda przyjmuje login oraz hasło i sprawdza czy istnieje użytkownik o podanych parametrach
+        /// </summary>
+        /// <param name="userName"> Nazwa użytkownika </param>
+        /// <param name="password"> Hasło </param>
+        /// <returns>Id użytkownika lub wiadomość błędu</returns>
         [HttpGet("login")]
-        public async Task<IActionResult> Login(string userName, string password)
+        public async Task<Either<int, ErrorResponse>> Login(string userName, string password)
         {
-            var User = await _service.SearchUserByNickname(userName);
-            if (User.Password == password) { return Json(User.Id); }
-            return BadRequest();
+            UserViewModel user = await _service.SearchUserByNickname(userName);
+
+            if (user != null && user.Password.Equals(password))
+            {
+                return user.Id;
+            }
+
+            return new ErrorResponse()
+                       {
+                           StatusCode = 403,
+                           Message = "User name not found or incorrect password"
+            };
         }
     }
 }
\ No newline at end of file
diff --git a/SessionCompanion/SessionCompanion/SessionCompanion.xml b/SessionCompanion/SessionCompanion/SessionCompanion.xml
index e075b64..52d4274 100644
--- a/SessionCompanion/SessionCompanion/SessionCompanion.xml
+++ b/SessionCompanion/SessionCompanion/SessionCompanion.xml
@@ -11,6 +11,14 @@
             <param name="id">Identyfikator postaci</param>
             <returns>ViewModel Postaci</returns>
         </member>
+        <member name="M:SessionCompanion.Controllers.UserController.Login(System.String,System.String)">
+            <summary>
+            Metoda przyjmuje login oraz hasło i sprawdza czy istnieje użytkownik o podanych parametrach
+            </summary>
+            <param name="userName"> Nazwa użytkownika </param>
+            <param name="password"> Hasło </param>
+            <returns>Id użytkownika lub wiadomość błędu</returns>
+        </member>
         <member name="F:SessionCompanion.Hubs.SessionHub.ConnectedCharacters">
             <summary>
             Lista zalogowanych graczy i identyfikator wybranej postaci

From 1412362b79b4735c4385af64d10e16e7e6da7d31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20G=C3=B3reczny?= <lukgor@st.amu.edu.pl>
Date: Sun, 13 Dec 2020 13:05:08 +0100
Subject: [PATCH 2/3] SES-89 Switched to subscribe

---
 .../registration/registration.component.html  | 24 +++++++-------
 .../components/sign-in/sign-in.component.ts   | 33 ++++++++++++-------
 .../ClientApp/src/services/user.service.ts    | 15 +++++++--
 3 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.html
index 1f23ca5..54f6124 100644
--- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.html
+++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.html
@@ -2,11 +2,11 @@
     <div formGroupName="newAccount" class="container">
       <mat-icon matSuffix class="arrow-back" (click)="GoToLoginPage()">arrow_back</mat-icon>
       <div class="primary-text header">Create an Account</div>
-      
+
       <mat-form-field class="form-container">
         <input
           matInput
-          formControlName="username" 
+          formControlName="username"
           placeholder="Username"
           type="text"
           required
@@ -18,12 +18,12 @@
       </mat-form-field>
 
       <mat-form-field class="form-container">
-        <input 
-          matInput 
-          formControlName="password" 
+        <input
+          matInput
+          formControlName="password"
           required
           placeholder="Password"
-          type="password"
+          [type]="true ? 'password' : 'text'"
           name="password"/>
         <mat-icon matSuffix>lock</mat-icon>
         <mat-error *ngIf="signUpFormGroup?.get('newAccount')?.controls?.password?.hasError('required')">
@@ -32,12 +32,12 @@
       </mat-form-field>
 
       <mat-form-field class="form-container">
-        <input 
-          matInput 
-          formControlName="confirmPassword" 
-          required 
+        <input
+          matInput
+          formControlName="confirmPassword"
+          required
           placeholder="Confirm Password"
-          type="password"
+          [type]="true ? 'password' : 'text'"
           name="confirmPassword"/>
         <mat-icon matSuffix >lock</mat-icon>
         <mat-error *ngIf="signUpFormGroup?.get('newAccount')?.controls?.confirmPassword?.hasError('required')">
@@ -55,4 +55,4 @@
         <mat-icon matSuffix class="arrow-forward">arrow_forward</mat-icon>
       </button>
     </div>
-  </div>
\ No newline at end of file
+  </div>
diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.ts b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.ts
index 61488ad..aba66e0 100644
--- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.ts
+++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/sign-in/sign-in.component.ts
@@ -1,14 +1,18 @@
-import { Component } from '@angular/core';
+import { Component, OnDestroy } from '@angular/core';
 import { FormGroup, Validators, FormBuilder } from '@angular/forms';
 import { Router } from '@angular/router';
 import {UserService} from '../../../services/user.service';
+import {ErrorResponse} from '../../../types/ErrorResponse';
+import {Subscription} from 'rxjs';
 
 @Component({
   selector: 'app-sign-in',
   templateUrl: './sign-in.component.html',
   styleUrls: ['./sign-in.component.css']
 })
-export class SignInComponent {
+export class SignInComponent implements OnDestroy {
+  allSubscriptions = new Subscription();
+
   isExpanded = false;
   apiError = false;
   apiErrorMessage = '';
@@ -24,16 +28,19 @@ export class SignInComponent {
     })
   });
 
-  async onLoginButtonClick() {
-    const result = await this.userService.tryLogin(
+  onLoginButtonClick() {
+    this.allSubscriptions.add(
+      this.userService.tryLogin(
       this.signInFormGroup.get('signIn').value['username'],
-      this.signInFormGroup.get('signIn').value['password']);
-    if (result.isLeft) {
-      await this.router.navigate(['player']);
-    } else {
-      this.apiError = true;
-      this.apiErrorMessage = result.right.message;
-    }
+      this.signInFormGroup.get('signIn').value['password']).subscribe(
+      (success) => {
+        this.router.navigate(['player']);
+      },
+      (error: ErrorResponse) => {
+        this.apiError = true;
+        this.apiErrorMessage = error.message;
+      }
+    ));
   }
 
   onRegisterButtonClick(){
@@ -52,4 +59,8 @@ export class SignInComponent {
   toggle() {
     this.isExpanded = !this.isExpanded;
   }
+
+  ngOnDestroy() {
+    this.allSubscriptions.unsubscribe();
+  }
 }
diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/services/user.service.ts b/SessionCompanion/SessionCompanion/ClientApp/src/services/user.service.ts
index 08718fe..fda8c51 100644
--- a/SessionCompanion/SessionCompanion/ClientApp/src/services/user.service.ts
+++ b/SessionCompanion/SessionCompanion/ClientApp/src/services/user.service.ts
@@ -1,8 +1,9 @@
 import {Inject, Injectable} from '@angular/core';
 import {HttpClient, HttpParams} from '@angular/common/http';
-import {Observable} from 'rxjs';
+import {Observable, of, throwError} from 'rxjs';
 import {ErrorResponse} from '../types/ErrorResponse';
 import {Either} from '../types/Either';
+import {switchMap} from 'rxjs/operators';
 
 Injectable({
   providedIn: 'root'
@@ -13,10 +14,18 @@ export class UserService {
     this.baseUrl = baseUrl + this.baseUrl;
   }
 
-  async tryLogin(login: string, password: string): Promise<Either<number, ErrorResponse>> {
+  tryLogin(login: string, password: string): Observable<number> {
     const params = new HttpParams()
       .set('userName', login)
       .set('password', password);
-     return await this.http.get<Either<number, ErrorResponse>>(this.baseUrl + 'login', { params }).toPromise();
+     return this.http.get<Either<number, ErrorResponse>>(this.baseUrl + 'login', { params }).pipe(
+       switchMap(response => {
+         if (response.isLeft) {
+           return of(response.left);
+         } else {
+           return throwError(response.right);
+         }
+       })
+     );
   }
 }

From 57759fb91e0f7239a878afe28cf1875496547864 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20G=C3=B3reczny?= <lukgor@st.amu.edu.pl>
Date: Sun, 13 Dec 2020 13:27:45 +0100
Subject: [PATCH 3/3] SES-89 type change

---
 .../app/components/registration/registration.component.html   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.html b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.html
index 54f6124..4c1caa0 100644
--- a/SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.html
+++ b/SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.html
@@ -23,7 +23,7 @@
           formControlName="password"
           required
           placeholder="Password"
-          [type]="true ? 'password' : 'text'"
+          type="password"
           name="password"/>
         <mat-icon matSuffix>lock</mat-icon>
         <mat-error *ngIf="signUpFormGroup?.get('newAccount')?.controls?.password?.hasError('required')">
@@ -37,7 +37,7 @@
           formControlName="confirmPassword"
           required
           placeholder="Confirm Password"
-          [type]="true ? 'password' : 'text'"
+          type="password"
           name="confirmPassword"/>
         <mat-icon matSuffix >lock</mat-icon>
         <mat-error *ngIf="signUpFormGroup?.get('newAccount')?.controls?.confirmPassword?.hasError('required')">