feat: add permanent toggle flag

Author: jianggang

src/main/java/com/featureprobe/api/auth/SecurityConfig.java

@@ -1,6 +1,6 @@
 package com.featureprobe.api.auth;
 
-import com.featureprobe.api.base.config.AppConfig;
+import com.featureprobe.api.base.config.JWTConfig;
 import com.featureprobe.api.base.enums.OrganizationRoleEnum;
 import com.featureprobe.api.dto.BaseResponse;
 import com.featureprobe.api.mapper.JsonMapper;
@@ -36,7 +36,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
     private LoginSuccessHandler loginSuccessHandler;
 
-    private AppConfig appConfig;
+    private JWTConfig JWTConfig;
 
     private UserPasswordAuthenticationProvider userPasswordAuthenticationProvider;
 
@@ -98,7 +98,7 @@ protected void configure(HttpSecurity http) throws Exception {
                 .authenticationEntryPoint(authenticationEntryPoint());
         http.addFilterBefore(userPasswordAuthenticationProcessingFilter(authenticationManager()),
                 UsernamePasswordAuthenticationFilter.class);
-        if (!appConfig.isGuestDisabled()) {
+        if (!JWTConfig.isGuestDisabled()) {
             http.addFilterBefore(guestAuthenticationProcessingFilter(authenticationManager()),
                     UserPasswordAuthenticationProcessingFilter.class);
         }

src/main/java/com/featureprobe/api/auth/tenant/TenantFilter.java

@@ -1,7 +1,7 @@
 package com.featureprobe.api.auth.tenant;
 
 import com.featureprobe.api.auth.TokenHelper;
-import com.featureprobe.api.base.config.AppConfig;
+import com.featureprobe.api.base.config.JWTConfig;
 import com.featureprobe.api.dto.BaseResponse;
 import com.featureprobe.api.dto.OrganizationMember;
 import com.featureprobe.api.mapper.JsonMapper;
@@ -32,15 +32,15 @@ public class TenantFilter implements Filter {
 
     private OrganizationService organizationService;
 
-    private AppConfig appConfig;
+    private JWTConfig JWTConfig;
 
     @Override
     public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
             throws IOException, ServletException {
         HttpServletResponse response = (HttpServletResponse) servletResponse;
         HttpServletRequest request = (HttpServletRequest) servletRequest;
         String requestURI = request.getRequestURI();
-        if (!appConfig.getExcludeTenantUri().contains(requestURI)) {
+        if (!JWTConfig.getExcludeTenantUri().contains(requestURI)) {
             String tenantHeader = request.getHeader(TENANT_HEADER);
             try {
                 if (StringUtils.isNotBlank(tenantHeader)) {

src/main/java/com/featureprobe/api/base/config/AppConfig.java

@@ -1,27 +1,17 @@
 package com.featureprobe.api.base.config;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
-import java.util.List;
 
 @Data
 @Component
-@ConfigurationProperties(prefix = "app.security.jwt")
+@ConfigurationProperties(prefix = "app")
+@AllArgsConstructor
+@NoArgsConstructor
 public class AppConfig {
 
-    private String keystoreLocation;
-
-    private String keystorePassword;
-
-    private String keyAlias;
-
-    private String privateKeyPassphrase;
-
-    private List<String> excludeTenantUri;
-
-    private boolean guestDisabled = true;
-
-    private String guestDefaultPassword;
-
+    private Long toggleDeadline;
 }

src/main/java/com/featureprobe/api/base/config/JWTConfig.java

@@ -0,0 +1,27 @@
+package com.featureprobe.api.base.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+import java.util.List;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "app.security.jwt")
+public class JWTConfig {
+
+    private String keystoreLocation;
+
+    private String keystorePassword;
+
+    private String keyAlias;
+
+    private String privateKeyPassphrase;
+
+    private List<String> excludeTenantUri;
+
+    private boolean guestDisabled = true;
+
+    private String guestDefaultPassword;
+
+}

src/main/java/com/featureprobe/api/dto/ToggleCreateRequest.java

@@ -33,4 +33,6 @@ public class ToggleCreateRequest {
 
     @NotNull
     private Integer disabledServe;
+
+    private boolean permanent;
 }

src/main/java/com/featureprobe/api/dto/ToggleItemResponse.java

@@ -12,6 +12,10 @@ public class ToggleItemResponse {
 
     private String key;
 
+    private Boolean permanent;
+
+    private Long useDays;
+
     private String returnType;
 
     private String desc;

src/main/java/com/featureprobe/api/dto/ToggleResponse.java

@@ -13,6 +13,10 @@ public class ToggleResponse {
 
     private String key;
 
+    private Boolean permanent;
+
+    private Long useDays;
+
     private String returnType;
 
     private Integer disabledServe;

src/main/java/com/featureprobe/api/dto/ToggleSearchRequest.java

@@ -22,4 +22,6 @@ public class ToggleSearchRequest extends PaginationRequest {
 
     private List<ToggleReleaseStatusEnum> releaseStatusList;
 
+    private Boolean permanent;
+
 }

src/main/java/com/featureprobe/api/dto/ToggleUpdateRequest.java

@@ -22,4 +22,6 @@ public class ToggleUpdateRequest {
     private Integer disabledServe;
 
     private Boolean archived;
+
+    private boolean permanent;
 }

src/main/java/com/featureprobe/api/entity/Toggle.java

@@ -2,15 +2,9 @@
 
 import com.featureprobe.api.base.config.TenantEntityListener;
 import com.featureprobe.api.base.entity.AbstractAuditEntity;
-import lombok.AllArgsConstructor;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
-import lombok.ToString;
 import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
 import org.hibernate.annotations.Filter;
 import org.hibernate.annotations.FilterDef;
 import org.hibernate.annotations.ParamDef;
@@ -45,6 +39,9 @@ public class Toggle extends AbstractAuditEntity implements TenantSupport {
     @Column(name = "[key]")
     private String key;
 
+    @Column(columnDefinition = "TINYINT")
+    private boolean permanent;
+
     @Column(name = "description" , columnDefinition = "TEXT")
     private String desc;