Skip to content
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

Jump to bottom

Make it choosable where client id and secret are put and improve expi… #3970

Merged
merged 3 commits into from May 2, 2023
Merged

Make it choosable where client id and secret are put and improve expi… #3970

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05272c3
Make it choosable where client id and secret are put and improve expi…
tanelkuhi Apr 27, 2023
3682a8c
Improve oauth2 habndling further
tanelkuhi Apr 28, 2023
ff31392
Add null check for client secret value
tanelkuhi May 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 26 additions & 2 deletions ...gner/elsa-workflows-studio/src/modules/credential-manager/models/secrets/oauth2.secret.ts
View file
Open in desktop
Expand Up @@ -74,17 +74,41 @@ export const OAuth2: Secret = {
type: 'System.String',
uiHint: 'single-line',
},
{
disableWorkflowProviderSelection: false,
isBrowsable: true,
isReadOnly: false,
label: 'Token endpoint client authentication method',
name: 'ClientAuthMethod',
order: 4,
supportedSyntaxes: ['Literal'],
type: 'System.String',
uiHint: 'dropdown',
options: {
isFlagsEnum: false,
items: [
{
text: 'Client secret: Basic',
value: 'client_secret_basic',
},
{
text: 'Client secret: Post',
value: 'client_secret_post',
}
]
}
},
{
disableWorkflowProviderSelection: false,
isBrowsable: true,
isReadOnly: false,
label: 'Scope',
name: 'Scope',
order: 4,
order: 5,
supportedSyntaxes: ['Literal'],
type: 'System.String',
uiHint: 'single-line',
},
}
],
type: 'OAuth2',
};
37 changes: 31 additions & 6 deletions src/modules/secrets/Elsa.Secrets.Http/Services/OAuth2TokenService.cs
View file
Open in desktop
Expand Up @@ -43,14 +43,17 @@ public async Task<TokenResponse> GetToken(Secret secret, string? authCode, strin
{
var clientId = secret.GetProperty("ClientId");
var clientSecret = secret.GetProperty("ClientSecret");
var clientAuthMethod = secret.GetProperty("ClientAuthMethod") ?? "client_secret_basic";
var content = new Dictionary<string, string>
{
{ "grant_type", secret.GetProperty("GrantType") },
{ "client_id", clientId },
{ "client_secret", clientSecret },
{ "offline_access ", "true" }
{ "grant_type", secret.GetProperty("GrantType") }
};

if (clientAuthMethod == "client_secret_post")
{
content.Add("client_id", clientId);
content.Add("client_secret", clientSecret);
}
if (authCode != null)
{
content.Add("code", authCode);
Expand All @@ -67,6 +70,10 @@ public async Task<TokenResponse> GetToken(Secret secret, string? authCode, strin
{
var httpClient = _httpClientFactory.CreateClient(nameof(OAuth2TokenService));
httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
if (clientAuthMethod == "client_secret_basic")
{
httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", GenerateAuthorizationValue(clientId, clientSecret));
}

var response = await httpClient.PostAsync(secret.GetProperty("AccessTokenUrl"), new FormUrlEncodedContent(content));
var json = await response.Content.ReadAsStringAsync();
Expand All @@ -92,17 +99,28 @@ public async Task<TokenResponse> GetToken(Secret secret, string? authCode, strin

public async Task<TokenResponse> GetTokenByRefreshToken(Secret secret, string refreshToken)
{
var clientId = secret.GetProperty("ClientId");
var clientSecret = secret.GetProperty("ClientSecret");
var clientAuthMethod = secret.GetProperty("ClientAuthMethod") ?? "client_secret_basic";
var content = new Dictionary<string, string>
{
{ "grant_type", "refresh_token" },
{ "client_id", secret.GetProperty("ClientId") },
{ "client_secret", secret.GetProperty("ClientSecret") },
{ "refresh_token", refreshToken }
};

if (clientAuthMethod == "client_secret_post")
{
content.Add("client_id", clientId);
content.Add("client_secret", clientSecret);
}

try
{
var httpClient = _httpClientFactory.CreateClient(nameof(OAuth2TokenService));
if (clientAuthMethod == "client_secret_basic")
{
httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", GenerateAuthorizationValue(clientId, clientSecret));
}
var response = await httpClient.PostAsync(secret.GetProperty("AccessTokenUrl"), new FormUrlEncodedContent(content));
var json = await response.Content.ReadAsStringAsync();
var result = JsonConvert.DeserializeObject<TokenResponse>(json);
Expand Down Expand Up @@ -135,4 +153,11 @@ public async Task<TokenResponse> GetTokenByRefreshToken(Secret secret, string re
throw;
}
}

private static string GenerateAuthorizationValue(string clientId, string clientSecret)
{
var encodedClientId = Uri.EscapeDataString(clientId).Replace("%20", "+");
var encodedClientSecret = Uri.EscapeDataString(clientSecret).Replace("%20", "+");
return Base64Encode(encodedClientId + ":" + encodedClientSecret);
}
}