Skip to content

Commit be6d697

Browse files
committed
Restore Proxy files
1 parent a06cb2c commit be6d697

File tree

3 files changed

+54
-20
lines changed

3 files changed

+54
-20
lines changed

.fernignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,7 @@ src/main/java/com/pipedream/api/PipedreamClient.java
2020
src/main/java/com/pipedream/api/PipedreamClientBuilder.java
2121

2222
# Custom Proxy files
23+
src/main/java/com/pipedream/api/resources/proxy/AsyncProxyClient.java
24+
src/main/java/com/pipedream/api/resources/proxy/ProxyClient.java
2325

2426
# Custom Workflow files

src/main/java/com/pipedream/api/resources/proxy/AsyncProxyClient.java

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
import com.pipedream.api.resources.proxy.requests.ProxyPatchRequest;
1111
import com.pipedream.api.resources.proxy.requests.ProxyPostRequest;
1212
import com.pipedream.api.resources.proxy.requests.ProxyPutRequest;
13+
14+
import java.util.Base64;
1315
import java.util.concurrent.CompletableFuture;
1416

1517
public class AsyncProxyClient {
@@ -22,6 +24,10 @@ public AsyncProxyClient(ClientOptions clientOptions) {
2224
this.rawClient = new AsyncRawProxyClient(clientOptions);
2325
}
2426

27+
private String encodeUrl(String url) {
28+
return Base64.getUrlEncoder().encodeToString(url.getBytes());
29+
}
30+
2531
/**
2632
* Get responses with HTTP metadata like headers
2733
*/
@@ -32,70 +38,80 @@ public AsyncRawProxyClient withRawResponse() {
3238
/**
3339
* Forward an authenticated GET request to an external API using an external user's account credentials
3440
*/
35-
public CompletableFuture<Object> get(String url64, ProxyGetRequest request) {
41+
public CompletableFuture<Object> get(String url, ProxyGetRequest request) {
42+
final String url64 = encodeUrl(url);
3643
return this.rawClient.get(url64, request).thenApply(response -> response.body());
3744
}
3845

3946
/**
4047
* Forward an authenticated GET request to an external API using an external user's account credentials
4148
*/
42-
public CompletableFuture<Object> get(String url64, ProxyGetRequest request, RequestOptions requestOptions) {
49+
public CompletableFuture<Object> get(String url, ProxyGetRequest request, RequestOptions requestOptions) {
50+
final String url64 = encodeUrl(url);
4351
return this.rawClient.get(url64, request, requestOptions).thenApply(response -> response.body());
4452
}
4553

4654
/**
4755
* Forward an authenticated POST request to an external API using an external user's account credentials
4856
*/
49-
public CompletableFuture<Object> post(String url64, ProxyPostRequest request) {
57+
public CompletableFuture<Object> post(String url, ProxyPostRequest request) {
58+
final String url64 = encodeUrl(url);
5059
return this.rawClient.post(url64, request).thenApply(response -> response.body());
5160
}
5261

5362
/**
5463
* Forward an authenticated POST request to an external API using an external user's account credentials
5564
*/
56-
public CompletableFuture<Object> post(String url64, ProxyPostRequest request, RequestOptions requestOptions) {
65+
public CompletableFuture<Object> post(String url, ProxyPostRequest request, RequestOptions requestOptions) {
66+
final String url64 = encodeUrl(url);
5767
return this.rawClient.post(url64, request, requestOptions).thenApply(response -> response.body());
5868
}
5969

6070
/**
6171
* Forward an authenticated PUT request to an external API using an external user's account credentials
6272
*/
63-
public CompletableFuture<Object> put(String url64, ProxyPutRequest request) {
73+
public CompletableFuture<Object> put(String url, ProxyPutRequest request) {
74+
final String url64 = encodeUrl(url);
6475
return this.rawClient.put(url64, request).thenApply(response -> response.body());
6576
}
6677

6778
/**
6879
* Forward an authenticated PUT request to an external API using an external user's account credentials
6980
*/
70-
public CompletableFuture<Object> put(String url64, ProxyPutRequest request, RequestOptions requestOptions) {
81+
public CompletableFuture<Object> put(String url, ProxyPutRequest request, RequestOptions requestOptions) {
82+
final String url64 = encodeUrl(url);
7183
return this.rawClient.put(url64, request, requestOptions).thenApply(response -> response.body());
7284
}
7385

7486
/**
7587
* Forward an authenticated DELETE request to an external API using an external user's account credentials
7688
*/
77-
public CompletableFuture<Object> delete(String url64, ProxyDeleteRequest request) {
89+
public CompletableFuture<Object> delete(String url, ProxyDeleteRequest request) {
90+
final String url64 = encodeUrl(url);
7891
return this.rawClient.delete(url64, request).thenApply(response -> response.body());
7992
}
8093

8194
/**
8295
* Forward an authenticated DELETE request to an external API using an external user's account credentials
8396
*/
84-
public CompletableFuture<Object> delete(String url64, ProxyDeleteRequest request, RequestOptions requestOptions) {
97+
public CompletableFuture<Object> delete(String url, ProxyDeleteRequest request, RequestOptions requestOptions) {
98+
final String url64 = encodeUrl(url);
8599
return this.rawClient.delete(url64, request, requestOptions).thenApply(response -> response.body());
86100
}
87101

88102
/**
89103
* Forward an authenticated PATCH request to an external API using an external user's account credentials
90104
*/
91-
public CompletableFuture<Object> patch(String url64, ProxyPatchRequest request) {
105+
public CompletableFuture<Object> patch(String url, ProxyPatchRequest request) {
106+
final String url64 = encodeUrl(url);
92107
return this.rawClient.patch(url64, request).thenApply(response -> response.body());
93108
}
94109

95110
/**
96111
* Forward an authenticated PATCH request to an external API using an external user's account credentials
97112
*/
98-
public CompletableFuture<Object> patch(String url64, ProxyPatchRequest request, RequestOptions requestOptions) {
113+
public CompletableFuture<Object> patch(String url, ProxyPatchRequest request, RequestOptions requestOptions) {
114+
final String url64 = encodeUrl(url);
99115
return this.rawClient.patch(url64, request, requestOptions).thenApply(response -> response.body());
100116
}
101117
}

src/main/java/com/pipedream/api/resources/proxy/ProxyClient.java

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
import com.pipedream.api.resources.proxy.requests.ProxyPostRequest;
1212
import com.pipedream.api.resources.proxy.requests.ProxyPutRequest;
1313

14+
import java.util.Base64;
15+
1416
public class ProxyClient {
1517
protected final ClientOptions clientOptions;
1618

@@ -21,6 +23,10 @@ public ProxyClient(ClientOptions clientOptions) {
2123
this.rawClient = new RawProxyClient(clientOptions);
2224
}
2325

26+
private String encodeUrl(String url) {
27+
return Base64.getUrlEncoder().encodeToString(url.getBytes());
28+
}
29+
2430
/**
2531
* Get responses with HTTP metadata like headers
2632
*/
@@ -31,70 +37,80 @@ public RawProxyClient withRawResponse() {
3137
/**
3238
* Forward an authenticated GET request to an external API using an external user's account credentials
3339
*/
34-
public Object get(String url64, ProxyGetRequest request) {
40+
public Object get(String url, ProxyGetRequest request) {
41+
final String url64 = encodeUrl(url);
3542
return this.rawClient.get(url64, request).body();
3643
}
3744

3845
/**
3946
* Forward an authenticated GET request to an external API using an external user's account credentials
4047
*/
41-
public Object get(String url64, ProxyGetRequest request, RequestOptions requestOptions) {
48+
public Object get(String url, ProxyGetRequest request, RequestOptions requestOptions) {
49+
final String url64 = encodeUrl(url);
4250
return this.rawClient.get(url64, request, requestOptions).body();
4351
}
4452

4553
/**
4654
* Forward an authenticated POST request to an external API using an external user's account credentials
4755
*/
48-
public Object post(String url64, ProxyPostRequest request) {
56+
public Object post(String url, ProxyPostRequest request) {
57+
final String url64 = encodeUrl(url);
4958
return this.rawClient.post(url64, request).body();
5059
}
5160

5261
/**
5362
* Forward an authenticated POST request to an external API using an external user's account credentials
5463
*/
55-
public Object post(String url64, ProxyPostRequest request, RequestOptions requestOptions) {
64+
public Object post(String url, ProxyPostRequest request, RequestOptions requestOptions) {
65+
final String url64 = encodeUrl(url);
5666
return this.rawClient.post(url64, request, requestOptions).body();
5767
}
5868

5969
/**
6070
* Forward an authenticated PUT request to an external API using an external user's account credentials
6171
*/
62-
public Object put(String url64, ProxyPutRequest request) {
72+
public Object put(String url, ProxyPutRequest request) {
73+
final String url64 = encodeUrl(url);
6374
return this.rawClient.put(url64, request).body();
6475
}
6576

6677
/**
6778
* Forward an authenticated PUT request to an external API using an external user's account credentials
6879
*/
69-
public Object put(String url64, ProxyPutRequest request, RequestOptions requestOptions) {
80+
public Object put(String url, ProxyPutRequest request, RequestOptions requestOptions) {
81+
final String url64 = encodeUrl(url);
7082
return this.rawClient.put(url64, request, requestOptions).body();
7183
}
7284

7385
/**
7486
* Forward an authenticated DELETE request to an external API using an external user's account credentials
7587
*/
76-
public Object delete(String url64, ProxyDeleteRequest request) {
88+
public Object delete(String url, ProxyDeleteRequest request) {
89+
final String url64 = encodeUrl(url);
7790
return this.rawClient.delete(url64, request).body();
7891
}
7992

8093
/**
8194
* Forward an authenticated DELETE request to an external API using an external user's account credentials
8295
*/
83-
public Object delete(String url64, ProxyDeleteRequest request, RequestOptions requestOptions) {
96+
public Object delete(String url, ProxyDeleteRequest request, RequestOptions requestOptions) {
97+
final String url64 = encodeUrl(url);
8498
return this.rawClient.delete(url64, request, requestOptions).body();
8599
}
86100

87101
/**
88102
* Forward an authenticated PATCH request to an external API using an external user's account credentials
89103
*/
90-
public Object patch(String url64, ProxyPatchRequest request) {
104+
public Object patch(String url, ProxyPatchRequest request) {
105+
final String url64 = encodeUrl(url);
91106
return this.rawClient.patch(url64, request).body();
92107
}
93108

94109
/**
95110
* Forward an authenticated PATCH request to an external API using an external user's account credentials
96111
*/
97-
public Object patch(String url64, ProxyPatchRequest request, RequestOptions requestOptions) {
112+
public Object patch(String url, ProxyPatchRequest request, RequestOptions requestOptions) {
113+
final String url64 = encodeUrl(url);
98114
return this.rawClient.patch(url64, request, requestOptions).body();
99115
}
100116
}

0 commit comments

Comments
 (0)