Skip to content

Commit 7ae1ca0

Browse files
refactor(client): pass around ClientOptions instead of client
1 parent 9284c15 commit 7ae1ca0

File tree

120 files changed

+603
-598
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+603
-598
lines changed

src/Orb/Core/ParamsBase.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public IReadOnlyDictionary<string, JsonElement> HeaderProperties
2424
get { return this._headerProperties.Freeze(); }
2525
}
2626

27-
public abstract Uri Url(IOrbClient client);
27+
public abstract Uri Url(ClientOptions options);
2828

2929
protected static void AddQueryElementToCollection(
3030
NameValueCollection collection,
@@ -126,7 +126,7 @@ JsonElement element
126126
}
127127
}
128128

129-
protected string QueryString(IOrbClient client)
129+
protected string QueryString(ClientOptions options)
130130
{
131131
NameValueCollection collection = [];
132132
foreach (var item in this.QueryProperties)
@@ -152,18 +152,18 @@ protected string QueryString(IOrbClient client)
152152
return sb.ToString();
153153
}
154154

155-
internal abstract void AddHeadersToRequest(HttpRequestMessage request, IOrbClient client);
155+
internal abstract void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options);
156156

157157
internal virtual StringContent? BodyContent()
158158
{
159159
return null;
160160
}
161161

162-
protected static void AddDefaultHeaders(HttpRequestMessage request, IOrbClient client)
162+
protected static void AddDefaultHeaders(HttpRequestMessage request, ClientOptions options)
163163
{
164-
if (client.APIKey != null)
164+
if (options.APIKey != null)
165165
{
166-
request.Headers.Add("Authorization", string.Format("Bearer {0}", client.APIKey));
166+
request.Headers.Add("Authorization", string.Format("Bearer {0}", options.APIKey));
167167
}
168168
}
169169
}

src/Orb/Models/Alerts/AlertCreateForCustomerParams.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,14 @@ IReadOnlyDictionary<string, JsonElement> bodyProperties
148148
);
149149
}
150150

151-
public override System::Uri Url(IOrbClient client)
151+
public override System::Uri Url(ClientOptions options)
152152
{
153153
return new System::UriBuilder(
154-
client.BaseUrl.ToString().TrimEnd('/')
154+
options.BaseUrl.ToString().TrimEnd('/')
155155
+ string.Format("/alerts/customer_id/{0}", this.CustomerID)
156156
)
157157
{
158-
Query = this.QueryString(client),
158+
Query = this.QueryString(options),
159159
}.Uri;
160160
}
161161

@@ -168,9 +168,9 @@ IReadOnlyDictionary<string, JsonElement> bodyProperties
168168
);
169169
}
170170

171-
internal override void AddHeadersToRequest(HttpRequestMessage request, IOrbClient client)
171+
internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
172172
{
173-
ParamsBase.AddDefaultHeaders(request, client);
173+
ParamsBase.AddDefaultHeaders(request, options);
174174
foreach (var item in this.HeaderProperties)
175175
{
176176
ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);

src/Orb/Models/Alerts/AlertCreateForExternalCustomerParams.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,14 @@ IReadOnlyDictionary<string, JsonElement> bodyProperties
148148
);
149149
}
150150

151-
public override System::Uri Url(IOrbClient client)
151+
public override System::Uri Url(ClientOptions options)
152152
{
153153
return new System::UriBuilder(
154-
client.BaseUrl.ToString().TrimEnd('/')
154+
options.BaseUrl.ToString().TrimEnd('/')
155155
+ string.Format("/alerts/external_customer_id/{0}", this.ExternalCustomerID)
156156
)
157157
{
158-
Query = this.QueryString(client),
158+
Query = this.QueryString(options),
159159
}.Uri;
160160
}
161161

@@ -168,9 +168,9 @@ IReadOnlyDictionary<string, JsonElement> bodyProperties
168168
);
169169
}
170170

171-
internal override void AddHeadersToRequest(HttpRequestMessage request, IOrbClient client)
171+
internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
172172
{
173-
ParamsBase.AddDefaultHeaders(request, client);
173+
ParamsBase.AddDefaultHeaders(request, options);
174174
foreach (var item in this.HeaderProperties)
175175
{
176176
ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);

src/Orb/Models/Alerts/AlertCreateForSubscriptionParams.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,14 +153,14 @@ IReadOnlyDictionary<string, JsonElement> bodyProperties
153153
);
154154
}
155155

156-
public override System::Uri Url(IOrbClient client)
156+
public override System::Uri Url(ClientOptions options)
157157
{
158158
return new System::UriBuilder(
159-
client.BaseUrl.ToString().TrimEnd('/')
159+
options.BaseUrl.ToString().TrimEnd('/')
160160
+ string.Format("/alerts/subscription_id/{0}", this.SubscriptionID)
161161
)
162162
{
163-
Query = this.QueryString(client),
163+
Query = this.QueryString(options),
164164
}.Uri;
165165
}
166166

@@ -173,9 +173,9 @@ IReadOnlyDictionary<string, JsonElement> bodyProperties
173173
);
174174
}
175175

176-
internal override void AddHeadersToRequest(HttpRequestMessage request, IOrbClient client)
176+
internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
177177
{
178-
ParamsBase.AddDefaultHeaders(request, client);
178+
ParamsBase.AddDefaultHeaders(request, options);
179179
foreach (var item in this.HeaderProperties)
180180
{
181181
ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);

src/Orb/Models/Alerts/AlertDisableParams.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,20 +72,20 @@ IReadOnlyDictionary<string, JsonElement> queryProperties
7272
);
7373
}
7474

75-
public override System::Uri Url(IOrbClient client)
75+
public override System::Uri Url(ClientOptions options)
7676
{
7777
return new System::UriBuilder(
78-
client.BaseUrl.ToString().TrimEnd('/')
78+
options.BaseUrl.ToString().TrimEnd('/')
7979
+ string.Format("/alerts/{0}/disable", this.AlertConfigurationID)
8080
)
8181
{
82-
Query = this.QueryString(client),
82+
Query = this.QueryString(options),
8383
}.Uri;
8484
}
8585

86-
internal override void AddHeadersToRequest(HttpRequestMessage request, IOrbClient client)
86+
internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
8787
{
88-
ParamsBase.AddDefaultHeaders(request, client);
88+
ParamsBase.AddDefaultHeaders(request, options);
8989
foreach (var item in this.HeaderProperties)
9090
{
9191
ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);

src/Orb/Models/Alerts/AlertEnableParams.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,20 +72,20 @@ IReadOnlyDictionary<string, JsonElement> queryProperties
7272
);
7373
}
7474

75-
public override System::Uri Url(IOrbClient client)
75+
public override System::Uri Url(ClientOptions options)
7676
{
7777
return new System::UriBuilder(
78-
client.BaseUrl.ToString().TrimEnd('/')
78+
options.BaseUrl.ToString().TrimEnd('/')
7979
+ string.Format("/alerts/{0}/enable", this.AlertConfigurationID)
8080
)
8181
{
82-
Query = this.QueryString(client),
82+
Query = this.QueryString(options),
8383
}.Uri;
8484
}
8585

86-
internal override void AddHeadersToRequest(HttpRequestMessage request, IOrbClient client)
86+
internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
8787
{
88-
ParamsBase.AddDefaultHeaders(request, client);
88+
ParamsBase.AddDefaultHeaders(request, options);
8989
foreach (var item in this.HeaderProperties)
9090
{
9191
ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);

src/Orb/Models/Alerts/AlertListParams.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -250,17 +250,17 @@ IReadOnlyDictionary<string, JsonElement> queryProperties
250250
);
251251
}
252252

253-
public override System::Uri Url(IOrbClient client)
253+
public override System::Uri Url(ClientOptions options)
254254
{
255-
return new System::UriBuilder(client.BaseUrl.ToString().TrimEnd('/') + "/alerts")
255+
return new System::UriBuilder(options.BaseUrl.ToString().TrimEnd('/') + "/alerts")
256256
{
257-
Query = this.QueryString(client),
257+
Query = this.QueryString(options),
258258
}.Uri;
259259
}
260260

261-
internal override void AddHeadersToRequest(HttpRequestMessage request, IOrbClient client)
261+
internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
262262
{
263-
ParamsBase.AddDefaultHeaders(request, client);
263+
ParamsBase.AddDefaultHeaders(request, options);
264264
foreach (var item in this.HeaderProperties)
265265
{
266266
ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);

src/Orb/Models/Alerts/AlertRetrieveParams.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,19 @@ IReadOnlyDictionary<string, JsonElement> queryProperties
4949
);
5050
}
5151

52-
public override System::Uri Url(IOrbClient client)
52+
public override System::Uri Url(ClientOptions options)
5353
{
5454
return new System::UriBuilder(
55-
client.BaseUrl.ToString().TrimEnd('/') + string.Format("/alerts/{0}", this.AlertID)
55+
options.BaseUrl.ToString().TrimEnd('/') + string.Format("/alerts/{0}", this.AlertID)
5656
)
5757
{
58-
Query = this.QueryString(client),
58+
Query = this.QueryString(options),
5959
}.Uri;
6060
}
6161

62-
internal override void AddHeadersToRequest(HttpRequestMessage request, IOrbClient client)
62+
internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
6363
{
64-
ParamsBase.AddDefaultHeaders(request, client);
64+
ParamsBase.AddDefaultHeaders(request, options);
6565
foreach (var item in this.HeaderProperties)
6666
{
6767
ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);

src/Orb/Models/Alerts/AlertUpdateParams.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,14 @@ IReadOnlyDictionary<string, JsonElement> bodyProperties
9494
);
9595
}
9696

97-
public override System::Uri Url(IOrbClient client)
97+
public override System::Uri Url(ClientOptions options)
9898
{
9999
return new System::UriBuilder(
100-
client.BaseUrl.ToString().TrimEnd('/')
100+
options.BaseUrl.ToString().TrimEnd('/')
101101
+ string.Format("/alerts/{0}", this.AlertConfigurationID)
102102
)
103103
{
104-
Query = this.QueryString(client),
104+
Query = this.QueryString(options),
105105
}.Uri;
106106
}
107107

@@ -114,9 +114,9 @@ IReadOnlyDictionary<string, JsonElement> bodyProperties
114114
);
115115
}
116116

117-
internal override void AddHeadersToRequest(HttpRequestMessage request, IOrbClient client)
117+
internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
118118
{
119-
ParamsBase.AddDefaultHeaders(request, client);
119+
ParamsBase.AddDefaultHeaders(request, options);
120120
foreach (var item in this.HeaderProperties)
121121
{
122122
ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);

src/Orb/Models/Beta/BetaCreatePlanVersionParams.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -253,14 +253,14 @@ IReadOnlyDictionary<string, JsonElement> bodyProperties
253253
);
254254
}
255255

256-
public override System::Uri Url(IOrbClient client)
256+
public override System::Uri Url(ClientOptions options)
257257
{
258258
return new System::UriBuilder(
259-
client.BaseUrl.ToString().TrimEnd('/')
259+
options.BaseUrl.ToString().TrimEnd('/')
260260
+ string.Format("/plans/{0}/versions", this.PlanID)
261261
)
262262
{
263-
Query = this.QueryString(client),
263+
Query = this.QueryString(options),
264264
}.Uri;
265265
}
266266

@@ -273,9 +273,9 @@ IReadOnlyDictionary<string, JsonElement> bodyProperties
273273
);
274274
}
275275

276-
internal override void AddHeadersToRequest(HttpRequestMessage request, IOrbClient client)
276+
internal override void AddHeadersToRequest(HttpRequestMessage request, ClientOptions options)
277277
{
278-
ParamsBase.AddDefaultHeaders(request, client);
278+
ParamsBase.AddDefaultHeaders(request, options);
279279
foreach (var item in this.HeaderProperties)
280280
{
281281
ParamsBase.AddHeaderElementToRequest(request, item.Key, item.Value);

0 commit comments

Comments
 (0)