Skip to content

Commit 2474eb1

Browse files
committed
Fix PKCE clientSecret issue
1 parent 834ee88 commit 2474eb1

File tree

2 files changed

+20
-7
lines changed

2 files changed

+20
-7
lines changed

RingCentral.Net/RestClient.cs

+14-6
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,21 @@ public async Task<HttpResponseMessage> Request(HttpRequestMessage httpRequestMes
6969
{
7070
restRequestConfig = restRequestConfig ?? RestRequestConfig.DefaultInstance;
7171

72-
httpRequestMessage.Headers.Add("X-User-Agent", $"{appName}/{appVersion} RingCentral.Net/6.2.0");
73-
httpRequestMessage.Headers.Authorization =
74-
BasicAuthPaths.Contains(httpRequestMessage.RequestUri.AbsolutePath)
75-
? new AuthenticationHeaderValue("Basic",
72+
httpRequestMessage.Headers.Add("X-User-Agent", $"{appName}/{appVersion} RingCentral.Net/6.2.1");
73+
if (BasicAuthPaths.Contains(httpRequestMessage.RequestUri.AbsolutePath))
74+
{
75+
if (clientSecret != default(string))
76+
{
77+
httpRequestMessage.Headers.Authorization = new AuthenticationHeaderValue("Basic",
7678
Convert.ToBase64String(
77-
Encoding.UTF8.GetBytes($"{clientId}:{clientSecret}")))
78-
: new AuthenticationHeaderValue("Bearer", token.access_token);
79+
Encoding.UTF8.GetBytes($"{clientId}:{clientSecret}")));
80+
}
81+
// else: PKCE doesn't require a clientSecret
82+
}
83+
else
84+
{
85+
httpRequestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token.access_token);
86+
}
7987

8088
var httpResponseMessage =
8189
await httpClient.SendAsync(httpRequestMessage, restRequestConfig.cancellationToken);

RingCentral.Net/RingCentral.Net.csproj

+6-1
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,22 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<PackageId>RingCentral.Net</PackageId>
6-
<PackageVersion>6.2.0</PackageVersion>
6+
<PackageVersion>6.2.1</PackageVersion>
77
<Authors>Tyler Liu ([email protected])</Authors>
88
<Description>RingCentral SDK for .NET</Description>
99
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1010
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
1111
<PackageTags>RingCentral</PackageTags>
1212
<RootNamespace>RingCentral</RootNamespace>
13+
<PackageReadmeFile>README.md</PackageReadmeFile>
1314
</PropertyGroup>
1415

1516
<ItemGroup>
1617
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0"/>
18+
<None Include="../README.md">
19+
<Pack>True</Pack>
20+
<PackagePath>README.md</PackagePath>
21+
</None>
1722
</ItemGroup>
1823

1924
</Project>

0 commit comments

Comments
 (0)