Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,6 @@ public Optional<Pessoa> list(@PathVariable int id){

}

@GetMapping("/last")
public List<Pessoa> lastUser() {

return pessoaRepository.findAll();
}

@PostMapping()
@ResponseStatus(code = HttpStatus.CREATED)
public Pessoa register(@RequestBody Pessoa dados) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@
import br.com.entra21.teamroxo.TMSProject.interfaces.PessoaRepository;
import br.com.entra21.teamroxo.TMSProject.template.Login;
import br.com.entra21.teamroxo.TMSProject.template.Pessoa;
import br.com.entra21.teamroxo.TMSProject.template.Register;

@RestController
@CrossOrigin(origins = "*")
@RequestMapping("/register")
public class RegisterController {

private final String PATH = "http://localhost:8080/register";

@Autowired
private PessoaRepository pessoaRepository;
Expand All @@ -32,17 +31,17 @@ public class RegisterController {

@PostMapping()
@ResponseStatus(code = HttpStatus.CREATED)
public @ResponseBody Pessoa register(@RequestBody Pessoa credentials){

return pessoaRepository.save(credentials);
public @ResponseBody Login register(@RequestBody Register credentials){

}

@PostMapping("/login")
@ResponseStatus(code = HttpStatus.CREATED)
public Login registerLogin(@RequestBody Login credentials) {
Pessoa pessoa = new Pessoa();
Login login = new Login();

return loginRepository.save(credentials);
pessoa.setNome(credentials.getNome());
pessoa.setEmail(credentials.getEmail());
login.setPessoa_id(pessoaRepository.save(pessoa).getId());
login.setUser(credentials.getUser());
login.setSenha(credentials.getSenha());
return loginRepository.save(login);

}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package br.com.entra21.teamroxo.TMSProject.template;

public class Register {

private String nome;
private String user;
private String email;
private String senha;

public Register() {
super();
}

public Register(String nome, String user, String email, String senha) {
super();
this.nome = nome;
this.user = user;
this.email = email;
this.senha = senha;
}

public String getNome() {
return nome;
}

public void setNome(String nome) {
this.nome = nome;
}

public String getUser() {
return user;
}

public void setUser(String user) {
this.user = user;
}

public String getEmail() {
return email;
}

public void setEmail(String email) {
this.email = email;
}

public String getSenha() {
return senha;
}

public void setSenha(String senha) {
this.senha = senha;
}

}
39 changes: 4 additions & 35 deletions frontend/main/src/app/loginservice.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,14 @@ export class LoginserviceService implements CanActivate {

this.progress = true

let userId!:number;

let build:any = {
'nome':name,
'user':user,
'email':email,
'senha':password
}

let buildPessoa:any = {
'nome':name,
'email':email
}

this.http.post(this.TMSLoginAPI+'/register', buildPessoa)
this.http.post(this.TMSLoginAPI+'/register', build)
.pipe(
catchError((error)=>{
return error
Expand All @@ -71,33 +66,7 @@ export class LoginserviceService implements CanActivate {
return response
})

this.http.get(this.TMSLoginAPI +'/user/last')
.subscribe((response:any)=>{
console.log(response);

userId = response.id
})

let buildLogin:any = {
'user':user,
'senha':password,
'admin': 0,
'enterprise': 0,
'pessoa_id': userId
}

this.http.post(this.TMSLoginAPI+'/register/login', buildLogin)
.pipe(
catchError((error)=>{
return error
})
)
.subscribe((response)=>{
this.user = name
return response
})

return this.http.post(this.TMSLoginAPI +'/login', build)
return this.http.get(this.TMSLoginAPI +'/login', build)

}

Expand Down