From ee668dfd342b437052f0eea8a0ecbbe61a9f4f14 Mon Sep 17 00:00:00 2001
From: Jamie Rees <tidusjar@gmail.com>
Date: Tue, 26 Mar 2019 12:12:58 +0000
Subject: [PATCH] #2750 stuff

---
 .../Authentication/OmbiUserManager.cs         |  2 +-
 src/Ombi.DependencyInjection/IocExtensions.cs | 36 +++++++++----------
 src/Ombi.Store/Context/OmbiContext.cs         |  1 +
 src/Ombi/Startup.cs                           |  3 --
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/Ombi.Core/Authentication/OmbiUserManager.cs b/src/Ombi.Core/Authentication/OmbiUserManager.cs
index 2c78f39bf..6155672b3 100644
--- a/src/Ombi.Core/Authentication/OmbiUserManager.cs
+++ b/src/Ombi.Core/Authentication/OmbiUserManager.cs
@@ -158,7 +158,7 @@ namespace Ombi.Core.Authentication
                     if (!email.Equals(result.User?.Email))
                     {
                         user.Email = result.User?.Email;
-                        await UpdateAsync(user);
+                        await GlobalMutex.Lock(async () => await UpdateAsync(user));
                     }
 
                     return true;
diff --git a/src/Ombi.DependencyInjection/IocExtensions.cs b/src/Ombi.DependencyInjection/IocExtensions.cs
index dc9c40122..0d1ca8f35 100644
--- a/src/Ombi.DependencyInjection/IocExtensions.cs
+++ b/src/Ombi.DependencyInjection/IocExtensions.cs
@@ -140,28 +140,28 @@ namespace Ombi.DependencyInjection
         }
 
         public static void RegisterStore(this IServiceCollection services) { 
-            services.AddEntityFrameworkSqlite().AddDbContext<OmbiContext>();
-            services.AddEntityFrameworkSqlite().AddDbContext<SettingsContext>();
-            services.AddEntityFrameworkSqlite().AddDbContext<ExternalContext>();
+            services.AddDbContext<OmbiContext>();
+            services.AddDbContext<SettingsContext>();
+            services.AddDbContext<ExternalContext>();
             
             services.AddScoped<IOmbiContext, OmbiContext>(); // https://docs.microsoft.com/en-us/aspnet/core/data/entity-framework-6
             services.AddScoped<ISettingsContext, SettingsContext>(); // https://docs.microsoft.com/en-us/aspnet/core/data/entity-framework-6
             services.AddScoped<IExternalContext, ExternalContext>(); // https://docs.microsoft.com/en-us/aspnet/core/data/entity-framework-6
-            services.AddTransient<ISettingsRepository, SettingsJsonRepository>();
-            services.AddTransient<ISettingsResolver, SettingsResolver>();
-            services.AddTransient<IPlexContentRepository, PlexServerContentRepository>();
-            services.AddTransient<IEmbyContentRepository, EmbyContentRepository>();
-            services.AddTransient<INotificationTemplatesRepository, NotificationTemplatesRepository>();
+            services.AddScoped<ISettingsRepository, SettingsJsonRepository>();
+            services.AddScoped<ISettingsResolver, SettingsResolver>();
+            services.AddScoped<IPlexContentRepository, PlexServerContentRepository>();
+            services.AddScoped<IEmbyContentRepository, EmbyContentRepository>();
+            services.AddScoped<INotificationTemplatesRepository, NotificationTemplatesRepository>();
             
-            services.AddTransient<ITvRequestRepository, TvRequestRepository>();
-            services.AddTransient<IMovieRequestRepository, MovieRequestRepository>();
-            services.AddTransient<IMusicRequestRepository, MusicRequestRepository>();
-            services.AddTransient<IAuditRepository, AuditRepository>();
-            services.AddTransient<IApplicationConfigRepository, ApplicationConfigRepository>();
-            services.AddTransient<ITokenRepository, TokenRepository>();
-            services.AddTransient(typeof(ISettingsService<>), typeof(SettingsService<>));
-            services.AddTransient(typeof(IRepository<>), typeof(Repository<>));
-            services.AddTransient(typeof(IExternalRepository<>), typeof(ExternalRepository<>));
+            services.AddScoped<ITvRequestRepository, TvRequestRepository>();
+            services.AddScoped<IMovieRequestRepository, MovieRequestRepository>();
+            services.AddScoped<IMusicRequestRepository, MusicRequestRepository>();
+            services.AddScoped<IAuditRepository, AuditRepository>();
+            services.AddScoped<IApplicationConfigRepository, ApplicationConfigRepository>();
+            services.AddScoped<ITokenRepository, TokenRepository>();
+            services.AddScoped(typeof(ISettingsService<>), typeof(SettingsService<>));
+            services.AddScoped(typeof(IRepository<>), typeof(Repository<>));
+            services.AddScoped(typeof(IExternalRepository<>), typeof(ExternalRepository<>));
         }
         public static void RegisterServices(this IServiceCollection services)
         {
@@ -169,7 +169,7 @@ namespace Ombi.DependencyInjection
             services.AddTransient<INotificationService, NotificationService>();
             services.AddTransient<IEmailProvider, GenericEmailProvider>();
             services.AddTransient<INotificationHelper, NotificationHelper>();
-            services.AddTransient<ICacheService, CacheService>();
+            services.AddSingleton<ICacheService, CacheService>();
 
             services.AddTransient<IDiscordNotification, DiscordNotification>();
             services.AddTransient<IEmailNotification, EmailNotification>();
diff --git a/src/Ombi.Store/Context/OmbiContext.cs b/src/Ombi.Store/Context/OmbiContext.cs
index 2f19bc681..98f4cd9c3 100644
--- a/src/Ombi.Store/Context/OmbiContext.cs
+++ b/src/Ombi.Store/Context/OmbiContext.cs
@@ -17,6 +17,7 @@ namespace Ombi.Store.Context
         {
             if (_created) return;
 
+
             _created = true;
             Database.SetCommandTimeout(60);
             Database.Migrate();
diff --git a/src/Ombi/Startup.cs b/src/Ombi/Startup.cs
index 33e9ecef7..7276b9f75 100644
--- a/src/Ombi/Startup.cs
+++ b/src/Ombi/Startup.cs
@@ -61,9 +61,6 @@ namespace Ombi
         // This method gets called by the runtime. Use this method to add services to the container.
         public IServiceProvider ConfigureServices(IServiceCollection services)
         {
-            // Add framework services.
-            services.AddDbContext<OmbiContext>();
-
             services.AddIdentity<OmbiUser, IdentityRole>()
                 .AddEntityFrameworkStores<OmbiContext>()
                 .AddDefaultTokenProviders()