Merge pull request #11 from edsonmartins/tenant-query-param

feat: permitir passar o tenant id como query param

Author: edsonmartins

archbase-multitenancy/src/main/java/br/com/archbase/multitenancy/interceptor/ArchbaseTenantRequestInterceptor.java

@@ -14,9 +14,22 @@ public class ArchbaseTenantRequestInterceptor implements HandlerInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         String tenantId = request.getHeader(X_TENANT_ID);
+        if (tenantId == null || tenantId.isEmpty()) {
+            tenantId = request.getParameter(X_TENANT_ID);
+        }
+
         String companyId = request.getHeader(X_COMPANY_ID);
-        ArchbaseTenantContext.setTenantId(tenantId);
-        ArchbaseTenantContext.setCompanyId(companyId);
+        if (companyId == null || companyId.isEmpty()) {
+            companyId = request.getParameter(X_COMPANY_ID);
+        }
+
+        if (tenantId != null && !tenantId.isEmpty()) {
+            ArchbaseTenantContext.setTenantId(tenantId);
+        }
+
+        if (companyId != null && !companyId.isEmpty()) {
+            ArchbaseTenantContext.setCompanyId(companyId);
+        }
 
         return true;
     }

archbase-security/src/main/java/br/com/archbase/security/domain/dto/AccessIntervalDto.java

@@ -3,15 +3,15 @@
 import br.com.archbase.security.domain.entity.AccessInterval;
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.ObjectIdGenerators;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
 @Getter
 @Setter
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 @JsonIdentityInfo(generator = ObjectIdGenerators.UUIDGenerator.class, property = "@id")
 public class AccessIntervalDto {
 

archbase-security/src/main/java/br/com/archbase/security/domain/dto/AccessScheduleDto.java

@@ -3,9 +3,7 @@
 import br.com.archbase.security.domain.entity.AccessSchedule;
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.ObjectIdGenerators;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -15,6 +13,8 @@
 @Getter
 @Setter
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 @JsonIdentityInfo(generator = ObjectIdGenerators.UUIDGenerator.class, property = "@id")
 public class AccessScheduleDto {
 	protected String id;

archbase-security/src/main/java/br/com/archbase/security/domain/dto/AccessTokenDto.java

@@ -4,9 +4,7 @@
 import br.com.archbase.security.token.TokenType;
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.ObjectIdGenerators;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 
 import java.time.Instant;
 import java.time.LocalDateTime;
@@ -16,6 +14,8 @@
 @Getter
 @Setter
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 @JsonIdentityInfo(generator = ObjectIdGenerators.UUIDGenerator.class, property = "@id")
 public class AccessTokenDto  {
 

archbase-security/src/main/java/br/com/archbase/security/domain/dto/ActionDto.java

@@ -3,15 +3,15 @@
 import br.com.archbase.security.domain.entity.Action;
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.ObjectIdGenerators;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
 @Getter
 @Setter
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 @JsonIdentityInfo(generator = ObjectIdGenerators.UUIDGenerator.class, property = "@id")
 public class ActionDto {
 

archbase-security/src/main/java/br/com/archbase/security/domain/dto/ApiTokenDto.java

@@ -3,16 +3,16 @@
 import br.com.archbase.security.domain.entity.ApiToken;
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.ObjectIdGenerators;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 
 import java.time.LocalDateTime;
 
 
 @Getter
 @Setter
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 @JsonIdentityInfo(generator = ObjectIdGenerators.UUIDGenerator.class, property = "@id")
 public class ApiTokenDto {
 

archbase-security/src/main/java/br/com/archbase/security/domain/dto/GrantPermissionDto.java

@@ -1,13 +1,13 @@
 package br.com.archbase.security.domain.dto;
 
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 
 
 @Getter
 @Setter
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class GrantPermissionDto {
 	private String securityId;
 	private String actionId;

archbase-security/src/main/java/br/com/archbase/security/domain/dto/GroupDto.java

@@ -3,17 +3,14 @@
 import br.com.archbase.security.domain.entity.Group;
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.ObjectIdGenerators;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 
 import java.time.LocalDateTime;
-import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 @Getter
 @Setter
+@NoArgsConstructor
 @JsonIdentityInfo(generator = ObjectIdGenerators.UUIDGenerator.class, property = "@id")
 public class GroupDto extends SecurityDto {
     @Builder

archbase-security/src/main/java/br/com/archbase/security/domain/dto/PermissionWithTypesDto.java

@@ -3,16 +3,16 @@
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.ObjectIdGenerators;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 
 import java.util.Set;
 
 
 @Getter
 @Setter
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 @JsonIdentityInfo(generator = ObjectIdGenerators.UUIDGenerator.class, property = "@id")
 public class PermissionWithTypesDto {
 	@JsonInclude(JsonInclude.Include.NON_NULL)

archbase-security/src/main/java/br/com/archbase/security/domain/dto/ResouceActionPermissionDto.java

@@ -1,13 +1,13 @@
 package br.com.archbase.security.domain.dto;
 
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 
 
 @Getter
 @Setter
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class ResouceActionPermissionDto {
 
 	private String resourceId;