loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

quick edit to allow tokens to refresh if they specify an expires_in and created fields. Also supports refresh_token if that is passed.

Browse Source
This commit is contained in:
Bryan Aldrich 2024-12-03 13:12:15 -05:00
parent 423ba6739a
commit 3915e020cf
2 changed files with 48 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
modules/openapi-generator/src/main/resources/csharp/auth/OAuthAuthenticator.mustache vendored
View File

@ -11,8 +11,22 @@ namespace {{packageName}}.Client.Auth
/// <summary> /// <summary>
/// An authenticator for OAuth2 authentication flows /// An authenticator for OAuth2 authentication flows
/// </summary> /// </summary>
public class OAuthAuthenticator : AuthenticatorBase public class OAuthAuthenticator : IAuthenticator
{ {
private TokenResponse{{nrt?}} _token;
public string{{nrt?}} Token
{
get
{
if (_token == null) return null;
if (_token.ExpiresIn == null) return _token.AccessToken;
if (_token.ExpiresAt < DateTime.Now) return null;
return _token.AccessToken;
}
}
readonly string _tokenUrl; readonly string _tokenUrl;
readonly string _clientId; readonly string _clientId;
readonly string _clientSecret; readonly string _clientSecret;
@ -31,7 +45,7 @@ namespace {{packageName}}.Client.Auth
string{{nrt?}} scope, string{{nrt?}} scope,
OAuthFlow? flow, OAuthFlow? flow,
JsonSerializerSettings serializerSettings, JsonSerializerSettings serializerSettings,
IReadableConfiguration configuration) : base("") IReadableConfiguration configuration)
{ {
_tokenUrl = tokenUrl; _tokenUrl = tokenUrl;
_clientId = clientId; _clientId = clientId;
@ -64,10 +78,10 @@ namespace {{packageName}}.Client.Auth
/// </summary> /// </summary>
/// <param name="accessToken">Access token to create a parameter from.</param> /// <param name="accessToken">Access token to create a parameter from.</param>
/// <returns>An authentication parameter.</returns> /// <returns>An authentication parameter.</returns>
protected override async ValueTask<Parameter> GetAuthenticationParameter(string accessToken) protected async ValueTask<Parameter> GetAuthenticationParameter()
{ {
var token = string.IsNullOrEmpty(Token) ? await GetToken().ConfigureAwait(false) : Token; var token = string.IsNullOrEmpty(Token) ? await GetToken().ConfigureAwait(false) : Token;
return new HeaderParameter(KnownHeaders.Authorization, token); return new HeaderParameter(KnownHeaders.Authorization, token!);
} }
/// <summary> /// <summary>
@ -76,31 +90,39 @@ namespace {{packageName}}.Client.Auth
/// <returns>An authentication token.</returns> /// <returns>An authentication token.</returns>
async Task<string> GetToken() async Task<string> GetToken()
{ {
var client = new RestClient(_tokenUrl, var client = new RestClient(_tokenUrl, configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(_serializerSettings, _configuration)));
configureSerialization: serializerConfig => serializerConfig.UseSerializer(() => new CustomJsonCodec(_serializerSettings, _configuration)));
var request = new RestRequest()
.AddParameter("grant_type", _grantType)
.AddParameter("client_id", _clientId)
.AddParameter("client_secret", _clientSecret);
var request = new RestRequest();
if (!string.IsNullOrWhiteSpace(_token?.RefreshToken))
{
request.AddParameter("grant_type", "refresh_token")
.AddParameter("refresh_token", _token!.RefreshToken);
}
else
{
request
.AddParameter("grant_type", _grantType)
.AddParameter("client_id", _clientId)
.AddParameter("client_secret", _clientSecret);
}
if (!string.IsNullOrEmpty(_scope)) if (!string.IsNullOrEmpty(_scope))
{ {
request.AddParameter("scope", _scope); request.AddParameter("scope", _scope);
} }
_token = await client.PostAsync<TokenResponse>(request).ConfigureAwait(false);
var response = await client.PostAsync<TokenResponse>(request).ConfigureAwait(false);
// RFC6749 - token_type is case insensitive. // RFC6749 - token_type is case insensitive.
// RFC6750 - In Authorization header Bearer should be capitalized. // RFC6750 - In Authorization header Bearer should be capitalized.
// Fix the capitalization irrespective of token_type casing. // Fix the capitalization irrespective of token_type casing.
switch (response.TokenType?.ToLower()) switch (_token?.TokenType?.ToLower())
{ {
case "bearer": case "bearer":
return $"Bearer {response.AccessToken}"; return $"Bearer {_token.AccessToken}";
default: default:
return $"{response.TokenType} {response.AccessToken}"; return $"{_token?.TokenType} {_token?.AccessToken}";
} }
} }
public async ValueTask Authenticate(IRestClient client, RestRequest request)
=> request.AddOrUpdateParameter(await GetAuthenticationParameter().ConfigureAwait(false));
} }
} }

9
modules/openapi-generator/src/main/resources/csharp/auth/TokenResponse.mustache vendored
View File

@ -10,5 +10,14 @@ namespace {{packageName}}.Client.Auth
public string TokenType { get; set; } public string TokenType { get; set; }
[JsonProperty("access_token")] [JsonProperty("access_token")]
public string AccessToken { get; set; } public string AccessToken { get; set; }
[JsonProperty("expires_in")]
public int? ExpiresIn { get; set; }
[JsonProperty("created")]
public DateTime Created { get; set; }
[JsonProperty("refresh_token")]
public string{{nrt?}} RefreshToken { get; set; }
public DateTime? ExpiresAt => ExpiresIn == null ? null : Created.AddSeconds(ExpiresIn.Value);
} }
} }