[airavata-mft] branch develop updated: Saving auth token in transfer request store

[dimuthuupe]

This is an automated email from the ASF dual-hosted git repository.

dimuthuupe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-mft.git


The following commit(s) were added to refs/heads/develop by this push:
     new f1d1bcd  Saving auth token in transfer request store
f1d1bcd is described below

commit f1d1bcd1f4d47cdfd4b540fe5f0410a499276e3e
Author: Dimuthu Wannipurage <dimuthu.upeks...@gmail.com>
AuthorDate: Thu Jul 8 05:51:12 2021 -0400

    Saving auth token in transfer request store
---
 .../org/apache/airavata/mft/agent/http/HttpServerHandler.java |  2 +-
 .../apache/airavata/mft/agent/http/HttpTransferRequest.java   | 11 +++++++++++
 .../airavata/mft/agent/http/HttpTransferRequestsStore.java    |  8 +++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git 
a/agent/src/main/java/org/apache/airavata/mft/agent/http/HttpServerHandler.java 
b/agent/src/main/java/org/apache/airavata/mft/agent/http/HttpServerHandler.java
index 1941d54..07c0191 100644
--- 
a/agent/src/main/java/org/apache/airavata/mft/agent/http/HttpServerHandler.java
+++ 
b/agent/src/main/java/org/apache/airavata/mft/agent/http/HttpServerHandler.java
@@ -78,7 +78,7 @@ public class HttpServerHandler extends 
SimpleChannelInboundHandler<FullHttpReque
         ConnectorParams params = httpTransferRequest.getConnectorParams();
 
         // TODO Load from HTTP Headers
-        AuthToken authToken = AuthToken.newBuilder().build();
+        AuthToken authToken = httpTransferRequest.getAuthToken();
 
         connector.init(params.getResourceServiceHost(),
                 params.getResourceServicePort(), 
params.getSecretServiceHost(), params.getSecretServicePort());
diff --git 
a/agent/src/main/java/org/apache/airavata/mft/agent/http/HttpTransferRequest.java
 
b/agent/src/main/java/org/apache/airavata/mft/agent/http/HttpTransferRequest.java
index 1633ab4..c6d5192 100644
--- 
a/agent/src/main/java/org/apache/airavata/mft/agent/http/HttpTransferRequest.java
+++ 
b/agent/src/main/java/org/apache/airavata/mft/agent/http/HttpTransferRequest.java
@@ -17,6 +17,7 @@
 
 package org.apache.airavata.mft.agent.http;
 
+import org.apache.airavata.mft.common.AuthToken;
 import org.apache.airavata.mft.core.api.Connector;
 import org.apache.airavata.mft.core.api.MetadataCollector;
 
@@ -28,6 +29,7 @@ public class HttpTransferRequest {
     private String childResourcePath;
     private String credentialToken;
     private long createdTime = System.currentTimeMillis();
+    private AuthToken authToken;
 
     public Connector getOtherConnector() {
         return otherConnector;
@@ -91,4 +93,13 @@ public class HttpTransferRequest {
         this.createdTime = createdTime;
         return this;
     }
+
+    public AuthToken getAuthToken() {
+        return authToken;
+    }
+
+    public HttpTransferRequest setAuthToken(AuthToken authToken) {
+        this.authToken = authToken;
+        return this;
+    }
 }
diff --git 
a/agent/src/main/java/org/apache/airavata/mft/agent/http/HttpTransferRequestsStore.java
 
b/agent/src/main/java/org/apache/airavata/mft/agent/http/HttpTransferRequestsStore.java
index 0b2bfae..dd2f17e 100644
--- 
a/agent/src/main/java/org/apache/airavata/mft/agent/http/HttpTransferRequestsStore.java
+++ 
b/agent/src/main/java/org/apache/airavata/mft/agent/http/HttpTransferRequestsStore.java
@@ -66,6 +66,9 @@ public class HttpTransferRequestsStore {
 
         //TODO  Need to block concurrent calls to same url as connectors are 
not thread safe
         HttpTransferRequest request = downloadRequestStore.get(url);
+        if (request != null) {
+            downloadRequestStore.remove(url);
+        }
         return request;
     }
 
@@ -78,7 +81,10 @@ public class HttpTransferRequestsStore {
     public HttpTransferRequest getUploadRequest(String url) {
 
         //TODO  Need to block concurrent calls to same url as connectors are 
not thread safe
-        HttpTransferRequest request = downloadRequestStore.get(url);
+        HttpTransferRequest request = uploadRequestStore.get(url);
+        if (request != null) {
+            uploadRequestStore.remove(url);
+        }
         return request;
     }
 }