Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class Invitation {

@Id
@GeneratedValue(strategy = GenerationType.UUID)
private String id;
private UUID id;

@Column(nullable = false,unique = true)
private String token;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import java.util.ArrayList;
import java.util.List;

import java.util.UUID;

@Entity
@Table(name = "organizations")
@Data
Expand All @@ -18,7 +20,7 @@
public class Organization {
@Id
@GeneratedValue(strategy = GenerationType.UUID)
private String id;
private UUID id;

@Column(nullable = false, unique = true)
private String name;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

import java.time.Instant;

import java.util.UUID;

@Entity
@Table(name = "users")
@Data
Expand All @@ -20,7 +22,7 @@ public class User {

@Id
@GeneratedValue(strategy = GenerationType.UUID)
private String id;
private UUID id;

@Column(nullable = false)
private String fullName;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@
import java.time.Instant;
import java.util.Optional;

import java.util.UUID;

@Repository
public interface InvitationRepository extends JpaRepository<Invitation,String> {
public interface InvitationRepository extends JpaRepository<Invitation,UUID> {

Optional<Invitation> findByToken(String token);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import com.flowforge.auth_service.model.Organization;
import org.springframework.data.jpa.repository.JpaRepository;

public interface OrganizationRepository extends JpaRepository<Organization,String> {
import java.util.UUID;

public interface OrganizationRepository extends JpaRepository<Organization,UUID> {
boolean existsByName(String name);
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@

import java.util.Optional;

public interface UserRepository extends JpaRepository<User,String> {
import java.util.UUID;

public interface UserRepository extends JpaRepository<User,UUID> {
@EntityGraph(attributePaths = {"organization"})
Optional<User> findByEmail(String email);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ private SecretKey key(){
public String generateAccessToken(User user){
return Jwts.builder()
.setSubject(user.getEmail())
.claim("userId", user.getId())
.claim("orgId", user.getOrganization().getId())
.claim("userId", user.getId().toString())
.claim("orgId", user.getOrganization().getId().toString())
.claim("role", user.getRole().name())
.setIssuedAt(new Date())
.setExpiration(new Date(System.currentTimeMillis() + 900_000L))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@

import java.util.Collection;
import java.util.List;
import java.util.UUID;

public class UserPrincipal implements UserDetails {

private final String id;
private final UUID id;
private final String email;
private final String organizationId;
private final UUID organizationId;
private final Role role;

public UserPrincipal(User user){
Expand All @@ -37,10 +38,10 @@ public String getPassword() {
public String getUsername() {
return email;
}
public String getId() {
public UUID getId() {
return id;
}
public String getOrganizationId() {
public UUID getOrganizationId() {
return organizationId;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import org.springframework.stereotype.Service;

import java.util.Optional;
import java.util.UUID;

@Service
@RequiredArgsConstructor
Expand All @@ -16,7 +17,7 @@ public Organization save(Organization organization){
return organizationRepository.save(organization);
}

public Optional<Organization> findById(String id){
public Optional<Organization> findById(UUID id){
return organizationRepository.findById(id);
}

Expand Down
Binary file removed auth-service/target/auth-service-0.0.1-SNAPSHOT.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
3 changes: 0 additions & 3 deletions auth-service/target/maven-archiver/pom.properties

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@ com\flowforge\auth_service\dto\RegisterWithInviteRequest.class
com\flowforge\auth_service\facade\InvitationFacade.class
com\flowforge\auth_service\model\User.class
com\flowforge\auth_service\dto\CreateInvitationResponse$CreateInvitationResponseBuilder.class
com\flowforge\auth_service\exception\InvitationEmailSentFailedException.class
com\flowforge\auth_service\config\SwaggerConfig.class
com\flowforge\auth_service\security\JwtService.class
com\flowforge\auth_service\security\UserPrincipal.class
com\flowforge\auth_service\mapper\UserMapper.class
com\flowforge\auth_service\model\Organization.class
com\flowforge\auth_service\controller\InvitationController.class
com\flowforge\auth_service\dto\RefreshTokenRequest$RefreshTokenRequestBuilder.class
com\flowforge\auth_service\service\AuthenticationService.class
com\flowforge\auth_service\dto\CreateInvitationRequest$CreateInvitationRequestBuilder.class
com\flowforge\auth_service\AuthServiceApplication.class
com\flowforge\auth_service\service\UserService.class
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowfor
C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\exception\InvalidInviteTokenException.java
C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\exception\InvalidRefreshTokenException.java
C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\exception\InvitationAlreadyUsedException.java
C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\exception\InvitationEmailSentFailedException.java
C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\exception\InvitationExpiredException.java
C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\exception\OrganizationAlreadyExistsException.java
C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\exception\OrganizationNotFoundException.java
Expand All @@ -41,6 +42,7 @@ C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowfor
C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\security\JwtService.java
C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\security\SecurityConfig.java
C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\security\UserPrincipal.java
C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\service\AuthenticationService.java
C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\service\InvitationService.java
C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\service\MailService.java
C:\Users\ceasw\OneDrive\Desktop\flowforge\auth-service\src\main\java\com\flowforge\auth_service\service\OrganizationService.java
Expand Down

This file was deleted.

This file was deleted.

Binary file not shown.
Loading