diff --git a/angular/src/app/_services/account.service.ts b/angular/src/app/_services/account.service.ts index 84defb6..9234d09 100644 --- a/angular/src/app/_services/account.service.ts +++ b/angular/src/app/_services/account.service.ts @@ -6,6 +6,7 @@ import { map } from 'rxjs/operators'; import { environment } from '@environments/environment'; import { User } from '@app/_models'; +import {LoginCheckService} from "@app/core/api/v1"; @Injectable({ providedIn: 'root' }) export class AccountService { @@ -15,7 +16,8 @@ export class AccountService { constructor( private router: Router, - private http: HttpClient + private http: HttpClient, + private loginCheckService: LoginCheckService ) { this.userSubject = new BehaviorSubject(JSON.parse(localStorage.getItem('user')!)); this.user = this.userSubject.asObservable(); @@ -26,13 +28,22 @@ export class AccountService { } login(email: string, password: string) { - return this.http.post(`${environment.apiUrl}/auth`, { email, password }) - .pipe(map(user => { - // store user details and jwt token in local storage to keep user logged in between page refreshes - localStorage.setItem('user', JSON.stringify(user)); - this.userSubject.next(user); - return user; - })); + return this.loginCheckService.checkPost( + { email, password } + ).pipe(map(user => { + // store user details and jwt token in local storage to keep user logged in between page refreshes + localStorage.setItem('user', JSON.stringify(user)); + this.userSubject.next(user); + return user; + })); + // + // return this.http.post(`${environment.apiUrl}/auth`, { email, password }) + // .pipe(map(user => { + // // store user details and jwt token in local storage to keep user logged in between page refreshes + // localStorage.setItem('user', JSON.stringify(user)); + // this.userSubject.next(user); + // return user; + // })); } logout() { diff --git a/httpdocs/README.md b/httpdocs/README.md index 54ff75b..0e3a15c 100644 --- a/httpdocs/README.md +++ b/httpdocs/README.md @@ -146,6 +146,8 @@ telnet: Unable to connect to remote host: Connection refused https://api-platform.com/docs/core/file-upload/ https://github.com/dustin10/VichUploaderBundle/blob/master/docs/index.md + - TOKEN auf Terminal generieren: bin/console lexik:jwt:generate-token {user-email} + # List Routes and Service Tags - ddev exec bin/console debug:router - ddev exec bin/console debug:container