remove tweak code (#44) (#47)

* remove tweak code * adjust model
SwissCovid · Jun 17, 2020 · c214271 · c214271
1 parent c56f142
commit c214271
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 20 deletions.
diff --git a/...ackend/src/main/java/org/dpppt/switzerland/backend/sdk/config/ws/config/WSBaseConfig.java b/...ackend/src/main/java/org/dpppt/switzerland/backend/sdk/config/ws/config/WSBaseConfig.java
@@ -53,9 +53,6 @@ public abstract class WSBaseConfig implements SchedulingConfigurer, WebMvcConfig
 
 	@Value("${ws.retentiondays: 21}")
 	int retentionDays;
-
-	@Value("${ws.security.secretForVerificationCodeGeneration}")
-	String secretForVerificationCodeGeneration;
 
 	@Value("#{${ws.security.headers: {'X-Content-Type-Options':'nosniff', 'X-Frame-Options':'DENY','X-Xss-Protection':'1; mode=block'}}}")
 	Map<String,String> additionalHeaders;
@@ -66,7 +63,7 @@ public abstract class WSBaseConfig implements SchedulingConfigurer, WebMvcConfig
 
 	@Bean
 	public DPPPTConfigController dppptSDKController() {
-		return new DPPPTConfigController(secretForVerificationCodeGeneration);
+		return new DPPPTConfigController();
 	}
 
 	@Bean

diff --git a/...in/java/org/dpppt/switzerland/backend/sdk/config/ws/controller/DPPPTConfigController.java b/...in/java/org/dpppt/switzerland/backend/sdk/config/ws/controller/DPPPTConfigController.java
@@ -32,10 +32,8 @@
 public class DPPPTConfigController {
 
 	private static final Logger logger = LoggerFactory.getLogger(DPPPTConfigController.class);
-	private final String tweakCode;
 
-	public DPPPTConfigController(String tweakCode) {
-		this.tweakCode = tweakCode;
+	public DPPPTConfigController() {
 	}
 
 	@CrossOrigin(origins = { "https://editor.swagger.io" })
@@ -55,7 +53,6 @@ public DPPPTConfigController(String tweakCode) {
 		if (buildnr.equals("ios-200524.1316.87")) {
 			config.getiOSGaenSdkConfig().setFactorHigh(0.0d);
 		}
-		config.setTweakCode(this.tweakCode);
 		return ResponseEntity.ok().cacheControl(CacheControl.maxAge(Duration.ofMinutes(5))).body(config);
 	}
 
@@ -143,14 +140,12 @@ private ConfigResponse mockConfigResponseWithInfoBox() {
 
 		SDKConfig config = new SDKConfig();
 		configResponse.setSdkConfig(config);
-		configResponse.setTweakCode(this.tweakCode);
 		return configResponse;
 	}
 
 	public ConfigResponse mockConfigResponseWithForceUpdate() {
 		ConfigResponse configResponse = new ConfigResponse();
 		configResponse.setForceUpdate(true);
-		configResponse.setTweakCode(this.tweakCode);
 		return configResponse;
 	}
 }
diff --git a/...ckend/src/main/java/org/dpppt/switzerland/backend/sdk/config/ws/model/ConfigResponse.java b/...ckend/src/main/java/org/dpppt/switzerland/backend/sdk/config/ws/model/ConfigResponse.java
@@ -21,8 +21,6 @@ public class ConfigResponse {
 	private GAENSDKConfig iOSGaenSdkConfig = new GAENSDKConfig();
 	private GAENSDKConfig androidGaenSdkConfig = new GAENSDKConfig();
 
-	private String tweakCode;
-
 	public boolean getForceUpdate() {
 		return this.forceUpdate;
 	}
@@ -41,14 +39,6 @@ public void setIOSGaenSdkConfig(GAENSDKConfig iOSGaenSdkConfig) {
 		this.iOSGaenSdkConfig = iOSGaenSdkConfig;
 	}
 
-	public String getTweakCode() {
-		return this.tweakCode;
-	}
-
-	public void setTweakCode(String tweakCode) {
-		this.tweakCode = tweakCode;
-	}
-
 	public boolean isForceUpdate() {
 		return forceUpdate;
 	}