From 97fb6ede7ea4abc587d340722094e9f236e5697b Mon Sep 17 00:00:00 2001
From: hishamco <hishamco_2007@yahoo.com>
Date: Tue, 20 Apr 2021 19:10:06 +0300
Subject: [PATCH] Reuse AddOqtaneScopedServices()

---
 Oqtane.Client/AssemblyInfo.cs                 |  4 ++-
 .../OqtaneServiceCollectionExtensions.cs      | 34 -------------------
 Oqtane.Server/Startup.cs                      |  4 ++-
 3 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/Oqtane.Client/AssemblyInfo.cs b/Oqtane.Client/AssemblyInfo.cs
index d598bfb9..159ad127 100644
--- a/Oqtane.Client/AssemblyInfo.cs
+++ b/Oqtane.Client/AssemblyInfo.cs
@@ -1,3 +1,5 @@
-using Microsoft.Extensions.Localization;
+using System.Runtime.CompilerServices;
+using Microsoft.Extensions.Localization;
 
 [assembly: RootNamespace("Oqtane")]
+[assembly: InternalsVisibleTo("Oqtane.Server")]
diff --git a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs
index 6dd5186e..fa438356 100644
--- a/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs
+++ b/Oqtane.Server/Extensions/OqtaneServiceCollectionExtensions.cs
@@ -57,40 +57,6 @@ namespace Microsoft.Extensions.DependencyInjection
             return services;
         }
 
-        internal static IServiceCollection AddOqtaneScopedServices(this IServiceCollection services)
-        {
-            services.AddScoped<SiteState>();
-            services.AddScoped<IAuthorizationHandler, PermissionHandler>();
-            services.AddScoped<IInstallationService, InstallationService>();
-            services.AddScoped<IModuleDefinitionService, ModuleDefinitionService>();
-            services.AddScoped<IThemeService, ThemeService>();
-            services.AddScoped<IAliasService, AliasService>();
-            services.AddScoped<ITenantService, TenantService>();
-            services.AddScoped<ISiteService, SiteService>();
-            services.AddScoped<IPageService, PageService>();
-            services.AddScoped<IModuleService, ModuleService>();
-            services.AddScoped<IPageModuleService, PageModuleService>();
-            services.AddScoped<IUserService, UserService>();
-            services.AddScoped<IProfileService, ProfileService>();
-            services.AddScoped<IRoleService, RoleService>();
-            services.AddScoped<IUserRoleService, UserRoleService>();
-            services.AddScoped<ISettingService, SettingService>();
-            services.AddScoped<IPackageService, PackageService>();
-            services.AddScoped<ILogService, LogService>();
-            services.AddScoped<IJobService, JobService>();
-            services.AddScoped<IJobLogService, JobLogService>();
-            services.AddScoped<INotificationService, NotificationService>();
-            services.AddScoped<IFolderService, FolderService>();
-            services.AddScoped<IFileService, FileService>();
-            services.AddScoped<ISiteTemplateService, SiteTemplateService>();
-            services.AddScoped<ISqlService, SqlService>();
-            services.AddScoped<ISystemService, SystemService>();
-            services.AddScoped<ILocalizationService, LocalizationService>();
-            services.AddScoped<ILanguageService, LanguageService>();
-
-            return services;
-        }
-
         internal static IServiceCollection AddOqtaneSingletonServices(this IServiceCollection services)
         {
             services.AddSingleton<IInstallationManager, InstallationManager>();
diff --git a/Oqtane.Server/Startup.cs b/Oqtane.Server/Startup.cs
index 9793510c..6f86bcc4 100644
--- a/Oqtane.Server/Startup.cs
+++ b/Oqtane.Server/Startup.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
@@ -65,7 +66,8 @@ namespace Oqtane
             services.AddOqtaneAuthorizationPolicies();
 
             // register scoped core services
-            services.AddOqtaneScopedServices();
+            services.AddScoped<IAuthorizationHandler, PermissionHandler>()
+                .AddOqtaneScopedServices();
 
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();