Skip to content

Commit 4ae6486

Browse files
marcusfifthmarcusfifth
committed
first commit
1 parent 3c425d7 commit 4ae6486

File tree

11 files changed

+154
-95
lines changed

11 files changed

+154
-95
lines changed

‎.DS_Store

8 KB
Binary file not shown.

‎src/.DS_Store

6 KB
Binary file not shown.

‎src/main/java/com/bezkoder/springjwt/controllers/AuthController.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import com.bezkoder.springjwt.security.jwt.JwtUtils;
3333
import com.bezkoder.springjwt.security.services.UserDetailsImpl;
3434

35-
@CrossOrigin(origins = "*", maxAge = 3600)
35+
@CrossOrigin(origins = "*")
3636
@RestController
3737
@RequestMapping("/api/auth")
3838
public class AuthController {
@@ -74,21 +74,21 @@ public ResponseEntity<?> authenticateUser(@Valid @RequestBody LoginRequest login
7474

7575
@PostMapping("/signup")
7676
public ResponseEntity<?> registerUser(@Valid @RequestBody SignupRequest signUpRequest) {
77-
if (userRepository.existsByUsername(signUpRequest.getUsername())) {
77+
if (userRepository.existsByNom(signUpRequest.getNom())) {
7878
return ResponseEntity
7979
.badRequest()
8080
.body(new MessageResponse("Error: Username is already taken!"));
8181
}
8282

83-
if (userRepository.existsByEmail(signUpRequest.getEmail())) {
83+
if (userRepository.existsByUsername(signUpRequest.getUsername())) {
8484
return ResponseEntity
8585
.badRequest()
8686
.body(new MessageResponse("Error: Email is already in use!"));
8787
}
8888

8989
// Create new user's account
90-
User user = new User(signUpRequest.getUsername(),
91-
signUpRequest.getEmail(),
90+
User user = new User(signUpRequest.getNom(),
91+
signUpRequest.getUsername(),
9292
encoder.encode(signUpRequest.getPassword()));
9393

9494
Set<String> strRoles = signUpRequest.getRole();

‎src/main/java/com/bezkoder/springjwt/models/User.java

Lines changed: 119 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -9,81 +9,138 @@
99
import javax.validation.constraints.Size;
1010

1111
@Entity
12-
@Table( name = "users",
13-
uniqueConstraints = {
14-
@UniqueConstraint(columnNames = "username"),
15-
@UniqueConstraint(columnNames = "email")
16-
})
12+
@Table(name = "user")
1713
public class User {
18-
@Id
19-
@GeneratedValue(strategy = GenerationType.IDENTITY)
20-
private Long id;
21-
22-
@NotBlank
23-
@Size(max = 20)
24-
private String username;
25-
26-
@NotBlank
27-
@Size(max = 50)
28-
@Email
29-
private String email;
30-
31-
@NotBlank
32-
@Size(max = 120)
33-
private String password;
34-
35-
@ManyToMany(fetch = FetchType.LAZY)
36-
@JoinTable( name = "user_roles",
37-
joinColumns = @JoinColumn(name = "user_id"),
38-
inverseJoinColumns = @JoinColumn(name = "role_id"))
39-
private Set<Role> roles = new HashSet<>();
40-
41-
public User() {
42-
}
14+
@Id
15+
@GeneratedValue(strategy = GenerationType.IDENTITY)
16+
private Long id;
17+
18+
private String username;
19+
20+
private String nom;
21+
22+
private String nickname;
23+
24+
private String server;
25+
26+
//Modos ---> Fer una taula que tingui id i el modo (1-4) que vol jugar
27+
private Boolean modo_flex;
28+
29+
private Boolean modo_duo;
30+
31+
private Boolean modo_clash;
32+
33+
private Boolean modo_otro;
34+
35+
//Tipos ---> Fer una taula que tingui id i el modo (1-5) que vol jugar
36+
private Boolean tipo_4fun;
37+
38+
private Boolean tipo_tryhard;
39+
40+
private Boolean tipo_champs;
41+
42+
private Boolean tipo_otps;
43+
44+
private Boolean rol_jungle;
45+
46+
//Rols ---> Fer una taula que tingui id i el modo (1-5) que vol jugar
47+
private Boolean rol_top;
48+
49+
private Boolean rol_mid;
50+
51+
private Boolean rol_bot;
52+
53+
private Boolean rol_supp;
54+
55+
private Boolean rol_fill;
56+
57+
// Suposo que faltaria una pels personatges
58+
59+
private String password;
60+
61+
4362

44-
public User(String username, String email, String password) {
63+
@Transient
64+
private String passwordConfirm;
65+
66+
67+
public User() {}
68+
69+
70+
public User(String nom, String username, String password) {
71+
this.nom = nom;
4572
this.username = username;
46-
this.email = email;
4773
this.password = password;
4874
}
4975

50-
public Long getId() {
51-
return id;
52-
}
5376

54-
public void setId(Long id) {
55-
this.id = id;
56-
}
77+
@ManyToMany
78+
private Set<Role> roles;
5779

58-
public String getUsername() {
59-
return username;
60-
}
80+
public Long getId() {
81+
return id;
82+
}
6183

62-
public void setUsername(String username) {
63-
this.username = username;
64-
}
84+
public void setId(Long id) {
85+
this.id = id;
86+
}
6587

66-
public String getEmail() {
67-
return email;
68-
}
88+
public String getNom() {
89+
return nom;
90+
}
6991

70-
public void setEmail(String email) {
71-
this.email = email;
72-
}
92+
public void setNom(String nom) {
93+
this.nom = nom;
94+
}
95+
public String getUsername() {
96+
return username;
97+
}
7398

74-
public String getPassword() {
75-
return password;
76-
}
99+
public void setUsername(String username) {
100+
this.username = username;
101+
}
77102

78-
public void setPassword(String password) {
79-
this.password = password;
80-
}
103+
public String getNickname() {
104+
return nickname;
105+
}
81106

82-
public Set<Role> getRoles() {
83-
return roles;
84-
}
107+
public void setNickname(String nickname) {
108+
this.nickname = nickname;
109+
}
85110

86-
public void setRoles(Set<Role> roles) {
87-
this.roles = roles;
88-
}
111+
public String getServer() {
112+
return server;
113+
}
114+
115+
public void setServer(String server) {
116+
this.server = server;
117+
}
118+
119+
public String getPassword() {
120+
return password;
121+
}
122+
123+
public void setPassword(String password) {
124+
this.password = password;
125+
}
126+
127+
public String getPasswordConfirm() {
128+
return passwordConfirm;
129+
}
130+
131+
public void setPasswordConfirm(String passwordConfirm) {
132+
this.passwordConfirm = passwordConfirm;
133+
}
134+
135+
public Set<Role> getRoles() {
136+
return roles;
137+
}
138+
139+
public void setRoles(Set<Role> roles) {
140+
this.roles = roles;
141+
}
142+
@Override
143+
public String toString() {
144+
return "User{" + "id=" + id + ", name=" + nom + ", email=" + username + ", server=" + server + ", nickname=" + nickname + '}';
145+
}
89146
}

‎src/main/java/com/bezkoder/springjwt/payload/request/SignupRequest.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,33 @@
77
public class SignupRequest {
88
@NotBlank
99
@Size(min = 3, max = 20)
10-
private String username;
10+
private String nom;
1111

1212
@NotBlank
1313
@Size(max = 50)
1414
@Email
15-
private String email;
15+
private String username;
1616

1717
private Set<String> role;
1818

1919
@NotBlank
2020
@Size(min = 6, max = 40)
2121
private String password;
2222

23-
public String getUsername() {
24-
return username;
23+
public String getNom() {
24+
return nom;
2525
}
2626

27-
public void setUsername(String username) {
28-
this.username = username;
27+
public void setNom(String nom) {
28+
this.nom = nom;
2929
}
3030

31-
public String getEmail() {
32-
return email;
31+
public String getUsername() {
32+
return username;
3333
}
3434

35-
public void setEmail(String email) {
36-
this.email = email;
35+
public void setUsername(String username) {
36+
this.username = username;
3737
}
3838

3939
public String getPassword() {

‎src/main/java/com/bezkoder/springjwt/payload/response/JwtResponse.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ public class JwtResponse {
77
private String type = "Bearer";
88
private Long id;
99
private String username;
10-
private String email;
10+
private String nom;
1111
private List<String> roles;
1212

13-
public JwtResponse(String accessToken, Long id, String username, String email, List<String> roles) {
13+
public JwtResponse(String accessToken, Long id, String nom, String username, List<String> roles) {
1414
this.token = accessToken;
1515
this.id = id;
1616
this.username = username;
17-
this.email = email;
17+
this.nom = nom;
1818
this.roles = roles;
1919
}
2020

@@ -42,12 +42,12 @@ public void setId(Long id) {
4242
this.id = id;
4343
}
4444

45-
public String getEmail() {
46-
return email;
45+
public String getNom() {
46+
return nom;
4747
}
4848

49-
public void setEmail(String email) {
50-
this.email = email;
49+
public void setNom(String nom) {
50+
this.nom = nom;
5151
}
5252

5353
public String getUsername() {

‎src/main/java/com/bezkoder/springjwt/repository/UserRepository.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
public interface UserRepository extends JpaRepository<User, Long> {
1212
Optional<User> findByUsername(String username);
1313

14-
Boolean existsByUsername(String username);
14+
Boolean existsByNom(String username);
1515

16-
Boolean existsByEmail(String email);
16+
Boolean existsByUsername(String username);
1717
}

‎src/main/java/com/bezkoder/springjwt/security/WebSecurityConfig.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.springframework.beans.factory.annotation.Autowired;
44
import org.springframework.context.annotation.Bean;
55
import org.springframework.context.annotation.Configuration;
6+
import org.springframework.http.HttpMethod;
67
import org.springframework.security.authentication.AuthenticationManager;
78
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
89
import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
@@ -51,7 +52,7 @@ public AuthenticationManager authenticationManagerBean() throws Exception {
5152
public PasswordEncoder passwordEncoder() {
5253
return new BCryptPasswordEncoder();
5354
}
54-
55+
5556
@Override
5657
protected void configure(HttpSecurity http) throws Exception {
5758
http.cors().and().csrf().disable()
@@ -62,5 +63,8 @@ protected void configure(HttpSecurity http) throws Exception {
6263
.anyRequest().authenticated();
6364

6465
http.addFilterBefore(authenticationJwtTokenFilter(), UsernamePasswordAuthenticationFilter.class);
66+
67+
68+
6569
}
6670
}

‎src/main/java/com/bezkoder/springjwt/security/services/UserDetailsImpl.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,10 @@ public class UserDetailsImpl implements UserDetails {
2626

2727
private Collection<? extends GrantedAuthority> authorities;
2828

29-
public UserDetailsImpl(Long id, String username, String email, String password,
29+
public UserDetailsImpl(Long id, String username, String password,
3030
Collection<? extends GrantedAuthority> authorities) {
3131
this.id = id;
3232
this.username = username;
33-
this.email = email;
3433
this.password = password;
3534
this.authorities = authorities;
3635
}
@@ -43,7 +42,6 @@ public static UserDetailsImpl build(User user) {
4342
return new UserDetailsImpl(
4443
user.getId(),
4544
user.getUsername(),
46-
user.getEmail(),
4745
user.getPassword(),
4846
authorities);
4947
}

‎src/main/java/com/bezkoder/springjwt/security/services/UserDetailsServiceImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ public class UserDetailsServiceImpl implements UserDetailsService {
1717

1818
@Override
1919
@Transactional
20-
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
21-
User user = userRepository.findByUsername(username)
22-
.orElseThrow(() -> new UsernameNotFoundException("User Not Found with username: " + username));
20+
public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
21+
User user = userRepository.findByUsername(email)
22+
.orElseThrow(() -> new UsernameNotFoundException("User Not Found with username: " + email));
2323

2424
return UserDetailsImpl.build(user);
2525
}

0 commit comments

Comments
 (0)