mirror/aliasvault
1
0
Fork 0
mirror of https://github.com/aliasvault/aliasvault.git synced 2026-05-19 13:57:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add api version prefix to WASM app URLs (#25)

Browse Source
This commit is contained in:
Leendert de Borst
2024-06-18 20:43:07 +02:00
parent 949a7a856a
commit dbea1c2c4d
4 changed files with 25 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/AliasVault.WebApp/Auth/Pages/Login.razor
View File

@@ -1,7 +1,6 @@
@page "/user/login"
@attribute [AllowAnonymous]
@layout Auth.Layout.MainLayout
@inject HttpClient Http
@inject AuthenticationStateProvider AuthStateProvider
@inject NavigationManager NavigationManager
@@ -71,7 +70,7 @@
try
{
var result = await Http.PostAsJsonAsync("api/Auth/login", _loginModel);
var result = await Http.PostAsJsonAsync("api/v1/Auth/login", _loginModel);
var responseContent = await result.Content.ReadAsStringAsync();
if (!result.IsSuccessStatusCode)

2
src/AliasVault.WebApp/Auth/Pages/Register.razor
View File

@@ -63,7 +63,7 @@
try
{
var result = await Http.PostAsJsonAsync("api/Auth/register", _registerModel);
var result = await Http.PostAsJsonAsync("api/v1/Auth/register", _registerModel);
var responseContent = await result.Content.ReadAsStringAsync();
if (!result.IsSuccessStatusCode)

40
src/AliasVault.WebApp/Auth/Services/AuthService.cs
View File

@@ -16,23 +16,15 @@ using Blazored.LocalStorage;
/// This service is responsible for handling authentication-related operations such as refreshing tokens,
/// storing tokens, and revoking tokens.
/// </summary>
public class AuthService
/// <remarks>
/// Initializes a new instance of the <see cref="AuthService"/> class.
/// </remarks>
/// <param name="httpClient">The HTTP client.</param>
/// <param name="localStorage">The local storage service.</param>
public class AuthService(HttpClient httpClient, ILocalStorageService localStorage)
{
private const string AccessTokenKey = "token";
private const string RefreshTokenKey = "refreshToken";
private readonly HttpClient _httpClient;
private readonly ILocalStorageService _localStorage;
/// <summary>
/// Initializes a new instance of the <see cref="AuthService"/> class.
/// </summary>
/// <param name="httpClient">The HTTP client.</param>
/// <param name="localStorage">The local storage service.</param>
public AuthService(HttpClient httpClient, ILocalStorageService localStorage)
{
_httpClient = httpClient;
_localStorage = localStorage;
}
/// <summary>
/// Refreshes the access token asynchronously.
@@ -44,14 +36,14 @@ public class AuthService
var accessToken = await GetAccessTokenAsync();
var refreshToken = await GetRefreshTokenAsync();
var tokenInput = new TokenModel { Token = accessToken, RefreshToken = refreshToken };
using var request = new HttpRequestMessage(HttpMethod.Post, "api/Auth/refresh")
using var request = new HttpRequestMessage(HttpMethod.Post, "api/v1/Auth/refresh")
{
Content = JsonContent.Create(tokenInput),
};
// Add the X-Ignore-Failure header to the request so any failure does not trigger another refresh token request.
request.Headers.Add("X-Ignore-Failure", "true");
var response = await _httpClient.SendAsync(request);
var response = await httpClient.SendAsync(request);
if (response.IsSuccessStatusCode)
{
@@ -77,7 +69,7 @@ public class AuthService
/// <returns>The stored access token.</returns>
public async Task<string> GetAccessTokenAsync()
{
return await _localStorage.GetItemAsStringAsync(AccessTokenKey) ?? string.Empty;
return await localStorage.GetItemAsStringAsync(AccessTokenKey) ?? string.Empty;
}
/// <summary>
@@ -87,7 +79,7 @@ public class AuthService
/// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
public async Task StoreAccessTokenAsync(string newToken)
{
await _localStorage.SetItemAsStringAsync(AccessTokenKey, newToken);
await localStorage.SetItemAsStringAsync(AccessTokenKey, newToken);
}
/// <summary>
@@ -96,7 +88,7 @@ public class AuthService
/// <returns>The stored refresh token.</returns>
public async Task<string> GetRefreshTokenAsync()
{
return await _localStorage.GetItemAsStringAsync(RefreshTokenKey) ?? string.Empty;
return await localStorage.GetItemAsStringAsync(RefreshTokenKey) ?? string.Empty;
}
/// <summary>
@@ -106,7 +98,7 @@ public class AuthService
/// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
public async Task StoreRefreshTokenAsync(string newToken)
{
await _localStorage.SetItemAsStringAsync(RefreshTokenKey, newToken);
await localStorage.SetItemAsStringAsync(RefreshTokenKey, newToken);
}
/// <summary>
@@ -115,8 +107,8 @@ public class AuthService
/// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
public async Task RemoveTokensAsync()
{
await _localStorage.RemoveItemAsync(AccessTokenKey);
await _localStorage.RemoveItemAsync(RefreshTokenKey);
await localStorage.RemoveItemAsync(AccessTokenKey);
await localStorage.RemoveItemAsync(RefreshTokenKey);
// If the remote call fails we catch the exception and ignore it.
// This is because the user is already logged out and we don't want to trigger another refresh token request.
@@ -142,13 +134,13 @@ public class AuthService
RefreshToken = await GetRefreshTokenAsync(),
};
using var request = new HttpRequestMessage(HttpMethod.Post, "api/Auth/revoke")
using var request = new HttpRequestMessage(HttpMethod.Post, "api/v1/Auth/revoke")
{
Content = JsonContent.Create(tokenInput),
};
// Add the X-Ignore-Failure header to the request so any failure does not trigger another refresh token request.
request.Headers.Add("X-Ignore-Failure", "true");
await _httpClient.SendAsync(request);
await httpClient.SendAsync(request);
}
}

14
src/AliasVault.WebApp/Services/AliasService.cs
View File

@@ -22,8 +22,8 @@ public class AliasService(HttpClient httpClient)
/// <returns>Identity object.</returns>
public async Task<Identity> GenerateRandomIdentityAsync()
{
var identity = await httpClient.GetFromJsonAsync<Identity>("api/Identity/generate");
if (identity == null)
var identity = await httpClient.GetFromJsonAsync<Identity>("api/v1/Identity/generate");
if (identity is null)
{
throw new InvalidOperationException("Failed to generate random identity.");
}
@@ -40,7 +40,7 @@ public class AliasService(HttpClient httpClient)
{
try
{
var returnObject = await httpClient.PutAsJsonAsync<Alias>("api/Alias", aliasObject);
var returnObject = await httpClient.PutAsJsonAsync<Alias>("api/v1/Alias", aliasObject);
return await returnObject.Content.ReadFromJsonAsync<Guid>();
}
catch
@@ -59,7 +59,7 @@ public class AliasService(HttpClient httpClient)
{
try
{
var returnObject = await httpClient.PostAsJsonAsync<Alias>("api/Alias/" + id, aliasObject);
var returnObject = await httpClient.PostAsJsonAsync<Alias>("api/v1/Alias/" + id, aliasObject);
return await returnObject.Content.ReadFromJsonAsync<Guid>();
}
catch
@@ -77,7 +77,7 @@ public class AliasService(HttpClient httpClient)
{
try
{
return await httpClient.GetFromJsonAsync<Alias>("api/Alias/" + aliasId);
return await httpClient.GetFromJsonAsync<Alias>("api/v1/Alias/" + aliasId);
}
catch
{
@@ -93,7 +93,7 @@ public class AliasService(HttpClient httpClient)
{
try
{
return await httpClient.GetFromJsonAsync<List<AliasListEntry>>("api/Alias/items");
return await httpClient.GetFromJsonAsync<List<AliasListEntry>>("api/v1/Alias/items");
}
catch
{
@@ -111,7 +111,7 @@ public class AliasService(HttpClient httpClient)
// Delete from webapi.
try
{
await httpClient.DeleteAsync("api/Alias/" + id);
await httpClient.DeleteAsync("api/v1/Alias/" + id);
}
catch
{