Merge pull request #299 from iExecBlockchainComputing/feature/nontee

Fix non TEE workflow

Author: zguesmi

src/main/java/com/iexec/worker/feign/CustomResultFeignClient.java

@@ -38,6 +38,15 @@ public Optional<Eip712Challenge> getResultChallenge(Integer chainId) {
         return is2xxSuccess(response) ? Optional.of(response.getBody()) : Optional.empty();
     }
 
+    public String login(Integer chainId, String signedEip712Challenge) {
+        Map<String, Object> arguments = new HashMap<>();
+        arguments.put("chainId", chainId);
+        arguments.put("signedEip712Challenge", signedEip712Challenge);
+        HttpCall<String> httpCall = (args) -> resultClient.login((Integer) args.get("chainId"), (String) args.get("signedEip712Challenge"));
+        ResponseEntity<String> response = makeHttpCall(httpCall, arguments, "login to result proxy");
+        return is2xxSuccess(response) ? response.getBody() : "";
+    }
+
     public String uploadResult(String authorizationToken, ResultModel resultModel) {
         Map<String, Object> arguments = new HashMap<>();
         arguments.put("authorizationToken", authorizationToken);
@@ -46,7 +55,7 @@ public String uploadResult(String authorizationToken, ResultModel resultModel) {
         HttpCall<String> httpCall = (args) ->
                 resultClient.uploadResult((String) args.get("authorizationToken"), (ResultModel) args.get("resultModel"));
 
-        ResponseEntity<String> response = makeHttpCall(httpCall, arguments, "getResultChallenge");
+        ResponseEntity<String> response = makeHttpCall(httpCall, arguments, "uploadResult");
         return is2xxSuccess(response) ? response.getBody() : "";
     }
 }

src/main/java/com/iexec/worker/feign/client/ResultClient.java

@@ -18,8 +18,12 @@ public interface ResultClient {
     @GetMapping("/results/challenge")
     ResponseEntity<Eip712Challenge> getChallenge(@RequestParam(name = "chainId") Integer chainId) throws FeignException;
 
+    @GetMapping("/results/login")
+    ResponseEntity<String> login(@RequestParam(name = "chainId") Integer chainId,
+                                          @RequestBody String signedEip712Challenge) throws FeignException;
+
     @PostMapping("/results")
-    ResponseEntity<String> uploadResult(@RequestHeader("Authorization") String customToken,
+    ResponseEntity<String> uploadResult(@RequestHeader("Authorization") String authorizationToken,
                                         @RequestBody ResultModel resultModel);
 
 }

src/main/java/com/iexec/worker/result/ResultService.java

@@ -385,11 +385,17 @@ public String uploadResultAndGetLink(String chainTaskId) {
         }
 
         String authorizationToken = getIexecUploadToken();
+        if (authorizationToken.isEmpty()) {
+            log.error("Empty authorizationToken, cannot upload result [chainTaskId:{}]", chainTaskId);
+            return "";
+        }
 
+        log.info("Got upload authorization token [chainTaskId:{}]", chainTaskId);
         return customResultFeignClient.uploadResult(authorizationToken, getResultModelWithZip(chainTaskId));
     }
 
     public String getIexecUploadToken() {
+        // get challenge
         Integer chainId = publicConfigService.getChainId();
         Optional<Eip712Challenge> oEip712Challenge = customResultFeignClient.getResultChallenge(chainId);
 
@@ -399,16 +405,18 @@ public String getIexecUploadToken() {
 
         Eip712Challenge eip712Challenge = oEip712Challenge.get();
 
+        // sign challenge
         ECKeyPair ecKeyPair = credentialsService.getCredentials().getEcKeyPair();
-        String authorizationToken = Eip712ChallengeUtils.buildAuthorizationToken(eip712Challenge,
+        String signedEip712Challenge = Eip712ChallengeUtils.buildAuthorizationToken(eip712Challenge,
                 workerConfigService.getWorkerWalletAddress(), ecKeyPair);
 
-        if (authorizationToken.isEmpty()) {
+        if (signedEip712Challenge.isEmpty()) {
             return "";
         }
-        return authorizationToken;
-    }
 
+        // login
+        return customResultFeignClient.login(chainId, signedEip712Challenge);
+    }
 
     public boolean isResultAvailable(String chainTaskId) {
         boolean isResultZipFound = isResultZipFound(chainTaskId);