Skip to content
This repository was archived by the owner on Dec 19, 2022. It is now read-only.

Commit 7109b53

Browse files
author
Schneider
committed
endpoint user
1 parent 813f414 commit 7109b53

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed

src/main/java/com/scriptql/scriptqlapi/controllers/UserController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.scriptql.scriptqlapi.controllers;
22

33
import com.scriptql.scriptqlapi.services.UserService;
4-
import com.scriptql.scriptqlapi.utils.entities.User;
4+
import com.scriptql.scriptqlapi.entities.User;
55
import org.springframework.web.bind.annotation.RequestMapping;
66
import org.springframework.web.bind.annotation.RestController;
77

Original file line numberDiff line numberDiff line change
@@ -1,21 +1,28 @@
1-
package com.scriptql.scriptqlapi.utils.entities;
1+
package com.scriptql.scriptqlapi.entities;
22

33
import lombok.Data;
44

55
import javax.persistence.Entity;
6+
import javax.persistence.Id;
67
import javax.persistence.Table;
78
import javax.validation.constraints.NotEmpty;
89

910
@Data
1011
@Entity
11-
@Table(name = "user")
12-
public class User extends AbstractEntity {
12+
@Table(name = "users")
13+
public class User implements IEntity {
14+
15+
@Id
16+
private long id;
1317

1418
@NotEmpty
1519
private String login;
20+
21+
@NotEmpty
1622
private String name;
1723

1824
@NotEmpty
1925
private String password;
26+
private String salt;
2027

2128
}

src/main/java/com/scriptql/scriptqlapi/repositories/UserRepository.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.scriptql.scriptqlapi.repositories;
22

3-
import com.scriptql.scriptqlapi.utils.entities.User;
3+
import com.scriptql.scriptqlapi.entities.User;
44

55
import java.util.Optional;
66

src/main/java/com/scriptql/scriptqlapi/services/UserService.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
package com.scriptql.scriptqlapi.services;
22

3+
import com.scriptql.scriptqlapi.entities.User;
34
import com.scriptql.scriptqlapi.repositories.UserRepository;
45
import com.scriptql.scriptqlapi.utils.Snowflake;
5-
import com.scriptql.scriptqlapi.utils.entities.User;
66
import org.springframework.security.crypto.bcrypt.BCrypt;
77
import org.springframework.stereotype.Service;
88

9+
import java.util.UUID;
10+
911
@Service
1012
public class UserService extends AbstractService<User> {
1113

12-
private static final String SALT = "PAO DE BATATA COM AZEITONA";
13-
1414
public UserService(UserRepository repository, Snowflake snowflake) {
1515
super(repository, snowflake);
1616
}
1717

1818
@Override
1919
public User create(User user) {
20-
user.setPassword(BCrypt.hashpw(user.getPassword(), SALT));
20+
user.setSalt(UUID.randomUUID().toString().substring(0, 25));
21+
user.setPassword(BCrypt.hashpw(user.getPassword(), user.getSalt()));
2122
return super.create(user);
2223
}
2324

0 commit comments

Comments
 (0)