s426135/session-companion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'SES-114 Adder Errors to register view and user can no longer register with two different passwords' (#40) from SES-114 into dev

Browse Source 
Reviewed-on: #40
This commit is contained in:
Natalia Gawron 2020-12-27 22:13:16 +01:00
commit 7e083c3024
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
SessionCompanion/SessionCompanion/ClientApp/src/app/components/registration/registration.component.ts
View File

@ -6,7 +6,6 @@ import {Subscription} from 'rxjs';
import {ErrorResponse} from '../../../types/ErrorResponse'; import {ErrorResponse} from '../../../types/ErrorResponse';
import {UserRegisterViewModel} from '../../../types/viewmodels/user-viewmodels/UserRegisterViewModel'; import {UserRegisterViewModel} from '../../../types/viewmodels/user-viewmodels/UserRegisterViewModel';
import {HttpErrorResponse} from '@angular/common/http'; import {HttpErrorResponse} from '@angular/common/http';
import {type} from 'os';
@Component({ @Component({
selector: 'app-registration', selector: 'app-registration',
@ -36,27 +35,33 @@ export class RegistrationComponent implements OnDestroy {
} }
Register() { Register() {
const userRegisterModel = new class implements UserRegisterViewModel { if (this.signUpFormGroup.valid) {
password: string; const userRegisterModel = new class implements UserRegisterViewModel {
username: string; password: string;
}; username: string;
};
userRegisterModel.username = this.signUpFormGroup.get('newAccount').value['username']; userRegisterModel.username = this.signUpFormGroup.get('newAccount').value['username'];
userRegisterModel.password = this.signUpFormGroup.get('newAccount').value['password']; userRegisterModel.password = this.signUpFormGroup.get('newAccount').value['password'];
this.allSubscriptions.add( this.allSubscriptions.add(
this.userService.registerUser(userRegisterModel).subscribe( this.userService.registerUser(userRegisterModel).subscribe(
() => { () => {
this.router.navigate(['login']); this.router.navigate(['login']);
}, },
(error: ErrorResponse | HttpErrorResponse) => { (error: ErrorResponse | HttpErrorResponse) => {
if (error instanceof HttpErrorResponse) { if (error instanceof HttpErrorResponse) {
error = error.error as ErrorResponse; error = error.error as ErrorResponse;
}
this.apiError = true;
this.apiErrorMessage = error.message;
} }
this.apiError = true; ));
this.apiErrorMessage = error.message; } else {
} this.signUpFormGroup.get('newAccount').get('username').markAsTouched();
)); this.signUpFormGroup.get('newAccount').get('password').markAsTouched();
this.signUpFormGroup.get('newAccount').get('confirmPassword').markAsTouched();
}
} }
ngOnDestroy() { ngOnDestroy() {