diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/PessoaController.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/PessoaController.java index b7a8ed9..fb80d71 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/PessoaController.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/PessoaController.java @@ -2,6 +2,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Optional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -40,9 +41,11 @@ public class PessoaController { return obterListaCompleta(); } - @GetMapping("/{user}") - public Listlist(@PathVariable String user){ - return null; + @GetMapping("/{id}") + public Optional list(@PathVariable int id){ + + return pessoaRepository.findById(id); + } private List obterListaCompleta() { diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/Login.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/Login.java index 4200137..ab8c655 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/Login.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/template/Login.java @@ -17,18 +17,20 @@ public class Login extends MaturidadeNivel3Richardson { private String senha; private boolean admin; private boolean enterprise; + private Integer pessoa_id; public Login() { super(); } - public Login(Integer id, String user, String senha, boolean admin, boolean enterprise) { + public Login(Integer id, String user, String senha, boolean admin, boolean enterprise, Integer pessoa_id) { super(); this.id = id; this.user = user; this.senha = senha; this.admin = admin; this.enterprise = enterprise; + this.pessoa_id = pessoa_id; } public Integer getId() { @@ -69,6 +71,14 @@ public boolean isEnterprise() { public void setEnterprise(boolean enterprise) { this.enterprise = enterprise; + } + + public Integer getPessoa_id() { + return pessoa_id; + } + + public void setPessoa_id(Integer pessoa_id) { + this.pessoa_id = pessoa_id; } } diff --git a/frontend/main/src/app/login/login.component.ts b/frontend/main/src/app/login/login.component.ts index cc04348..390646b 100644 --- a/frontend/main/src/app/login/login.component.ts +++ b/frontend/main/src/app/login/login.component.ts @@ -28,13 +28,16 @@ export class LoginComponent implements OnInit { submit():void{ if(this.user != null && this.password != null){ this.loginService.logging(this.user, this.password) - .pipe( - catchError((error)=>{ - return of([error]) - }) - ) - .subscribe((response)=>{ - console.log('Running...', response); + .pipe() + .subscribe((response:any)=>{ + console.log('Running...', response) + if(response == ""){ + this.loginService.progress = false; + alert("USUARIO OU SENHA ERRADOS") + }else{ + this.loginService.succeed = true + this.gotoHome() + } }); }else{ alert('DIGITE TODOS OS CAMPOS OBRIGATÓRIOS!') diff --git a/frontend/main/src/app/loginservice.service.ts b/frontend/main/src/app/loginservice.service.ts index 86c3c97..f1437a2 100644 --- a/frontend/main/src/app/loginservice.service.ts +++ b/frontend/main/src/app/loginservice.service.ts @@ -18,23 +18,31 @@ export class LoginserviceService implements CanActivate { constructor(private router: Router, private http: HttpClient) { } logging(user: string, password: string) { + this.progress = true - fetch(this.TMSLoginAPI) - .then((resp) => resp.json()) - .then((data) => { - let ranUsers = data.results; - return ranUsers.map((ranUser: any) => { - this.user = `${ranUser.name.first}` - this.succeed = true - new LoginComponent(this.router, this).gotoHome() - }) - }) - .catch((error) => { - console.log(error); + + let build:any = { + 'user':user, + 'senha':password + } + + this.http.post(this.TMSLoginAPI +'/login', build) + .pipe( + catchError((error)=>{ this.progress = false + return error }) + ) + .subscribe((response:any)=>{ + this.http.get(this.TMSLoginAPI+'/user/'+response[0].pessoa_id) + .subscribe((resp:any) =>{ + console.log(resp); + this.user = resp.nome + }) + return response + }) - return this.http.get(this.TMSLoginAPI + '/' + user + '/' + password) + return this.http.post(this.TMSLoginAPI +'/login', build) } registering(name:string ,user: string, password: string, email: string) {