pvanoort/FarmMapsApiClient_WUR
1
0
Fork 0
forked from FarmMaps/FarmMapsApiClient
Code Pull Requests Activity

AW-3569 Added posibility to login with username/password

Browse Source
This commit is contained in:
Mark [extern]
2022-02-23 10:33:59 +01:00
parent 2790beaa88
commit e07fb2de7a
5 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
FarmmapsApi/Models/Configuration.cs
View File

@@ -7,8 +7,11 @@
public string BasePath { get; set; }
public string DiscoveryEndpointUrl { get; set; }
public string RedirectUri { get; set; }
public string GrantClientId { get; set; }
public string ClientId { get; set; }
public string ClientSecret { get; set; }
public string Username { get; set; }
public string Password { get; set; }
public string[] Scopes { get; set; }
}
}

12
FarmmapsApi/Services/FarmmapsApiService.cs
View File

@@ -53,9 +53,16 @@ namespace FarmmapsApi.Services
throw new AuthenticationException("Already seems to be authenticated");
var disco = await _openIdConnectService.GetDiscoveryDocumentAsync();
var token = await _openIdConnectService.GetTokenClientCredentialsAsync(disco.TokenEndpoint,
_configuration.ClientId, _configuration.ClientSecret);
var usePasswordGrant = string.IsNullOrEmpty(_configuration.ClientId) ||
string.IsNullOrEmpty(_configuration.ClientSecret);
var token = usePasswordGrant ?
await _openIdConnectService.GetTokenUsernamePasswordAsync(disco.TokenEndpoint,
_configuration.GrantClientId, _configuration.Username, _configuration.Password) :
await _openIdConnectService.GetTokenClientCredentialsAsync(disco.TokenEndpoint,
_configuration.ClientId, _configuration.ClientSecret);
if (token.IsError)
throw new AuthenticationException(token.Error);
@@ -314,7 +321,6 @@ namespace FarmmapsApi.Services
farmmapsUploader.UploadSessionData += data => location = data.UploadUri;
var progress = await farmmapsUploader.UploadAsync();
return new UploadResults(progress, location);
}

14
FarmmapsApi/Services/OpenIdConnectService.cs
View File

@@ -2,6 +2,7 @@
using System.Net.Http;
using System.Threading.Tasks;
using FarmmapsApi.Models;
using IdentityModel;
using IdentityModel.Client;
namespace FarmmapsApi.Services
@@ -40,6 +41,19 @@ namespace FarmmapsApi.Services
});
}
public async Task<TokenResponse> GetTokenUsernamePasswordAsync(string tokenEndpointUrl, string grantClientId, string username, string password)
{
return await _httpClient.RequestPasswordTokenAsync(new PasswordTokenRequest()
{
Address = tokenEndpointUrl,
UserName = username,
Password = password,
ClientId = grantClientId,
GrantType = OidcConstants.GrantTypes.Password,
Scope = string.Join(" ", _configuration.Scopes)
});
}
public async Task<TokenResponse> RefreshTokensAsync(string tokenEndpointUrl, string refreshToken)
{
return await _httpClient.RequestRefreshTokenAsync(new RefreshTokenRequest()