Convert observables to signals.
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
import { Injectable, inject } from '@angular/core';
|
||||
import { SigninRequest } from '../../core/rest-services/user/model/signin.model';
|
||||
import { FormError } from '../../core/model/FormError';
|
||||
import { BehaviorSubject, Observable } from 'rxjs';
|
||||
import { copy } from '../../core/utils/ObjectUtils';
|
||||
import { UserRestService } from '../../core/rest-services/user/user.rest-service';
|
||||
import { MatSnackBar } from '@angular/material/snack-bar';
|
||||
import { Router } from '@angular/router';
|
||||
import { LoginService } from '../login/login.service';
|
||||
import {inject, Injectable} from '@angular/core';
|
||||
import {SigninRequest} from '../../core/rest-services/user/model/signin.model';
|
||||
import {FormError} from '../../core/model/FormError';
|
||||
import {BehaviorSubject, Observable} from 'rxjs';
|
||||
import {copy} from '../../core/utils/ObjectUtils';
|
||||
import {UserRestService} from '../../core/rest-services/user/user.rest-service';
|
||||
import {MatSnackBar} from '@angular/material/snack-bar';
|
||||
import {Router} from '@angular/router';
|
||||
import {LoginService} from '../login/login.service';
|
||||
|
||||
export interface SigninState {
|
||||
request: SigninRequest;
|
||||
@@ -74,12 +74,12 @@ export class SigninService {
|
||||
state.confirmPassword = newConfirmPassword;
|
||||
|
||||
if (state.request.password !== state.confirmPassword) {
|
||||
const confirmPasswordError: FormError = {
|
||||
fieldName: 'confirmPassword',
|
||||
errorMessage: $localize`Typed passwords are different.`
|
||||
}
|
||||
state.errors.filter(error => error.fieldName !== 'confirmPassword');
|
||||
state.errors.push(confirmPasswordError)
|
||||
const confirmPasswordError: FormError = {
|
||||
fieldName: 'confirmPassword',
|
||||
errorMessage: $localize`Typed passwords are different.`
|
||||
}
|
||||
state.errors.filter(error => error.fieldName !== 'confirmPassword');
|
||||
state.errors.push(confirmPasswordError)
|
||||
}
|
||||
|
||||
this.save(state);
|
||||
@@ -91,12 +91,12 @@ export class SigninService {
|
||||
// Check state is valid
|
||||
|
||||
this.userRestService
|
||||
.signin(state.request)
|
||||
.then(() => {
|
||||
this.loginService.editEmail(state.request.email!!);
|
||||
this.loginService.editPassword(state.request.password!!);
|
||||
.signin(state.request)
|
||||
.then(() => {
|
||||
this.loginService.editEmail(state.request.email!!);
|
||||
this.loginService.editPassword(state.request.password!!);
|
||||
|
||||
this.loginService.performLogin();
|
||||
})
|
||||
this.loginService.performLogin();
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user