xpeditis/backend
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature_login' into feature_devis

Browse Source
This commit is contained in:
David 2025-09-12 12:27:30 +02:00
commit d1be066a20
6 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
domain/data/src/main/java/com/dh7789dev/xpeditis/dto/request/RegisterRequest.java
View File

@ -54,6 +54,7 @@ public class RegisterRequest {
String companyCountry; String companyCountry;
@Builder.Default
AuthProvider authProvider = AuthProvider.LOCAL; AuthProvider authProvider = AuthProvider.LOCAL;
String googleId; String googleId;

1
domain/data/src/main/java/com/dh7789dev/xpeditis/dto/response/AuthenticationResponse.java
View File

@ -28,6 +28,7 @@ public class AuthenticationResponse {
String refreshToken; String refreshToken;
@JsonProperty("token_type") @JsonProperty("token_type")
@Builder.Default
String tokenType = "Bearer"; String tokenType = "Bearer";
@JsonProperty("expires_in") @JsonProperty("expires_in")

1
domain/data/src/main/java/com/dh7789dev/xpeditis/dto/response/TokenResponse.java
View File

@ -17,6 +17,7 @@ public class TokenResponse {
String token; String token;
String refreshToken; String refreshToken;
long expiresIn; long expiresIn;
@Builder.Default
String tokenType = "Bearer"; String tokenType = "Bearer";
UserResponse user; UserResponse user;
} }

4
infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/CompanyEntity.java
View File

@ -7,7 +7,6 @@ import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import lombok.experimental.FieldDefaults; import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants; import lombok.experimental.FieldNameConstants;
import org.hibernate.annotations.GenericGenerator;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
@ -24,8 +23,7 @@ import java.util.UUID;
public class CompanyEntity { public class CompanyEntity {
@Id @Id
@GeneratedValue(generator = "UUID") @GeneratedValue(strategy = GenerationType.UUID)
@GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator")
@Column(columnDefinition = "BINARY(16)") @Column(columnDefinition = "BINARY(16)")
UUID id; UUID id;

4
infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/LicenseEntity.java
View File

@ -7,7 +7,6 @@ import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import lombok.experimental.FieldDefaults; import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants; import lombok.experimental.FieldNameConstants;
import org.hibernate.annotations.GenericGenerator;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -24,8 +23,7 @@ import java.util.UUID;
public class LicenseEntity { public class LicenseEntity {
@Id @Id
@GeneratedValue(generator = "UUID") @GeneratedValue(strategy = GenerationType.UUID)
@GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator")
@Column(columnDefinition = "BINARY(16)") @Column(columnDefinition = "BINARY(16)")
UUID id; UUID id;

4
infrastructure/src/main/java/com/dh7789dev/xpeditis/entity/UserEntity.java
View File

@ -8,7 +8,6 @@ import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import lombok.experimental.FieldDefaults; import lombok.experimental.FieldDefaults;
import lombok.experimental.FieldNameConstants; import lombok.experimental.FieldNameConstants;
import org.hibernate.annotations.GenericGenerator;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
@ -29,8 +28,7 @@ import java.util.UUID;
public class UserEntity implements UserDetails { public class UserEntity implements UserDetails {
@Id @Id
@GeneratedValue(generator = "UUID") @GeneratedValue(strategy = GenerationType.UUID)
@GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator")
@Column(columnDefinition = "BINARY(16)") @Column(columnDefinition = "BINARY(16)")
UUID id; UUID id;