Cleanup

webprofusion · Jan 13, 2025 · 0602100 · 0602100
1 parent 75d1bec
commit 0602100
Show file tree

Hide file tree

Showing 12 changed files with 201 additions and 240 deletions.
diff --git a/src/Certify.Core/Management/SettingsManager.cs b/src/Certify.Core/Management/SettingsManager.cs
@@ -19,7 +19,6 @@ private CoreAppSettings()
             IgnoreStoppedSites = true;
             EnableValidationProxyAPI = true;
             EnableAppTelematics = true;
-            EnableEFS = false;
             EnableDNSValidationChecks = false;
             RenewalIntervalDays = 75;
             RenewalIntervalMode = RenewalIntervalModes.PercentageLifetime;
@@ -76,8 +75,6 @@ public static CoreAppSettings Current
 
         public bool EnableValidationProxyAPI { get; set; }
 
-        public bool EnableEFS { get; set; }
-
         public bool EnableDNSValidationChecks { get; set; }
 
         /// <summary>
@@ -204,7 +201,6 @@ public static bool FromPreferences(Models.Preferences prefs)
             CoreAppSettings.Current.MaxRenewalRequests = prefs.MaxRenewalRequests;
             CoreAppSettings.Current.RenewalIntervalMode = prefs.RenewalIntervalMode;
             CoreAppSettings.Current.RenewalIntervalDays = prefs.RenewalIntervalDays;
-            CoreAppSettings.Current.EnableEFS = prefs.EnableEFS;
             CoreAppSettings.Current.IsInstanceRegistered = prefs.IsInstanceRegistered;
             CoreAppSettings.Current.Language = prefs.Language;
             CoreAppSettings.Current.EnableHttpChallengeServer = prefs.EnableHttpChallengeServer;
@@ -261,7 +257,6 @@ public static Models.Preferences ToPreferences()
                 MaxRenewalRequests = CoreAppSettings.Current.MaxRenewalRequests,
                 RenewalIntervalMode = CoreAppSettings.Current.RenewalIntervalMode,
                 RenewalIntervalDays = CoreAppSettings.Current.RenewalIntervalDays,
-                EnableEFS = CoreAppSettings.Current.EnableEFS,
                 InstanceId = CoreAppSettings.Current.InstanceId,
                 IsInstanceRegistered = CoreAppSettings.Current.IsInstanceRegistered,
                 Language = CoreAppSettings.Current.Language,

diff --git a/src/Certify.Locales/SR.Designer.cs b/src/Certify.Locales/SR.Designer.cs
diff --git a/src/Certify.Locales/SR.es-ES.resx b/src/Certify.Locales/SR.es-ES.resx
diff --git a/src/Certify.Locales/SR.ja-JP.resx b/src/Certify.Locales/SR.ja-JP.resx
@@ -123,9 +123,6 @@
   <data name="RegistrationEmailAddress" xml:space="preserve">
     <value>登録したメールアドレス</value>
   </data>
-  <data name="Account_Edit_AgreeConfirm" xml:space="preserve">
-    <value>はい、同意します</value>
-  </data>
   <data name="Cancel" xml:space="preserve">
     <value>キャンセル</value>
   </data>
@@ -159,13 +156,13 @@
   <data name="Email_Address" xml:space="preserve">
     <value>電子メール アドレス</value>
   </data>
-  <data name="Yes_I_Agree" xml:space="preserve">
+  <data name="Account_Edit_AgreeConfirm" xml:space="preserve">
     <value>はい、同意します</value>
   </data>
   <data name="Register_Contact" xml:space="preserve">
     <value>登録連絡先</value>
   </data>
-  <data name="New_Contact_Tip2" xml:space="preserve">
+  <data name="Account_Edit_Intro2" xml:space="preserve">
     <value>提供された電子メールアドレスは、必要に応じて今後の証明書の更新を通知するために使用することができます。 無効な電子メールアドレスはLet's Encrypt によって拒否されます。</value>
   </data>
   <data name="Send_Feedback" xml:space="preserve">
@@ -303,9 +300,6 @@
   <data name="Settings_EnableProxyApiForDomainConfig" xml:space="preserve">
     <value>ドメイン設定の確認にプロキシAPIを有効にする</value>
   </data>
-  <data name="Settings_EnableEFS" xml:space="preserve">
-    <value>機密ファイル用の暗号化ファイルシステム（EFS）を有効にする。 このオプションは、すべてのバージョンのWindowsでは動作しません。</value>
-  </data>
   <data name="Settings_IgnoreStoppedSites" xml:space="preserve">
     <value>新しい証明書と更新のために停止した IIS サイトを無視する</value>
   </data>
@@ -606,9 +600,6 @@
   <data name="ScheduledTaskConfig_UseBackgroundService" xml:space="preserve">
     <value>バック グラウンド サービスを利用 (ローカル システムとして実行) </value>
   </data>
-  <data name="Account_Edit_Intro2" xml:space="preserve">
-    <value>提供された電子メールアドレスは、必要に応じて今後の証明書の更新を通知するために使用することができます。 無効な電子メールアドレスはLet's Encrypt によって拒否されます。</value>
-  </data>
   <data name="ManagedCertificatesSettings_RefreshDomains" xml:space="preserve">
     <value>更新</value>
   </data>
@@ -642,4 +633,10 @@
   <data name="Settings_EnableHttpChallengeServer" xml:space="preserve">
     <value>Http チャレンジサーバーを有効にする</value>
   </data>
+  <data name="Yes_I_Agree" xml:space="preserve">
+    <value>はい、同意します</value>
+  </data>
+  <data name="New_Contact_Tip2" xml:space="preserve">
+    <value>提供された電子メールアドレスは、必要に応じて今後の証明書の更新を通知するために使用することができます。 無効な電子メールアドレスはLet's Encrypt によって拒否されます。</value>
+  </data>
 </root>
diff --git a/src/Certify.Locales/SR.nb-NO.resx b/src/Certify.Locales/SR.nb-NO.resx
@@ -297,9 +297,6 @@
   <data name="Settings_EnableProxyApiForDomainConfig" xml:space="preserve">
     <value>Aktiver proxy API for kontroller av domener</value>
   </data>
-  <data name="Settings_EnableEFS" xml:space="preserve">
-    <value>Aktiver kryptert filsystem (EFS) for sensitive filer. Dette alternativet virker ikke på alle versjoner av Windows.</value>
-  </data>
   <data name="Settings_IgnoreStoppedSites" xml:space="preserve">
     <value>Ignorer inaktive/stoppede IIS-nettsteder for nye sertifikater og fornyelser</value>
   </data>

diff --git a/src/Certify.Locales/SR.resx b/src/Certify.Locales/SR.resx
@@ -312,9 +312,6 @@
   <data name="Settings_EnableProxyApiForDomainConfig" xml:space="preserve">
     <value>Enable Proxy API for Domain Config Checks</value>
   </data>
-  <data name="Settings_EnableEFS" xml:space="preserve">
-    <value>Enable Encrypted File System (EFS) for sensitive files. This option does not work on all versions of Windows.</value>
-  </data>
   <data name="Settings_IgnoreStoppedSites" xml:space="preserve">
     <value>Ignore stopped IIS sites for new certificates and renewals</value>
   </data>

diff --git a/src/Certify.Locales/SR.tr-TR.resx b/src/Certify.Locales/SR.tr-TR.resx
@@ -312,9 +312,6 @@
   <data name="Settings_EnableProxyApiForDomainConfig" xml:space="preserve">
     <value>Alan adı yapılandırma kontrolleri için proxy API'sini etkinleştir</value>
   </data>
-  <data name="Settings_EnableEFS" xml:space="preserve">
-    <value>Hassas dosyalar için Şifreli Dosya Sistemini (EFS) etkinleştirin. Bu seçenek, Windows'un bazı sürümlerinde çalışmaz.</value>
-  </data>
   <data name="Settings_IgnoreStoppedSites" xml:space="preserve">
     <value>Yeni sertifikalar ve yenilemeler için durdurulan IIS sitelerini yoksay</value>
   </data>

diff --git a/src/Certify.Locales/SR.zh-Hans.resx b/src/Certify.Locales/SR.zh-Hans.resx
@@ -303,9 +303,6 @@
   <data name="Settings_EnableProxyApiForDomainConfig" xml:space="preserve">
     <value>启用域名检测配置的代理API</value>
   </data>
-  <data name="Settings_EnableEFS" xml:space="preserve">
-    <value>启用敏感文件保存在EFS中，这个选项并不支持所有Windows系统</value>
-  </data>
   <data name="Settings_IgnoreStoppedSites" xml:space="preserve">
     <value>申请证书和自动续期时忽略已停止站点</value>
   </data>

diff --git a/src/Certify.Models/Config/Preferences.cs b/src/Certify.Models/Config/Preferences.cs
@@ -46,8 +46,6 @@ public class Preferences : BindableBase
 
         public bool EnableValidationProxyAPI { get; set; } = true;
 
-        public bool EnableEFS { get; set; }
-
         public bool EnableDNSValidationChecks { get; set; }
 
         public string? RenewalIntervalMode { get; set; } = RenewalIntervalModes.PercentageLifetime;

diff --git a/src/Certify.Server/Certify.Server.Api.Public/Controllers/v1/ManagedChallengeController.cs b/src/Certify.Server/Certify.Server.Api.Public/Controllers/v1/ManagedChallengeController.cs
@@ -1,6 +1,5 @@
 using Certify.Client;
 using Certify.Models.Hub;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 

diff --git a/src/Certify.Server/Certify.Server.Api.Public/Startup.cs b/src/Certify.Server/Certify.Server.Api.Public/Startup.cs
@@ -64,7 +64,6 @@ public void ConfigureServices(IServiceCollection services)
 
             services
                 .AddSignalR(opt => opt.MaximumReceiveMessageSize = null)
-
                 .AddMessagePackProtocol();
 
             services.AddResponseCompression(opts =>
@@ -137,9 +136,6 @@ public void ConfigureServices(IServiceCollection services)
                         Format = "binary",
                     };
                 });
-
-
-
             });
 
             // connect to primary certify service 

diff --git a/src/Certify.Server/Certify.Server.Core/Certify.Server.Core/Startup.cs b/src/Certify.Server/Certify.Server.Core/Certify.Server.Core/Startup.cs
@@ -88,12 +88,6 @@ public void ConfigureServices(IServiceCollection services)
             });
 #endif
 
-            // inject instance of certify manager
-            var certifyManager = new Management.CertifyManager();
-            certifyManager.Init().Wait();
-
-            services.AddSingleton<Management.ICertifyManager>(certifyManager);
-
             var useHttps = bool.Parse(Configuration["API:Service:UseHttps"]);
 
             if (useHttps)
@@ -104,6 +98,12 @@ public void ConfigureServices(IServiceCollection services)
                     options.HttpsPort = 443;
                 });
             }
+
+            // inject instance of certify manager
+            var certifyManager = new Management.CertifyManager();
+            certifyManager.Init().Wait();
+
+            services.AddSingleton<Management.ICertifyManager>(certifyManager);
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.