Skip to content

fix: Add basic auth to Cellm provider HttpClient #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kaspermarstal merged 1 commit into from
Apr 19, 2025
Merged

fix: Add basic auth to Cellm provider HttpClient #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Cellm/Models/ServiceCollectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,10 @@ public static IServiceCollection AddCellmChatClient(this IServiceCollection serv

var cellmConfiguration = serviceProvider.GetRequiredService<IOptionsMonitor<CellmConfiguration>>();
var resilientHttpClient = serviceProvider.GetKeyedService<HttpClient>("ResilientHttpClient") ?? throw new NullReferenceException("ResilientHttpClient");
resilientHttpClient.DefaultRequestHeaders.Add("Authorization", $"Basic {account.GetBasicAuthCredentials()}");

var openAiClient = new OpenAIClient(
new ApiKeyCredential(account.GetCredentials()),
new ApiKeyCredential(string.Empty),
new OpenAIClientOptions
{
Transport = new HttpClientPipelineTransport(resilientHttpClient),
Expand Down
7 changes: 4 additions & 3 deletions src/Cellm/Users/Account.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ internal async Task<bool> HasEntitlementAsync(Entitlement entitlement)
}

var entitlements = await cache.GetOrCreateAsync(
nameof(GetEntitlements) + GetCredentials(),
nameof(GetEntitlements) + GetBasicAuthCredentials(),
async innerCancellationToken => await GetEntitlements(innerCancellationToken),
options: _cacheEntryOptions,
Tags,
Expand All @@ -81,19 +81,20 @@ internal void RequireEntitlement(Entitlement entitlement)
Task.Run(async () => await RequireEntitlementAsync(entitlement)).GetAwaiter().GetResult();
}

public string GetCredentials()
public string GetBasicAuthCredentials()
{
var credentials = $"{accountConfiguration.CurrentValue.Username}:{accountConfiguration.CurrentValue.Password}";
var credentialsBytes = Encoding.UTF8.GetBytes(credentials);
var credentialsAsBase64 = Convert.ToBase64String(credentialsBytes);

return credentialsAsBase64;
}

private async Task<ActiveEntitlements> GetEntitlements(CancellationToken cancellationToken)
{

var request = new HttpRequestMessage(HttpMethod.Get, new Uri(accountConfiguration.CurrentValue.BaseAddress, "user/permissions"));
request.Headers.Add("Authorization", $"Basic {GetCredentials()}");
request.Headers.Add("Authorization", $"Basic {GetBasicAuthCredentials()}");

try
{
Expand Down