Website services organized

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Authentication/AuthenticationService.cs

@@ -1,10 +1,10 @@
 using System.IdentityModel.Tokens.Jwt;
 using System.Net.Http.Headers;
 using Microsoft.AspNetCore.Components.Authorization;
-using WatchIt.Website.Services.Utility.Tokens;
-using WatchIt.Website.Services.WebAPI.Accounts;
+using WatchIt.Website.Services.Client.Accounts;
+using WatchIt.Website.Services.Tokens;
 
-namespace WatchIt.Website.Services.Utility.Authentication;
+namespace WatchIt.Website.Services.Authentication;
 
 public class AuthenticationService : IAuthenticationService
 {
@@ -13,7 +13,7 @@ public class AuthenticationService : IAuthenticationService
     private readonly AuthenticationStateProvider _authenticationStateProvider;
     private readonly HttpClient _httpClient;
     private readonly ITokensService _tokensService;
-    private readonly IAccountsWebAPIService _accountsWebAPIService;
+    private readonly IAccountsClientService _accountsClientService;
     
     #endregion
     
@@ -21,12 +21,12 @@ public class AuthenticationService : IAuthenticationService
     
     #region CONSTRUCTORS
 
-    public AuthenticationService(AuthenticationStateProvider authenticationStateProvider, HttpClient httpClient, ITokensService tokensService, IAccountsWebAPIService accountsWebAPIService)
+    public AuthenticationService(AuthenticationStateProvider authenticationStateProvider, HttpClient httpClient, ITokensService tokensService, IAccountsClientService accountsClientService)
     {
         _authenticationStateProvider = authenticationStateProvider;
         _httpClient = httpClient;
         _tokensService = tokensService;
-        _accountsWebAPIService = accountsWebAPIService;
+        _accountsClientService = accountsClientService;
     }
     
     #endregion
@@ -65,7 +65,7 @@ public class AuthenticationService : IAuthenticationService
         if (refreshToken is not null)
         {
             _httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("refresh", refreshToken.Replace("\"", ""));
-            await _accountsWebAPIService.Logout();
+            await _accountsClientService.Logout();
             _httpClient.DefaultRequestHeaders.Authorization = null;
         }
     }

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Authentication/IAuthenticationService.cs

@@ -1,4 +1,4 @@
-namespace WatchIt.Website.Services.Utility.Authentication;
+namespace WatchIt.Website.Services.Authentication;
 
 public interface IAuthenticationService
 {

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Authentication/JWTAuthenticationStateProvider.cs

@@ -4,10 +4,10 @@ using System.Text.Json;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.Extensions.Logging;
 using WatchIt.Common.Model.Accounts;
-using WatchIt.Website.Services.Utility.Tokens;
-using WatchIt.Website.Services.WebAPI.Accounts;
+using WatchIt.Website.Services.Tokens;
+using WatchIt.Website.Services.Client.Accounts;
 
-namespace WatchIt.Website.Services.Utility.Authentication;
+namespace WatchIt.Website.Services.Authentication;
 
 public class JWTAuthenticationStateProvider : AuthenticationStateProvider
 {
@@ -18,7 +18,7 @@ public class JWTAuthenticationStateProvider : AuthenticationStateProvider
     private readonly ILogger<JWTAuthenticationStateProvider> _logger;
     
     private readonly ITokensService _tokensService;
-    private readonly IAccountsWebAPIService _accountsService;
+    private readonly IAccountsClientService _accountsService;
 
     #endregion
 
@@ -26,7 +26,7 @@ public class JWTAuthenticationStateProvider : AuthenticationStateProvider
 
     #region CONSTRUCTORS
 
-    public JWTAuthenticationStateProvider(HttpClient httpClient, ILogger<JWTAuthenticationStateProvider> logger, ITokensService tokensService, IAccountsWebAPIService accountsService)
+    public JWTAuthenticationStateProvider(HttpClient httpClient, ILogger<JWTAuthenticationStateProvider> logger, ITokensService tokensService, IAccountsClientService accountsService)
     {
         _httpClient = httpClient;
 

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Authentication/User.cs

@@ -1,4 +1,4 @@
-namespace WatchIt.Website.Services.Utility.Authentication;
+namespace WatchIt.Website.Services.Authentication;
 
 public class User
 {

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Authentication/WatchIt.Website.Services.Authentication.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <Reference Include="Microsoft.AspNetCore.Components.Authorization">
+        <HintPath>..\..\..\..\..\..\..\Program Files\dotnet\shared\Microsoft.AspNetCore.App\8.0.10\Microsoft.AspNetCore.Components.Authorization.dll</HintPath>
+      </Reference>
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\WatchIt.Website.Services.Client\WatchIt.Website.Services.Client.csproj" />
+      <ProjectReference Include="..\WatchIt.Website.Services.Tokens\WatchIt.Website.Services.Tokens.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
+    </ItemGroup>
+
+</Project>

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Accounts/AccountsClientService.cs

@@ -1,13 +1,11 @@
 using WatchIt.Common.Model.Accounts;
 using WatchIt.Common.Services.HttpClient;
-using WatchIt.Website.Services.Utility.Configuration;
-using WatchIt.Website.Services.Utility.Configuration.Model;
-using WatchIt.Website.Services.Utility.Tokens;
-using WatchIt.Website.Services.WebAPI.Common;
+using WatchIt.Website.Services.Configuration;
+using WatchIt.Website.Services.Tokens;
 
-namespace WatchIt.Website.Services.WebAPI.Accounts;
+namespace WatchIt.Website.Services.Client.Accounts;
 
-public class AccountsWebAPIService(IHttpClientService httpClientService, IConfigurationService configurationService, ITokensService tokensService) : BaseWebAPIService(configurationService), IAccountsWebAPIService
+public class AccountsClientService(IHttpClientService httpClientService, IConfigurationService configurationService, ITokensService tokensService) : BaseClientService(configurationService), IAccountsClientService
 {
     #region PUBLIC METHODS
     

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Accounts/IAccountsClientService.cs

@@ -1,8 +1,8 @@
 using WatchIt.Common.Model.Accounts;
 
-namespace WatchIt.Website.Services.WebAPI.Accounts;
+namespace WatchIt.Website.Services.Client.Accounts;
 
-public interface IAccountsWebAPIService
+public interface IAccountsClientService
 {
     Task Register(RegisterRequest data, Action<RegisterResponse>? createdAction = null, Action<IDictionary<string, string[]>>? badRequestAction = null);
     Task Authenticate(AuthenticateRequest data, Action<AuthenticateResponse>? successAction = null, Action<IDictionary<string, string[]>>? badRequestAction = null, Action? unauthorizedAction = null);

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/AuthorizationType.cs

@@ -1,4 +1,4 @@
-namespace WatchIt.Website.Services.WebAPI.Common;
+namespace WatchIt.Website.Services.Client;
 
 public enum AuthorizationType
 {

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/BaseClientService.cs

@@ -1,10 +1,9 @@
-using WatchIt.Website.Services.Utility.Configuration;
-using WatchIt.Website.Services.Utility.Configuration.Model;
-using WatchIt.Website.Services.Utility.Tokens;
+using WatchIt.Website.Services.Configuration;
+using WatchIt.Website.Services.Configuration.Model;
 
-namespace WatchIt.Website.Services.WebAPI.Common;
+namespace WatchIt.Website.Services.Client;
 
-public abstract class BaseWebAPIService
+public abstract class BaseClientService
 {
     #region SERVICES
 
@@ -24,7 +23,7 @@ public abstract class BaseWebAPIService
     
     #region CONSTRUCTORS
 
-    protected BaseWebAPIService(IConfigurationService configurationService)
+    protected BaseClientService(IConfigurationService configurationService)
     {
         _configurationService = configurationService;
     }

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Genders/GendersClientService.cs

@@ -1,11 +1,10 @@
 using WatchIt.Common.Model.Genders;
 using WatchIt.Common.Services.HttpClient;
-using WatchIt.Website.Services.Utility.Configuration;
-using WatchIt.Website.Services.WebAPI.Common;
+using WatchIt.Website.Services.Configuration;
 
-namespace WatchIt.Website.Services.WebAPI.Genders;
+namespace WatchIt.Website.Services.Client.Genders;
 
-public class GendersWebAPIService : BaseWebAPIService, IGendersWebAPIService
+public class GendersClientService : BaseClientService, IGendersClientService
 {
     #region SERVICES
 
@@ -18,7 +17,7 @@ public class GendersWebAPIService : BaseWebAPIService, IGendersWebAPIService
     
     #region CONSTRUCTORS
 
-    public GendersWebAPIService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService)
+    public GendersClientService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService)
     {
         _httpClientService = httpClientService;
         _configurationService = configurationService;

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Genders/IGendersClientService.cs

@@ -1,8 +1,8 @@
 using WatchIt.Common.Model.Genders;
 
-namespace WatchIt.Website.Services.WebAPI.Genders;
+namespace WatchIt.Website.Services.Client.Genders;
 
-public interface IGendersWebAPIService
+public interface IGendersClientService
 {
     Task GetAllGenders(GenderQueryParameters? query = null, Action<IEnumerable<GenderResponse>>? successAction = null);
     Task GetGender(long id, Action<GenderResponse>? successAction = null, Action? notFoundAction = null);

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Media/IMediaClientService.cs

@@ -4,9 +4,9 @@ using WatchIt.Common.Model.Photos;
 using WatchIt.Common.Model.Rating;
 using WatchIt.Common.Model.Roles;
 
-namespace WatchIt.Website.Services.WebAPI.Media;
+namespace WatchIt.Website.Services.Client.Media;
 
-public interface IMediaWebAPIService
+public interface IMediaClientService
 {
     Task GetAllMedia(MediaQueryParameters? query = null, Action<IEnumerable<MediaResponse>>? successAction = null);
     Task GetMedia(long mediaId, Action<MediaResponse>? successAction = null, Action? notFoundAction = null);

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Media/MediaClientService.cs

@@ -4,13 +4,11 @@ using WatchIt.Common.Model.Photos;
 using WatchIt.Common.Model.Rating;
 using WatchIt.Common.Model.Roles;
 using WatchIt.Common.Services.HttpClient;
-using WatchIt.Website.Services.Utility.Configuration;
-using WatchIt.Website.Services.Utility.Configuration.Model;
-using WatchIt.Website.Services.WebAPI.Common;
+using WatchIt.Website.Services.Configuration;
 
-namespace WatchIt.Website.Services.WebAPI.Media;
+namespace WatchIt.Website.Services.Client.Media;
 
-public class MediaWebAPIService : BaseWebAPIService, IMediaWebAPIService
+public class MediaClientService : BaseClientService, IMediaClientService
 {
     #region FIELDS
     
@@ -22,7 +20,7 @@ public class MediaWebAPIService : BaseWebAPIService, IMediaWebAPIService
 
     #region CONSTRUCTORS
 
-    public MediaWebAPIService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService)
+    public MediaClientService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService)
     {
         _httpClientService = httpClientService;
     }

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Movies/IMoviesClientService.cs

@@ -1,8 +1,8 @@
 using WatchIt.Common.Model.Movies;
 
-namespace WatchIt.Website.Services.WebAPI.Movies;
+namespace WatchIt.Website.Services.Client.Movies;
 
-public interface IMoviesWebAPIService
+public interface IMoviesClientService
 {
     Task GetAllMovies(MovieQueryParameters? query = null, Action<IEnumerable<MovieResponse>>? successAction = null);
     Task PostMovie(MovieRequest data, Action<MovieResponse>? successAction = null, Action<IDictionary<string, string[]>>? badRequestAction = null, Action? unauthorizedAction = null, Action? forbiddenAction = null);

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Movies/MoviesClientService.cs

@@ -3,12 +3,11 @@ using Microsoft.AspNetCore.Components;
 using Microsoft.Extensions.Primitives;
 using WatchIt.Common.Model.Movies;
 using WatchIt.Common.Services.HttpClient;
-using WatchIt.Website.Services.Utility.Configuration;
-using WatchIt.Website.Services.WebAPI.Common;
+using WatchIt.Website.Services.Configuration;
 
-namespace WatchIt.Website.Services.WebAPI.Movies;
+namespace WatchIt.Website.Services.Client.Movies;
 
-public class MoviesWebAPIService : BaseWebAPIService, IMoviesWebAPIService
+public class MoviesClientService : BaseClientService, IMoviesClientService
 {
     #region SERVICES
 
@@ -21,7 +20,7 @@ public class MoviesWebAPIService : BaseWebAPIService, IMoviesWebAPIService
     
     #region CONSTRUCTORS
 
-    public MoviesWebAPIService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService)
+    public MoviesClientService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService)
     {
         _httpClientService = httpClientService;
         _configurationService = configurationService;

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Persons/IPersonsClientService.cs

@@ -2,9 +2,9 @@ using WatchIt.Common.Model.Persons;
 using WatchIt.Common.Model.Rating;
 using WatchIt.Common.Model.Roles;
 
-namespace WatchIt.Website.Services.WebAPI.Persons;
+namespace WatchIt.Website.Services.Client.Persons;
 
-public interface IPersonsWebAPIService
+public interface IPersonsClientService
 {
     Task GetAllPersons(PersonQueryParameters? query = null, Action<IEnumerable<PersonResponse>>? successAction = null);
     Task GetPerson(long id, Action<PersonResponse>? successAction = null, Action? notFoundAction = null);

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Persons/PersonsClientService.cs

@@ -5,12 +5,11 @@ using WatchIt.Common.Model.Persons;
 using WatchIt.Common.Model.Rating;
 using WatchIt.Common.Model.Roles;
 using WatchIt.Common.Services.HttpClient;
-using WatchIt.Website.Services.Utility.Configuration;
-using WatchIt.Website.Services.WebAPI.Common;
+using WatchIt.Website.Services.Configuration;
 
-namespace WatchIt.Website.Services.WebAPI.Persons;
+namespace WatchIt.Website.Services.Client.Persons;
 
-public class PersonsWebAPIService : BaseWebAPIService, IPersonsWebAPIService
+public class PersonsClientService : BaseClientService, IPersonsClientService
 {
     #region SERVICES
 
@@ -23,7 +22,7 @@ public class PersonsWebAPIService : BaseWebAPIService, IPersonsWebAPIService
     
     #region CONSTRUCTORS
 
-    public PersonsWebAPIService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService)
+    public PersonsClientService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService)
     {
         _httpClientService = httpClientService;
         _configurationService = configurationService;

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Photos/IPhotosClientService.cs

@@ -1,8 +1,8 @@
 using WatchIt.Common.Model.Photos;
 
-namespace WatchIt.Website.Services.WebAPI.Photos;
+namespace WatchIt.Website.Services.Client.Photos;
 
-public interface IPhotosWebAPIService
+public interface IPhotosClientService
 {
     Task GetPhotoRandomBackground(Action<PhotoResponse>? successAction = null, Action? notFoundAction = null);
     Task DeletePhoto(Guid id, Action? successAction = null, Action? unauthorizedAction = null, Action? forbiddenAction = null, Action? notFoundAction = null);

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Photos/PhotosClientService.cs

@@ -1,11 +1,10 @@
 using WatchIt.Common.Model.Photos;
 using WatchIt.Common.Services.HttpClient;
-using WatchIt.Website.Services.Utility.Configuration;
-using WatchIt.Website.Services.WebAPI.Common;
+using WatchIt.Website.Services.Configuration;
 
-namespace WatchIt.Website.Services.WebAPI.Photos;
+namespace WatchIt.Website.Services.Client.Photos;
 
-public class PhotosWebAPIService : BaseWebAPIService, IPhotosWebAPIService
+public class PhotosClientService : BaseClientService, IPhotosClientService
 {
     #region FIELDS
     
@@ -17,7 +16,7 @@ public class PhotosWebAPIService : BaseWebAPIService, IPhotosWebAPIService
 
     #region CONSTRUCTORS
 
-    public PhotosWebAPIService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService)
+    public PhotosClientService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService)
     {
         _httpClientService = httpClientService;
     }

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Roles/IRolesClientService.cs

@@ -1,9 +1,9 @@
 using WatchIt.Common.Model.Rating;
 using WatchIt.Common.Model.Roles;
 
-namespace WatchIt.Website.Services.WebAPI.Roles;
+namespace WatchIt.Website.Services.Client.Roles;
 
-public interface IRolesWebAPIService
+public interface IRolesClientService
 {
     Task GetActorRole(Guid id, Action<ActorRoleResponse>? successAction = null, Action? notFoundAction = null);
     Task PutActorRole(Guid id, ActorRoleUniversalRequest data, Action? successAction = null, Action<IDictionary<string, string[]>>? badRequestAction = null, Action? unauthorizedAction = null, Action? forbiddenAction = null, Action? notFoundAction = null);

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Roles/RolesClientService.cs

@@ -1,12 +1,11 @@
 using WatchIt.Common.Model.Rating;
 using WatchIt.Common.Model.Roles;
 using WatchIt.Common.Services.HttpClient;
-using WatchIt.Website.Services.Utility.Configuration;
-using WatchIt.Website.Services.WebAPI.Common;
+using WatchIt.Website.Services.Configuration;
 
-namespace WatchIt.Website.Services.WebAPI.Roles;
+namespace WatchIt.Website.Services.Client.Roles;
 
-public class RolesWebAPIService : BaseWebAPIService, IRolesWebAPIService
+public class RolesClientService : BaseClientService, IRolesClientService
 {
     #region SERVICES
 
@@ -18,7 +17,7 @@ public class RolesWebAPIService : BaseWebAPIService, IRolesWebAPIService
     
     #region CONSTRUCTORS
 
-    public RolesWebAPIService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService)
+    public RolesClientService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService)
     {
         _httpClientService = httpClientService;
     }

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Series/ISeriesClientService.cs

@@ -1,8 +1,8 @@
 using WatchIt.Common.Model.Series;
 
-namespace WatchIt.Website.Services.WebAPI.Series;
+namespace WatchIt.Website.Services.Client.Series;
 
-public interface ISeriesWebAPIService
+public interface ISeriesClientService
 {
     Task GetAllSeries(SeriesQueryParameters? query = null, Action<IEnumerable<SeriesResponse>>? successAction = null);
     Task GetSeries(long id, Action<SeriesResponse>? successAction = null, Action? notFoundAction = null);

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/Series/SeriesClientService.cs

@@ -1,12 +1,11 @@
 using System.Text;
 using WatchIt.Common.Model.Series;
 using WatchIt.Common.Services.HttpClient;
-using WatchIt.Website.Services.Utility.Configuration;
-using WatchIt.Website.Services.WebAPI.Common;
+using WatchIt.Website.Services.Configuration;
 
-namespace WatchIt.Website.Services.WebAPI.Series;
+namespace WatchIt.Website.Services.Client.Series;
 
-public class SeriesWebAPIService : BaseWebAPIService, ISeriesWebAPIService
+public class SeriesClientService : BaseClientService, ISeriesClientService
 {
     #region SERVICES
 
@@ -19,7 +18,7 @@ public class SeriesWebAPIService : BaseWebAPIService, ISeriesWebAPIService
     
     #region CONSTRUCTORS
 
-    public SeriesWebAPIService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService)
+    public SeriesClientService(IHttpClientService httpClientService, IConfigurationService configurationService) : base(configurationService)
     {
         _httpClientService = httpClientService;
         _configurationService = configurationService;

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Client/WatchIt.Website.Services.Client.csproj

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\..\..\WatchIt.Common\WatchIt.Common.Model\WatchIt.Common.Model.csproj" />
+      <ProjectReference Include="..\..\..\WatchIt.Common\WatchIt.Common.Services\WatchIt.Common.Services.HttpClient\WatchIt.Common.Services.HttpClient.csproj" />
+      <ProjectReference Include="..\WatchIt.Website.Services.Tokens\WatchIt.Website.Services.Tokens.csproj" />
+      <ProjectReference Include="..\WatchIt.Website.Services.Utility\WatchIt.Website.Services.Configuration\WatchIt.Website.Services.Configuration.csproj" />
+    </ItemGroup>
+
+</Project>

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Tokens/ITokensService.cs

@@ -1,6 +1,6 @@
 using WatchIt.Common.Model.Accounts;
 
-namespace WatchIt.Website.Services.Utility.Tokens;
+namespace WatchIt.Website.Services.Tokens;
 
 public interface ITokensService
 {

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Tokens/TokensService.cs

@@ -2,9 +2,9 @@
 using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage;
 using Microsoft.Extensions.Logging;
 using WatchIt.Common.Model.Accounts;
-using WatchIt.Website.Services.Utility.Configuration;
+using WatchIt.Website.Services.Configuration;
 
-namespace WatchIt.Website.Services.Utility.Tokens;
+namespace WatchIt.Website.Services.Tokens;
 
 public class TokensService : ITokensService
 {

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Tokens/WatchIt.Website.Services.Tokens.csproj

@@ -4,12 +4,11 @@
         <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <RootNamespace>WatchIt.Website.Services.Utility.Token</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\..\..\WatchIt.Common\WatchIt.Common.Model\WatchIt.Common.Model.csproj" />
-      <ProjectReference Include="..\WatchIt.Website.Services.Utility.Configuration\WatchIt.Website.Services.Utility.Configuration.csproj" />
+      <ProjectReference Include="..\..\..\WatchIt.Common\WatchIt.Common.Model\WatchIt.Common.Model.csproj" />
+      <ProjectReference Include="..\WatchIt.Website.Services.Utility\WatchIt.Website.Services.Configuration\WatchIt.Website.Services.Configuration.csproj" />
     </ItemGroup>
 
 </Project>

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/ConfigurationService.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Configuration;
-using WatchIt.Website.Services.Utility.Configuration.Model;
+using WatchIt.Website.Services.Configuration.Model;
 
-namespace WatchIt.Website.Services.Utility.Configuration;
+namespace WatchIt.Website.Services.Configuration;
 
 public class ConfigurationService(IConfiguration configuration) : IConfigurationService
 {

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/IConfigurationService.cs

@@ -0,0 +1,8 @@
+using WatchIt.Website.Services.Configuration.Model;
+
+namespace WatchIt.Website.Services.Configuration;
+
+public interface IConfigurationService
+{
+    ConfigurationData Data { get; }
+}

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Accounts.cs

@@ -1,4 +1,4 @@
-namespace WatchIt.Website.Services.Utility.Configuration.Model;
+namespace WatchIt.Website.Services.Configuration.Model;
 
 public class Accounts
 {

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/ConfigurationData.cs

@@ -1,4 +1,4 @@
-namespace WatchIt.Website.Services.Utility.Configuration.Model;
+namespace WatchIt.Website.Services.Configuration.Model;
 
 public class ConfigurationData
 {

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Endpoints.cs

@@ -1,4 +1,4 @@
-namespace WatchIt.Website.Services.Utility.Configuration.Model;
+namespace WatchIt.Website.Services.Configuration.Model;
 
 public class Endpoints
 {

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Genders.cs

@@ -1,4 +1,4 @@
-namespace WatchIt.Website.Services.Utility.Configuration.Model;
+namespace WatchIt.Website.Services.Configuration.Model;
 
 public class Genders
 {

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Genres.cs

@@ -1,4 +1,4 @@
-namespace WatchIt.Website.Services.Utility.Configuration.Model;
+namespace WatchIt.Website.Services.Configuration.Model;
 
 public class Genres
 {

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/LogLevel.cs

@@ -1,4 +1,4 @@
-namespace WatchIt.Website.Services.Utility.Configuration.Model;
+namespace WatchIt.Website.Services.Configuration.Model;
 
 public class LogLevel
 {

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Logging.cs

@@ -1,4 +1,4 @@
-namespace WatchIt.Website.Services.Utility.Configuration.Model;
+namespace WatchIt.Website.Services.Configuration.Model;
 
 public class Logging
 {

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Media.cs

@@ -1,4 +1,4 @@
-namespace WatchIt.Website.Services.Utility.Configuration.Model;
+namespace WatchIt.Website.Services.Configuration.Model;
 
 public class Media
 {

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Movies.cs

@@ -1,4 +1,4 @@
-namespace WatchIt.Website.Services.Utility.Configuration.Model;
+namespace WatchIt.Website.Services.Configuration.Model;
 
 public class Movies
 {

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Persons.cs

@@ -1,4 +1,4 @@
-namespace WatchIt.Website.Services.Utility.Configuration.Model;
+namespace WatchIt.Website.Services.Configuration.Model;
 
 public class Persons
 {

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Photos.cs

@@ -1,4 +1,4 @@
-namespace WatchIt.Website.Services.Utility.Configuration.Model;
+namespace WatchIt.Website.Services.Configuration.Model;
 
 public class Photos
 {

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Roles.cs

@@ -1,4 +1,4 @@
-namespace WatchIt.Website.Services.Utility.Configuration.Model;
+namespace WatchIt.Website.Services.Configuration.Model;
 
 public class Roles
 {

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Series.cs

@@ -1,4 +1,4 @@
-namespace WatchIt.Website.Services.Utility.Configuration.Model;
+namespace WatchIt.Website.Services.Configuration.Model;
 
 public class Series
 {

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/StorageKeys.cs

@@ -1,4 +1,4 @@
-namespace WatchIt.Website.Services.Utility.Configuration.Model;
+namespace WatchIt.Website.Services.Configuration.Model;
 
 public class StorageKeys
 {

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Configuration/Model/Style.cs

@@ -1,4 +1,4 @@
-namespace WatchIt.Website.Services.Utility.Configuration.Model;
+namespace WatchIt.Website.Services.Configuration.Model;
 
 public class Style
 {

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Authentication/WatchIt.Website.Services.Utility.Authentication.csproj

@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
-      <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.5.1" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\..\WatchIt.Website.Services.WebAPI\WatchIt.Website.Services.WebAPI.Accounts\WatchIt.Website.Services.WebAPI.Accounts.csproj" />
-      <ProjectReference Include="..\WatchIt.Website.Services.Utility.Tokens\WatchIt.Website.Services.Utility.Tokens.csproj" />
-    </ItemGroup>
-
-</Project>

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.Utility/WatchIt.Website.Services.Utility.Configuration/IConfigurationService.cs

@@ -1,8 +0,0 @@
-using WatchIt.Website.Services.Utility.Configuration.Model;
-
-namespace WatchIt.Website.Services.Utility.Configuration;
-
-public interface IConfigurationService
-{
-    ConfigurationData Data { get; }
-}

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Accounts/WatchIt.Website.Services.WebAPI.Accounts.csproj

@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\..\..\..\WatchIt.Common\WatchIt.Common.Model\WatchIt.Common.Model.csproj" />
-      <ProjectReference Include="..\..\..\..\WatchIt.Common\WatchIt.Common.Services\WatchIt.Common.Services.HttpClient\WatchIt.Common.Services.HttpClient.csproj" />
-      <ProjectReference Include="..\..\WatchIt.Website.Services.Utility\WatchIt.Website.Services.Utility.Configuration\WatchIt.Website.Services.Utility.Configuration.csproj" />
-      <ProjectReference Include="..\WatchIt.Website.Services.WebAPI.Common\WatchIt.Website.Services.WebAPI.Common.csproj" />
-    </ItemGroup>
-
-</Project>

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Common/WatchIt.Website.Services.WebAPI.Common.csproj

@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\..\..\..\WatchIt.WebAPI\WatchIt.WebAPI.Services\WatchIt.WebAPI.Services.Utility\WatchIt.WebAPI.Services.Utility.Configuration\WatchIt.WebAPI.Services.Utility.Configuration.csproj" />
-      <ProjectReference Include="..\..\WatchIt.Website.Services.Utility\WatchIt.Website.Services.Utility.Configuration\WatchIt.Website.Services.Utility.Configuration.csproj" />
-      <ProjectReference Include="..\..\WatchIt.Website.Services.Utility\WatchIt.Website.Services.Utility.Tokens\WatchIt.Website.Services.Utility.Tokens.csproj" />
-    </ItemGroup>
-
-</Project>

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Genders/WatchIt.Website.Services.WebAPI.Genders.csproj

@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\..\..\..\WatchIt.Common\WatchIt.Common.Services\WatchIt.Common.Services.HttpClient\WatchIt.Common.Services.HttpClient.csproj" />
-      <ProjectReference Include="..\WatchIt.Website.Services.WebAPI.Common\WatchIt.Website.Services.WebAPI.Common.csproj" />
-    </ItemGroup>
-
-</Project>

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Genres/WatchIt.Website.Services.WebAPI.Genres.csproj

@@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-</Project>

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Media/WatchIt.Website.Services.WebAPI.Media.csproj

@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\..\..\..\WatchIt.Common\WatchIt.Common.Model\WatchIt.Common.Model.csproj" />
-      <ProjectReference Include="..\..\..\..\WatchIt.Common\WatchIt.Common.Services\WatchIt.Common.Services.HttpClient\WatchIt.Common.Services.HttpClient.csproj" />
-      <ProjectReference Include="..\..\WatchIt.Website.Services.Utility\WatchIt.Website.Services.Utility.Configuration\WatchIt.Website.Services.Utility.Configuration.csproj" />
-      <ProjectReference Include="..\WatchIt.Website.Services.WebAPI.Common\WatchIt.Website.Services.WebAPI.Common.csproj" />
-    </ItemGroup>
-
-</Project>

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Movies/WatchIt.Website.Services.WebAPI.Movies.csproj

@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <Reference Include="Microsoft.AspNetCore.Components">
-        <HintPath>..\..\..\..\..\..\..\..\Program Files\dotnet\shared\Microsoft.AspNetCore.App\8.0.2\Microsoft.AspNetCore.Components.dll</HintPath>
-      </Reference>
-    </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\..\..\..\WatchIt.Common\WatchIt.Common.Model\WatchIt.Common.Model.csproj" />
-      <ProjectReference Include="..\..\..\..\WatchIt.Common\WatchIt.Common.Services\WatchIt.Common.Services.HttpClient\WatchIt.Common.Services.HttpClient.csproj" />
-      <ProjectReference Include="..\..\..\..\WatchIt.WebAPI\WatchIt.WebAPI.Services\WatchIt.WebAPI.Services.Utility\WatchIt.WebAPI.Services.Utility.Configuration\WatchIt.WebAPI.Services.Utility.Configuration.csproj" />
-      <ProjectReference Include="..\..\WatchIt.Website.Services.Utility\WatchIt.Website.Services.Utility.Configuration\WatchIt.Website.Services.Utility.Configuration.csproj" />
-      <ProjectReference Include="..\WatchIt.Website.Services.WebAPI.Common\WatchIt.Website.Services.WebAPI.Common.csproj" />
-    </ItemGroup>
-
-</Project>

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Persons/WatchIt.Website.Services.WebAPI.Persons.csproj

@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\..\..\..\WatchIt.Common\WatchIt.Common.Services\WatchIt.Common.Services.HttpClient\WatchIt.Common.Services.HttpClient.csproj" />
-      <ProjectReference Include="..\WatchIt.Website.Services.WebAPI.Common\WatchIt.Website.Services.WebAPI.Common.csproj" />
-    </ItemGroup>
-
-</Project>

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Photos/WatchIt.Website.Services.WebAPI.Photos.csproj

@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\..\..\..\WatchIt.Common\WatchIt.Common.Services\WatchIt.Common.Services.HttpClient\WatchIt.Common.Services.HttpClient.csproj" />
-      <ProjectReference Include="..\..\WatchIt.Website.Services.Utility\WatchIt.Website.Services.Utility.Configuration\WatchIt.Website.Services.Utility.Configuration.csproj" />
-      <ProjectReference Include="..\WatchIt.Website.Services.WebAPI.Common\WatchIt.Website.Services.WebAPI.Common.csproj" />
-    </ItemGroup>
-
-</Project>

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Roles/WatchIt.Website.Services.WebAPI.Roles.csproj

@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\..\..\..\WatchIt.Common\WatchIt.Common.Services\WatchIt.Common.Services.HttpClient\WatchIt.Common.Services.HttpClient.csproj" />
-      <ProjectReference Include="..\WatchIt.Website.Services.WebAPI.Common\WatchIt.Website.Services.WebAPI.Common.csproj" />
-    </ItemGroup>
-
-</Project>

WatchIt.Website/WatchIt.Website.Services/WatchIt.Website.Services.WebAPI/WatchIt.Website.Services.WebAPI.Series/WatchIt.Website.Services.WebAPI.Series.csproj

@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\..\..\..\WatchIt.Common\WatchIt.Common.Services\WatchIt.Common.Services.HttpClient\WatchIt.Common.Services.HttpClient.csproj" />
-      <ProjectReference Include="..\WatchIt.Website.Services.WebAPI.Common\WatchIt.Website.Services.WebAPI.Common.csproj" />
-    </ItemGroup>
-
-</Project>