Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
61f7c0f05e
|
|||
|
20518b8f6a
|
|||
|
8249714c6b
|
|||
|
7e1e5c76b7
|
@@ -33,10 +33,6 @@ jobs:
|
|||||||
- name: Build and Pack NuGet Package
|
- name: Build and Pack NuGet Package
|
||||||
run: dotnet pack -c Release -o ./artifacts -p:Version=${{ env.RELEASE_VERSION }}
|
run: dotnet pack -c Release -o ./artifacts -p:Version=${{ env.RELEASE_VERSION }}
|
||||||
|
|
||||||
- name: Publish Nugets to NuGet.org
|
- name: Publish to NuGet.org
|
||||||
run: |
|
run: |
|
||||||
dotnet nuget push ./artifacts/*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_API_KEY }}
|
dotnet nuget push ./artifacts/*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_API_KEY }}
|
||||||
|
|
||||||
- name: Publish Symbols to NuGet.org
|
|
||||||
run: |
|
|
||||||
dotnet nuget push ./artifacts/*.snupkg --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_API_KEY }}
|
|
||||||
+1
-1
@@ -9,7 +9,7 @@
|
|||||||
<Company>Open Harbor</Company>
|
<Company>Open Harbor</Company>
|
||||||
<PackageIcon>icon.png</PackageIcon>
|
<PackageIcon>icon.png</PackageIcon>
|
||||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||||
<RepositoryUrl>https://git.openharbor.io/Open-Harbor/dotnet-cqrs</RepositoryUrl>
|
<RepositoryUrl>https://git.openharbor.io/Open-Harbor/dotnet-jwt-token-manager</RepositoryUrl>
|
||||||
<RepositoryType>git</RepositoryType>
|
<RepositoryType>git</RepositoryType>
|
||||||
<PublishRepositoryUrl>true</PublishRepositoryUrl>
|
<PublishRepositoryUrl>true</PublishRepositoryUrl>
|
||||||
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
||||||
|
|||||||
@@ -6,5 +6,6 @@ public class JwtTokenManagerOptions
|
|||||||
public required string ClientId { get; set; }
|
public required string ClientId { get; set; }
|
||||||
public required string ClientSecret { get; set; }
|
public required string ClientSecret { get; set; }
|
||||||
public IEnumerable<string> Scopes { get; set; } = Array.Empty<string>();
|
public IEnumerable<string> Scopes { get; set; } = Array.Empty<string>();
|
||||||
|
public bool IsCredentialsInHeader { get; set; } = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
using System.Net.Http.Headers;
|
using System.Net.Http.Headers;
|
||||||
using System.Net.Http.Json;
|
using System.Net.Http.Json;
|
||||||
|
using System.Text;
|
||||||
using Microsoft.Extensions.Caching.Memory;
|
using Microsoft.Extensions.Caching.Memory;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using OpenHarbor.JwtTokenManager.Abstractions;
|
using OpenHarbor.JwtTokenManager.Abstractions;
|
||||||
@@ -24,18 +25,32 @@ public class JwtTokenManagerService(JwtTokenManagerOptions options, IHttpClientF
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var formContent = new FormUrlEncodedContent([
|
var formContentKeyValues = new List<KeyValuePair<string, string>>()
|
||||||
new KeyValuePair<string, string>("grant_type", "client_credentials"),
|
{
|
||||||
|
new ("grant_type", "client_credentials"),
|
||||||
|
new ("scopes", string.Join(" ", _scopes))
|
||||||
|
};
|
||||||
|
|
||||||
|
if (options.IsCredentialsInHeader)
|
||||||
|
{
|
||||||
|
formContentKeyValues.AddRange([
|
||||||
new KeyValuePair<string, string>("client_id", options.ClientId),
|
new KeyValuePair<string, string>("client_id", options.ClientId),
|
||||||
new KeyValuePair<string, string>("client_secret", options.ClientSecret),
|
new KeyValuePair<string, string>("client_secret", options.ClientSecret)
|
||||||
new KeyValuePair<string, string>("scopes", string.Join(" ", _scopes))
|
|
||||||
]);
|
]);
|
||||||
|
}
|
||||||
|
var formContent = new FormUrlEncodedContent(formContentKeyValues);
|
||||||
|
|
||||||
var request = new HttpRequestMessage(HttpMethod.Post, options.TokenEndpoint)
|
var request = new HttpRequestMessage(HttpMethod.Post, options.TokenEndpoint)
|
||||||
{
|
{
|
||||||
Content = formContent
|
Content = formContent
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if (false == options.IsCredentialsInHeader)
|
||||||
|
{
|
||||||
|
var credentials = Convert.ToBase64String(Encoding.ASCII.GetBytes($"{options.ClientId}:{options.ClientSecret}"));
|
||||||
|
request.Headers.Authorization = new AuthenticationHeaderValue("Basic", credentials);
|
||||||
|
}
|
||||||
|
|
||||||
request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
|
request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
|
||||||
|
|
||||||
var response = await _httpClient.SendAsync(request, cancellationToken);
|
var response = await _httpClient.SendAsync(request, cancellationToken);
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
<Company>Open Harbor</Company>
|
<Company>Open Harbor</Company>
|
||||||
<PackageIcon>icon.png</PackageIcon>
|
<PackageIcon>icon.png</PackageIcon>
|
||||||
<PackageReadmeFile>README.md</PackageReadmeFile>
|
<PackageReadmeFile>README.md</PackageReadmeFile>
|
||||||
<RepositoryUrl>https://git.openharbor.io/Open-Harbor/dotnet-cqrs</RepositoryUrl>
|
<RepositoryUrl>https://git.openharbor.io/Open-Harbor/dotnet-jwt-token-manager</RepositoryUrl>
|
||||||
<RepositoryType>git</RepositoryType>
|
<RepositoryType>git</RepositoryType>
|
||||||
<PublishRepositoryUrl>true</PublishRepositoryUrl>
|
<PublishRepositoryUrl>true</PublishRepositoryUrl>
|
||||||
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
||||||
|
|||||||
@@ -4,10 +4,10 @@
|
|||||||
|
|
||||||
> Install nuget package to your awesome project.
|
> Install nuget package to your awesome project.
|
||||||
|
|
||||||
| Full Version | NuGet | NuGet Install |
|
| Package Name | NuGet | NuGet Install |
|
||||||
|-----------------------------------------| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |----------------------------------------------------------------------------:|
|
|-----------------------------------------| -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |----------------------------------------------------------------------------:|
|
||||||
| OpenHarbor.JwtTokenManager | <a href="https://www.nuget.org/packages/OpenHarbor.JwtTokenManager" target="_blank">[](https://www.nuget.org/packages/OpenHarbor.JwtTokenManager/)</a> | ```PM> Install-Package OpenHarbor.JwtTokenManager``` |
|
| OpenHarbor.JwtTokenManager | [](https://www.nuget.org/packages/OpenHarbor.JwtTokenManager/) | ```PM> Install-Package OpenHarbor.JwtTokenManager``` |
|
||||||
| OpenHarbor.JwtTokenManager.Abstractions | <a href="https://www.nuget.org/packages/OpenHarbor.JwtTokenManager.Abstractions" target="_blank">[](https://www.nuget.org/packages/OpenHarbor.JwtTokenManager.Abstractions/)</a> | ```PM> Install-Package OpenHarbor.JwtTokenManager.Abstractions``` |
|
| OpenHarbor.JwtTokenManager.Abstractions | [](https://www.nuget.org/packages/OpenHarbor.JwtTokenManager.Abstractions/) | ```PM> Install-Package OpenHarbor.JwtTokenManager.Abstractions``` |
|
||||||
|
|
||||||
# How to use
|
# How to use
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user