BF7 - Authentification (set user info fix)

kungfuwushu · Dec 13, 2019 · 318f077 · 318f077
1 parent 9daf2de
commit 318f077
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 21 deletions.
diff --git a/src/main/java/fr/kungfunantes/backend/model/Profile.java b/src/main/java/fr/kungfunantes/backend/model/Profile.java
@@ -75,19 +75,19 @@ public void setId(Long id) {
         this.id = id;
     }
 
-    public String getFirstname() {
+    public String getFirstName() {
         return firstname;
     }
 
-    public void setFirstname(String firstname) {
+    public void setFirstName(String firstname) {
         this.firstname = firstname;
     }
 
-    public String getLastname() {
+    public String getLastName() {
         return lastname;
     }
 
-    public void setLastname(String lastname) {
+    public void setLastName(String lastname) {
         this.lastname = lastname;
     }
 

diff --git a/src/main/java/fr/kungfunantes/backend/resource/ProfileResource.java b/src/main/java/fr/kungfunantes/backend/resource/ProfileResource.java
@@ -105,8 +105,8 @@ public ResponseEntity<Profile> updateProfile(@RequestBody Profile profile, @Path
 
 		// do the update
 		Profile updateProfile = optionalProfile.get();
-		updateProfile.setFirstname(profile.getFirstname());
-		updateProfile.setLastname(profile.getLastname());
+		updateProfile.setFirstName(profile.getFirstName());
+		updateProfile.setLastName(profile.getLastName());
 		profileRepository.save(updateProfile);
 
 		// return the updated value

diff --git a/src/main/java/fr/kungfunantes/backend/security/AuthResource.java b/src/main/java/fr/kungfunantes/backend/security/AuthResource.java
@@ -82,7 +82,7 @@ public ResponseEntity<?> registerUser(@Valid @RequestBody SignUpRequest signUpRe
         }
 
         // Creating user's account
-        Profile user = new Profile(signUpRequest.getFirstname(), signUpRequest.getLastname(), signUpRequest.getUsername(),
+        Profile user = new Profile(signUpRequest.getFirstName(), signUpRequest.getLastName(), signUpRequest.getUsername(),
                 signUpRequest.getEmail(), signUpRequest.getPassword());
 
         user.setPassword(passwordEncoder.encode(user.getPassword()));

diff --git a/src/main/java/fr/kungfunantes/backend/security/SignUpRequest.java b/src/main/java/fr/kungfunantes/backend/security/SignUpRequest.java
@@ -24,19 +24,19 @@ public class SignUpRequest {
     @Size(min = 6, max = 20)
     private String password;
 
-    public String getFirstname() {
+    public String getFirstName() {
         return firstname;
     }
 
-    public void setFirstname(String name) {
+    public void setFirstName(String name) {
         this.firstname = name;
     }
 
-    public String getLastname() {
+    public String getLastName() {
         return lastname;
     }
 
-    public void setLastname(String name) {
+    public void setLastName(String name) {
         this.lastname = name;
     }
 
@@ -63,4 +63,4 @@ public String getPassword() {
     public void setPassword(String password) {
         this.password = password;
     }
-}
+}
diff --git a/src/main/java/fr/kungfunantes/backend/security/UserPrincipal.java b/src/main/java/fr/kungfunantes/backend/security/UserPrincipal.java
@@ -18,9 +18,8 @@ public class UserPrincipal implements UserDetails {
     private static final long serialVersionUID = 1L;
 
     private Long id;
-
-    private String name;
-
+    private String firstName;
+    private String lastName;
     private String username;
 
     @JsonIgnore
@@ -31,9 +30,10 @@ public class UserPrincipal implements UserDetails {
 
     private Collection<? extends GrantedAuthority> authorities;
 
-    public UserPrincipal(Long id, String name, String username, String email, String password, Collection<? extends GrantedAuthority> authorities) {
+    public UserPrincipal(Long id, String firstName, String lastName, String username, String email, String password, Collection<? extends GrantedAuthority> authorities) {
         this.id = id;
-        this.name = name;
+        this.firstName = firstName;
+        this.lastName = lastName;
         this.username = username;
         this.email = email;
         this.password = password;
@@ -47,7 +47,8 @@ public static UserPrincipal create(Profile user) {
 
         return new UserPrincipal(
                 user.getId(),
-                user.getLastname(),
+                user.getFirstName(),
+                user.getLastName(),
                 user.getUsername(),
                 user.getEmail(),
                 user.getPassword(),
@@ -59,8 +60,12 @@ public Long getId() {
         return id;
     }
 
-    public String getName() {
-        return name;
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public String getLastname() {
+        return lastName;
     }
 
     public String getEmail() {
@@ -115,4 +120,4 @@ public int hashCode() {
 
         return Objects.hash(id);
     }
-}
+}