more services from Web API

src/Api/Program.cs

@@ -11,9 +11,12 @@
 */
 
 using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Yavsc.Interface;
 using Yavsc.Models;
+using Yavsc.Services;
 
 internal class Program
 {
@@ -61,13 +64,18 @@ internal class Program
         services.AddDbContext<ApplicationDbContext>(options =>
             options.UseNpgsql(builder.Configuration.GetConnectionString("Default")));
         services.AddScoped<UserManager<ApplicationUser>>();
-        
+        services.AddSingleton<IConnexionManager, HubConnectionManager>();
+        services.AddSingleton<ILiveProcessor, LiveProcessor>();
+        services.AddTransient<IFileSystemAuthManager, FileSystemAuthManager>();
+        services.AddIdentityApiEndpoints<ApplicationUser>();
         builder.Services.AddSession();
         
-        /*services.AddTransient<ITrueEmailSender, MailSender>()
-        .AddTransient<IYavscMessageSender, YavscMessageSender>()
+        services.AddTransient<ITrueEmailSender, MailSender>()
         .AddTransient<IBillingService, BillingService>()
-        .AddTransient<ICalendarManager, CalendarManager>();*/
+        .AddTransient<ICalendarManager, CalendarManager>()
+        .AddTransient<IUserStore<ApplicationUser>, UserStore<ApplicationUser>>()
+        .AddTransient<DbContext>();
+
         using (var app = builder.Build())
         {
             if (app.Environment.IsDevelopment())
@@ -82,11 +90,7 @@ internal class Program
                     endpoints.MapDefaultControllerRoute()
                         .RequireAuthorization();
                 });
-
-            app.MapGet("/identity", (HttpContext context) =>
-                    new JsonResult(context?.User?.Claims.Select(c => new { c.Type, c.Value }))
-                ).RequireAuthorization("ApiScope");
-
+            app.MapIdentityApi<ApplicationUser>().RequireAuthorization("ApiScope");
             app.UseSession();
             await app.RunAsync();
         };

src/Yavsc.Server/Services/EMailer.cs

@@ -16,6 +16,7 @@ using Yavsc.Abstract.Templates;
 using Microsoft.AspNetCore.Identity;
 using RazorEngine.Configuration;
 using Yavsc.Interface;
+using Microsoft.Extensions.Logging;
 
 namespace Yavsc.Lib
 {

src/Yavsc.Server/Services/GoogleApis/CalendarManager.cs

@@ -27,6 +27,7 @@ using Google.Apis.Auth.OAuth2.Responses;
 
 namespace Yavsc.Services
 {
+    using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Options;
     using Yavsc.Models.Calendar;
     using Yavsc.Server.Helpers;

src/Yavsc.Server/Services/LiveProcessor.cs

@@ -3,6 +3,8 @@ using System.Net.WebSockets;
 using Yavsc.Models;
 using Yavsc.ViewModels.Streaming;
 using Newtonsoft.Json;
+using Microsoft.Extensions.Logging;
+using Microsoft.AspNetCore.Http;
 
 namespace Yavsc.Services
 {

src/Yavsc.Server/Services/ProfileService.cs

@@ -4,6 +4,7 @@ using IdentityServer8.Models;
 using IdentityServer8.Services;
 using IdentityServer8.Stores;
 using Microsoft.AspNetCore.Identity;
+using Microsoft.Extensions.Logging;
 using Yavsc.Models;
 
 namespace Yavsc.Services
@@ -71,14 +72,14 @@ namespace Yavsc.Services
             return claims;
         }
 
-        public async Task GetProfileDataAsync(ProfileDataRequestContext context)
+        override public async Task GetProfileDataAsync(ProfileDataRequestContext context)
         {
             var subjectId = context.Subject.Claims.FirstOrDefault(c => c.Type == "sub").Value;
             var user = await _userManager.FindByIdAsync(subjectId);
             context.IssuedClaims = await GetClaimsFromUserAsync(context, user);
         }
 
-        public async Task IsActiveAsync(IsActiveContext context)
+        override public async Task IsActiveAsync(IsActiveContext context)
         {
             var subjectId = context.Subject.Claims.FirstOrDefault(c => c.Type == "sub").Value;
             var user = await _userManager.FindByIdAsync(subjectId);

src/Yavsc.Server/Yavsc.Server.csproj

@@ -21,6 +21,10 @@
     <PackageReference Include="Google.Apis.Calendar.v3" Version="1.60.0.2993" />
     <PackageReference Include="PayPalMerchantSDK" Version="2.16.250" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
+    <PackageReference Include="RazorEngine.NetCore" Version="3.1.0" />
+    <PackageReference Include="MailKit" Version="4.3.0" />
+    <PackageReference Include="MimeKit" Version="4.3.0" />
+    <PackageReference Include="pazof.rules" Version="1.1.3" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.ComponentModel.DataAnnotations" />

src/Yavsc/Services/YavscMessageSender.cs

@@ -1,5 +1,5 @@
-using Microsoft.AspNetCore.Identity.UI.Services;
-using Microsoft.AspNetCore.SignalR;
+using Microsoft.AspNetCore.SignalR;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 using Yavsc.Interface;

src/Yavsc/Yavsc.csproj

@@ -33,10 +33,6 @@
     <PackageReference Include="Google.Apis.Compute.v1" Version="1.54.0" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Razor" Version="2.2.0" />
-    <PackageReference Include="MailKit" Version="4.3.0" />
-    <PackageReference Include="MimeKit" Version="4.3.0" />
-    <PackageReference Include="pazof.rules" Version="1.1.3" />
-    <PackageReference Include="RazorEngine.NetCore" Version="3.1.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.7" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="2.2.0" />