Changeset 74fb0dc

Timestamp:

02/10/22 14:29:35 (2 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

c45b67b

Parents:

13ecc56

Message:

edited JWT token

Location:

sources/app/src/main/java/parkup

Files:

• configs/CustomAuthenticationFilter.java (modified) (4 diffs)
• controllers/RegisteredUserController.java (modified) (1 diff)
• entities/RegisteredUser.java (modified) (5 diffs)
• services/RegisteredUserService.java (modified) (1 diff)

sources/app/src/main/java/parkup/configs/CustomAuthenticationFilter.java

@@ -51 +51 @@
         String className = principal.getClass().getName().split("\\.")[2];
         String email=null;
+        String fullName=null;
         Collection<? extends GrantedAuthority> roles= new ArrayList<>();
         switch (className) {
             case "RegisteredUser": {
                 RegisteredUser user = (RegisteredUser) authentication.getPrincipal();
+                fullName=user.getFirstName()+" "+user.getLastName();
                 email = user.getEmail();
                 roles = user.getAuthorities();
@@ -62 +64 @@
                 Worker user = (Worker) authentication.getPrincipal();
                 email = user.getEmail();
+                fullName=user.getFirstName()+" "+user.getLastName();
                 roles = user.getAuthorities();
                 break;
@@ -68 +71 @@
                 Administrator user = (Administrator) authentication.getPrincipal();
                 email = user.getEmail();
+                fullName=user.getFirstName()+" "+user.getLastName();
                 roles = user.getAuthorities();
                 break;
@@ -76 +80 @@
         String access_token = JWT.create()
                 .withSubject(email)
+                .withClaim("fullName",fullName)
                 .withExpiresAt(new Date(System.currentTimeMillis() + 60 * 60 * 1000))
                 .withIssuer(request.getRequestURL().toString())

sources/app/src/main/java/parkup/controllers/RegisteredUserController.java

@@ -44 +44 @@
     @PutMapping({"/registriranParkirac/{regParkId}"})
     public RegisteredUser updateRegistriranParkirac(@PathVariable int regParkId, @RequestBody RegisteredUser regPark) {
-        return this.registeredUserService.updateRegPark(regParkId, regPark.getName(), regPark.getSurname(), regPark.getMobile(), regPark.getEmail(),regPark.getPlates());
+        return this.registeredUserService.updateRegPark(regParkId, regPark.getFirstName(), regPark.getLastName(), regPark.getMobile(), regPark.getEmail(),regPark.getPlates());
     }
 

sources/app/src/main/java/parkup/entities/RegisteredUser.java

@@ -30 +30 @@
     private int regParkId;
 
-    @Column(name = "name")
-    private String name;
-
-    @Column(name = "surname")
-    private String surname;
+    @Column(name = "firstName")
+    private String firstName;
+
+    @Column(name = "lastName")
+    private String lastName;
 
     @Column(name = "password")
@@ -66 +66 @@
     }
 
-    public RegisteredUser(int regParkId, String name, String surname, String password, List<Plate> plates, String email, String mobile) {
+    public RegisteredUser(int regParkId, String firstName, String lastName, String password, List<Plate> plates, String email, String mobile) {
         this.regParkId = regParkId;
-        this.name = name;
-        this.surname = surname;
+        this.firstName = firstName;
+        this.lastName = lastName;
         this.password = password;
         this.plates = plates;
@@ -78 +78 @@
     }
 
-    public RegisteredUser(String name, String surname, String password, List<Plate> plates, String email, String mobile) {
-        this.name = name;
-        this.surname = surname;
+    public RegisteredUser(String firstName, String lastName, String password, List<Plate> plates, String email, String mobile) {
+        this.firstName = firstName;
+        this.lastName = lastName;
         this.password = password;
         this.plates = plates;
@@ -89 +89 @@
     }
 
-    public RegisteredUser(String name, String surname, String email, String password, String mobile) {
-        this.name = name;
-        this.surname = surname;
+    public RegisteredUser(String firstName, String lastName, String email, String password, String mobile) {
+        this.firstName = firstName;
+        this.lastName = lastName;
         this.password = password;
         this.email = email;
@@ -128 +128 @@
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getSurname() {
-        return surname;
-    }
-
-    public void setSurname(String surname) {
-        this.surname = surname;
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(String name) {
+        this.firstName = name;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(String surname) {
+        this.lastName = surname;
     }
 

sources/app/src/main/java/parkup/services/RegisteredUserService.java

@@ -68 +68 @@
             }
 
-            if (name != null && name.length() > 1 && !Objects.equals(regParkNov.getName(), name)) {
-                regParkNov.setName(name);
+            if (name != null && name.length() > 1 && !Objects.equals(regParkNov.getFirstName(), name)) {
+                regParkNov.setFirstName(name);
             }
 
-            if (surname != null && surname.length() > 1 && !Objects.equals(regParkNov.getSurname(), surname)) {
-                regParkNov.setSurname(surname);
+            if (surname != null && surname.length() > 1 && !Objects.equals(regParkNov.getLastName(), surname)) {
+                regParkNov.setLastName(surname);
             }