diff --git a/src/BlazorAdmin/CustomAuthStateProvider.cs b/src/BlazorAdmin/CustomAuthStateProvider.cs index bdb8f9d..6057f82 100644 --- a/src/BlazorAdmin/CustomAuthStateProvider.cs +++ b/src/BlazorAdmin/CustomAuthStateProvider.cs @@ -16,18 +16,15 @@ namespace BlazorAdmin // TODO: Get Default Cache Duration from Config private static readonly TimeSpan UserCacheRefreshInterval = TimeSpan.FromSeconds(60); - private readonly AuthService _authService; private readonly HttpClient _httpClient; private readonly ILogger _logger; private DateTimeOffset _userLastCheck = DateTimeOffset.FromUnixTimeSeconds(0); private ClaimsPrincipal _cachedUser = new ClaimsPrincipal(new ClaimsIdentity()); - public CustomAuthStateProvider(AuthService authService, - HttpClient httpClient, + public CustomAuthStateProvider(HttpClient httpClient, ILogger logger) { - _authService = authService; _httpClient = httpClient; _logger = logger; } diff --git a/src/BlazorAdmin/Pages/CatalogItemPage/Create.razor b/src/BlazorAdmin/Pages/CatalogItemPage/Create.razor index be47dae..51ebf98 100644 --- a/src/BlazorAdmin/Pages/CatalogItemPage/Create.razor +++ b/src/BlazorAdmin/Pages/CatalogItemPage/Create.razor @@ -1,5 +1,4 @@ @inject ILogger Logger -@inject AuthService Auth @inject IJSRuntime JSRuntime @inject ICatalogItemService CatalogItemService diff --git a/src/BlazorAdmin/Pages/CatalogItemPage/Delete.razor b/src/BlazorAdmin/Pages/CatalogItemPage/Delete.razor index 4afb1eb..5791195 100644 --- a/src/BlazorAdmin/Pages/CatalogItemPage/Delete.razor +++ b/src/BlazorAdmin/Pages/CatalogItemPage/Delete.razor @@ -1,5 +1,4 @@ @inject ILogger Logger -@inject AuthService Auth @inject IJSRuntime JSRuntime @inject ICatalogItemService CatalogItemService diff --git a/src/BlazorAdmin/Pages/CatalogItemPage/Details.razor b/src/BlazorAdmin/Pages/CatalogItemPage/Details.razor index 4533f9b..c488373 100644 --- a/src/BlazorAdmin/Pages/CatalogItemPage/Details.razor +++ b/src/BlazorAdmin/Pages/CatalogItemPage/Details.razor @@ -1,5 +1,4 @@ @inject ILogger
Logger -@inject AuthService Auth @inject IJSRuntime JSRuntime @inject ICatalogItemService CatalogItemService diff --git a/src/BlazorAdmin/Pages/CatalogItemPage/Edit.razor b/src/BlazorAdmin/Pages/CatalogItemPage/Edit.razor index 2fa0214..4d1ce6e 100644 --- a/src/BlazorAdmin/Pages/CatalogItemPage/Edit.razor +++ b/src/BlazorAdmin/Pages/CatalogItemPage/Edit.razor @@ -1,5 +1,4 @@ @inject ILogger Logger -@inject AuthService Auth @inject IJSRuntime JSRuntime @inject ICatalogItemService CatalogItemService diff --git a/src/BlazorAdmin/Pages/CatalogItemPage/List.razor b/src/BlazorAdmin/Pages/CatalogItemPage/List.razor index 2672f0e..d8749d7 100644 --- a/src/BlazorAdmin/Pages/CatalogItemPage/List.razor +++ b/src/BlazorAdmin/Pages/CatalogItemPage/List.razor @@ -1,6 +1,5 @@ @page "/admin" @attribute [Authorize(Roles = BlazorShared.Authorization.Constants.Roles.ADMINISTRATORS)] -@inject AuthService Auth @inherits BlazorAdmin.Helpers.BlazorComponent @namespace BlazorAdmin.Pages.CatalogItemPage diff --git a/src/BlazorAdmin/Pages/Logout.razor b/src/BlazorAdmin/Pages/Logout.razor index bceb4ce..ddcd25a 100644 --- a/src/BlazorAdmin/Pages/Logout.razor +++ b/src/BlazorAdmin/Pages/Logout.razor @@ -1,14 +1,13 @@ @page "/logout" -@inject AuthService AuthService @inject IJSRuntime JSRuntime +@inject HttpClient HttpClient @inherits BlazorAdmin.Helpers.BlazorComponent - @code { protected override async Task OnInitializedAsync() { - await AuthService.Logout(); + await HttpClient.PostAsync("Identity/Account/Logout", null); await new Route(JSRuntime).RouteOutside("/Identity/Account/Login"); } diff --git a/src/BlazorAdmin/Program.cs b/src/BlazorAdmin/Program.cs index 89080ad..f99ca19 100644 --- a/src/BlazorAdmin/Program.cs +++ b/src/BlazorAdmin/Program.cs @@ -28,7 +28,6 @@ namespace BlazorAdmin builder.Services.AddScoped(); builder.Services.AddScoped(); - builder.Services.AddScoped(); builder.Services.AddAuthorizationCore(); builder.Services.AddScoped(); diff --git a/src/BlazorAdmin/Services/AuthService.AuthRequest.cs b/src/BlazorAdmin/Services/AuthService.AuthRequest.cs deleted file mode 100644 index 77363b2..0000000 --- a/src/BlazorAdmin/Services/AuthService.AuthRequest.cs +++ /dev/null @@ -1,8 +0,0 @@ -namespace BlazorAdmin.Services -{ - public class AuthRequest - { - public string Username { get; set; } - public string Password { get; set; } - } -} diff --git a/src/BlazorAdmin/Services/AuthService.AuthResponse.cs b/src/BlazorAdmin/Services/AuthService.AuthResponse.cs deleted file mode 100644 index 8baf5e6..0000000 --- a/src/BlazorAdmin/Services/AuthService.AuthResponse.cs +++ /dev/null @@ -1,16 +0,0 @@ -namespace BlazorAdmin.Services -{ - public class AuthResponse - { - public AuthResponse() - { - } - - public bool Result { get; set; } = false; - public string Token { get; set; } = string.Empty; - public string Username { get; set; } = string.Empty; - public bool IsLockedOut { get; set; } = false; - public bool IsNotAllowed { get; set; } = false; - public bool RequiresTwoFactor { get; set; } = false; - } -} diff --git a/src/BlazorAdmin/Services/AuthService.cs b/src/BlazorAdmin/Services/AuthService.cs deleted file mode 100644 index 5c0721a..0000000 --- a/src/BlazorAdmin/Services/AuthService.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System.Net.Http; -using System.Threading.Tasks; -using BlazorAdmin.JavaScript; -using Blazored.LocalStorage; -using Microsoft.JSInterop; - -namespace BlazorAdmin.Services -{ - public class AuthService - { - private readonly HttpClient _httpClient; - private readonly ILocalStorageService _localStorage; - private readonly IJSRuntime _jSRuntime; - public bool IsLoggedIn { get; set; } - - public AuthService(HttpClient httpClient, - ILocalStorageService localStorage, - IJSRuntime jSRuntime) - { - _httpClient = httpClient; - _localStorage = localStorage; - _jSRuntime = jSRuntime; - } - - public async Task Logout() - { - await DeleteCookies(); - IsLoggedIn = false; - await LogoutIdentityManager(); - } - - private async Task LogoutIdentityManager() - { - await _httpClient.PostAsync("Identity/Account/Logout", null); - } - - private async Task DeleteCookies() - { - await new Cookies(_jSRuntime).DeleteCookie("token"); - } - } -} diff --git a/src/PublicApi/Dockerfile b/src/PublicApi/Dockerfile index c140e78..8ca1839 100644 --- a/src/PublicApi/Dockerfile +++ b/src/PublicApi/Dockerfile @@ -6,15 +6,18 @@ EXPOSE 80 EXPOSE 443 FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build -WORKDIR /src -COPY ["src/PublicApi/PublicApi.csproj", "src/PublicApi/"] -RUN dotnet restore "src/PublicApi/PublicApi.csproj" +WORKDIR /app COPY . . -WORKDIR "/src/src/PublicApi" -RUN dotnet build "PublicApi.csproj" -c Release -o /app/build +#COPY ["src/PublicApi/PublicApi.csproj", "./PublicApi/"] +#RUN dotnet restore "./PublicApi/PublicApi.csproj" +#COPY . . +WORKDIR "/app/src/PublicApi" +RUN dotnet restore + +RUN dotnet build "./PublicApi.csproj" -c Release -o /app/build FROM build AS publish -RUN dotnet publish "PublicApi.csproj" -c Release -o /app/publish +RUN dotnet publish "./PublicApi.csproj" -c Release -o /app/publish FROM base AS final WORKDIR /app diff --git a/src/Web/Startup.cs b/src/Web/Startup.cs index 1f5810b..ee10b95 100644 --- a/src/Web/Startup.cs +++ b/src/Web/Startup.cs @@ -157,7 +157,6 @@ namespace Microsoft.eShopWeb.Web // add blazor services services.AddBlazoredLocalStorage(); services.AddServerSideBlazor(); - services.AddScoped(); services.AddScoped(); services.AddBlazorServices();