diff --git a/frontend/src/app/services/auth/auth.service.ts b/frontend/src/app/services/auth/auth.service.ts index a740fe4..fa68650 100644 --- a/frontend/src/app/services/auth/auth.service.ts +++ b/frontend/src/app/services/auth/auth.service.ts @@ -1,9 +1,6 @@ import { Injectable } from '@angular/core'; import {Observable} from "rxjs"; import {JSdata, MessageService} from "../message/message.service"; -import {HttpClient} from "@angular/common/http"; - - @Injectable({ providedIn: 'root' @@ -14,29 +11,29 @@ export class AuthService { // @ts-ignore islog: boolean; + constructor(private messageService: MessageService) { } - constructor( - private http: HttpClient, - private MS: MessageService - ) {} + getLogged(): boolean { + return this.islog; + } + + setLogged(value: boolean): void { + this.islog = value; + } sendAuthentication(login: string, password: string): Observable { - const data = new FormData(); - if (login !== null && login !== undefined && password !== null && password !== undefined) { - data.append(login, password); - } - return this.MS.sendMessage('checkLogin', { - login : login, - Password: password + return this.messageService.sendMessage('checkLogin', { + 'login': login, + 'password': password }); } - finalizeAuthentication(data: JSdata): void{ - if (data.status === 'ok') { - this.islog = true; - } else { - this.islog = false; + finalizeAuthentication(data: JSdata): void { + if (data.status === 'ok'){ + this.setLogged(true); + } + else{ + this.setLogged(false); } } - }