Merge pull request #275 from fiskaltrust/user/tsc/fcc-4.1.1

Added support for FCC 4.1.1
fiskaltrust · Apr 15, 2024 · 34a1dab · 34a1dab
2 parents 38081ec + a1fe1b5
commit 34a1dab
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 17 deletions.
diff --git a/scu-de/src/fiskaltrust.Middleware.SCU.DE.DeutscheFiskal/DeutscheFiskalSCU.cs b/scu-de/src/fiskaltrust.Middleware.SCU.DE.DeutscheFiskal/DeutscheFiskalSCU.cs
@@ -73,15 +73,16 @@ private void StartLocalFCC()
 
                 if (!_fccDownloadService.IsInstalled(_fccDirectory))
                 {
-                    if (_fccDownloadService.DownloadFccAsync(_fccDirectory).Result)
+                    if (_fccDownloadService.DownloadFccAsync(_fccDirectory, null).Result)
                     {
                         _fccInitializationService.Initialize(_fccDirectory);
                         _version = new Version(_configuration.FccVersion);
                     }
                 }
                 else if (!_fccDownloadService.IsLatestVersion(_fccDirectory, new Version(_configuration.FccVersion)))
                 {
-                    if (_fccDownloadService.DownloadFccAsync(_fccDirectory).Result)
+                    var currentlyInstalledVersion = _fccDownloadService.UsedFCCVersion;
+                    if (_fccDownloadService.DownloadFccAsync(_fccDirectory, currentlyInstalledVersion).Result)
                     {
                         _fccInitializationService.Update(_fccDirectory);
                     }

diff --git a/scu-de/src/fiskaltrust.Middleware.SCU.DE.DeutscheFiskal/DeutscheFiskalSCUConfiguration.cs b/scu-de/src/fiskaltrust.Middleware.SCU.DE.DeutscheFiskal/DeutscheFiskalSCUConfiguration.cs
@@ -18,7 +18,7 @@ public class DeutscheFiskalSCUConfiguration
         public bool DisplayCertificationIdAddition { get; set; } = true;
         public string CertificationIdAddition { get; set; } = "USK ausgesetzt";
         public string ServiceFolder { get; set; }
-        public string FccVersion { get; set; } = "4.0.8";
+        public string FccVersion { get; set; } = "4.1.1";
         public string ProxyServer { get; set; }
         public int? ProxyPort { get; set; }
         public string ProxyUsername { get; set; }

diff --git a/...fiskaltrust.Middleware.SCU.DE.DeutscheFiskal/Services/DeutscheFiskalFccDownloadService.cs b/...fiskaltrust.Middleware.SCU.DE.DeutscheFiskal/Services/DeutscheFiskalFccDownloadService.cs
@@ -100,28 +100,28 @@ public bool IsPathInRunFccIdent(string path, string content, out string pathInFi
             return string.Equals(path, pathInFile, StringComparison.OrdinalIgnoreCase);
         }
 
-        public async Task<bool> DownloadFccAsync(string fccDirectory)
+        public async Task<bool> DownloadFccAsync(string fccDirectory, Version currentlyInstalledVersion)
         {
             _logger.LogWarning("Downloading and extracting FCC - this will take some time, depending on your internet connection.");
             var tempZipPath = Path.GetTempFileName();
             try
             {
                 try
                 {
-                    await DownloadAndExtractAsync(tempZipPath, fccDirectory).ConfigureAwait(false);
+                    await DownloadAndExtractAsync(tempZipPath, fccDirectory, currentlyInstalledVersion).ConfigureAwait(false);
                     return true;
                 }
                 catch (Exception ex)
                 {
-                    if(_configuration.FccRetry > _fccRetry)
+                    if (_configuration.FccRetry > _fccRetry)
                     {
                         await Task.Delay(1000);
                         _fccRetry++;
                         _logger.LogWarning($"An error occured while downloading ({ex.InnerException?.Message ?? ex.Message}), retry {_fccRetry} from {_configuration.FccRetry}");
-                        return await DownloadFccAsync(fccDirectory).ConfigureAwait(false);
+                        return await DownloadFccAsync(fccDirectory, currentlyInstalledVersion).ConfigureAwait(false);
                     }
                     _logger.LogWarning($"An error occured while downloading ({ex.InnerException?.Message ?? ex.Message}), download aborted");
-                    return false; 
+                    return false;
                 }
             }
             finally
@@ -137,10 +137,10 @@ public async Task<bool> DownloadFccAsync(string fccDirectory)
                 }
             }
         }
-        
+
         private string GetCloudConnectorPath(string fccDirectory) => Path.Combine(fccDirectory, "lib", "fiskal-cloud-connector-service.jar");
 
-        private async Task DownloadAndExtractAsync(string tempZipPath, string fccDirectory)
+        private async Task DownloadAndExtractAsync(string tempZipPath, string fccDirectory, Version currentlyInstalledVersion)
         {
             var downloadUri = string.IsNullOrEmpty(_configuration.FccDownloadUri) ? GetDownloadUriByCurrentPlatform() : _configuration.FccDownloadUri;
             _logger.LogDebug("Downloading FCC from {FccDownloadUrl}...", downloadUri);
@@ -159,6 +159,14 @@ private async Task DownloadAndExtractAsync(string tempZipPath, string fccDirecto
             var baseDir = new DirectoryInfo(fccDirectory);
             if (fccdataDir.Exists)
             {
+                // FCC version 4.1.1 requires to delete the existing Java files prior to extracting the new ones
+                var versionRequiresJavaUpdate = new Version(4, 1, 1);
+                if (currentlyInstalledVersion != null && currentlyInstalledVersion < versionRequiresJavaUpdate && new Version(_configuration.FccVersion) >= versionRequiresJavaUpdate)
+                {
+                    CleanExistingJavaFiles(fccDirectory);
+                    _logger.LogInformation("Cleaned up previous Java installation from /bin folder, as required when updating to FCC >= 4.1.1.");
+                }
+
                 UpdateFCCFiles(tempZipPath, fccDirectory, baseDir);
             }
             else
@@ -178,6 +186,15 @@ private async Task DownloadAndExtractAsync(string tempZipPath, string fccDirecto
             }
         }
 
+        private void CleanExistingJavaFiles(string fccDirectory)
+        {
+            var binDirectory = Path.Combine(fccDirectory, "bin");
+            if (Directory.Exists(binDirectory))
+            {
+                Directory.Delete(binDirectory, true);
+            }
+        }
+
         private void UpdateFCCFiles(string tempZipPath, string fccDirectory, DirectoryInfo baseDir)
         {
             var runningProcess = DeutscheFiskalFccProcessHost.GetProcessIfRunning(fccDirectory, _logger);
@@ -210,6 +227,11 @@ private void UpdateFCCFiles(string tempZipPath, string fccDirectory, DirectoryIn
 
         protected virtual string GetDownloadUriByCurrentPlatform()
         {
+            if (RuntimeInformation.OSArchitecture == Architecture.X86)
+            {
+                throw new Exception("Starting from version 4.1.1, the FCC does not support x86 Operating Systems anymore. Only x64, arm32 and arm64 are supported.");
+            }
+
             var operatingSystem = RuntimeInformation.OSArchitecture switch
             {
                 Architecture.X64 => "x64",

diff --git a/...c/fiskaltrust.Middleware.SCU.DE.DeutscheFiskal/Services/Interfaces/IFccDownloadService.cs b/...c/fiskaltrust.Middleware.SCU.DE.DeutscheFiskal/Services/Interfaces/IFccDownloadService.cs
@@ -6,7 +6,7 @@ namespace fiskaltrust.Middleware.SCU.DE.DeutscheFiskal.Services.Interfaces
     public interface IFccDownloadService
     {
         Version UsedFCCVersion { get; }
-        Task<bool> DownloadFccAsync(string fccDirectory);
+        Task<bool> DownloadFccAsync(string fccDirectory, Version currentlyInstalledVersion);
         bool IsInstalled(string fccDirectory);
         bool IsLatestVersion(string fccDirectory, Version latestVersion);
         bool IsLatestVersionDat(string fccDirectory, Version latestVersion);

diff --git a/scu-de/src/fiskaltrust.Middleware.SCU.DE.DeutscheFiskal/version.json b/scu-de/src/fiskaltrust.Middleware.SCU.DE.DeutscheFiskal/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.55",
+  "version": "1.3.56",
   "releaseBranches": [
     "^refs/tags/scu-de/deutschefiskal/v\\d+(?:\\.\\d+)*(?:-.*)?$"
   ]

diff --git a/scu-de/src/fiskaltrust.Middleware.SCU.DE.SwissbitAndroid/Resources/Resource.designer.cs b/scu-de/src/fiskaltrust.Middleware.SCU.DE.SwissbitAndroid/Resources/Resource.designer.cs
diff --git a/scu-de/src/fiskaltrust.Middleware.SCU.DE.SwissbitCloud/version.json b/scu-de/src/fiskaltrust.Middleware.SCU.DE.SwissbitCloud/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.55",
+  "version": "1.3.56",
   "releaseBranches": [
     "^refs/tags/scu-de/swissbitcloud/v\\d+(?:\\.\\d+)*(?:-.*)?$"
   ]

diff --git a/scu-de/src/fiskaltrust.Middleware.SCU.DE.SwissbitCloudAndroid/Resources/Resource.designer.cs b/scu-de/src/fiskaltrust.Middleware.SCU.DE.SwissbitCloudAndroid/Resources/Resource.designer.cs
diff --git a/...e/test/fiskaltrust.Middleware.SCU.DE.DeutscheFiskal.IntegrationTest/FccDownloaderTests.cs b/...e/test/fiskaltrust.Middleware.SCU.DE.DeutscheFiskal.IntegrationTest/FccDownloaderTests.cs
@@ -23,7 +23,7 @@ public async Task DownloadAsync_Should_DownloadFileDependingOnPlatform()
             };
             DeleteNotExistingFolder(notExistingPath);
             var sut = new DeutscheFiskalFccDownloadService(config, Mock.Of<ILogger<DeutscheFiskalFccDownloadService>>());
-            await sut.DownloadFccAsync(config.FccDirectory);
+            await sut.DownloadFccAsync(config.FccDirectory, null);
         }
 
         [Fact]

diff --git a/...de/test/fiskaltrust.Middleware.SCU.DE.SwissbitCloud.IntegrationTest/FccDownloaderTests.cs b/...de/test/fiskaltrust.Middleware.SCU.DE.SwissbitCloud.IntegrationTest/FccDownloaderTests.cs
@@ -21,7 +21,7 @@ public FccDownloaderTests(SwissbitCloudFixture fixture)
         public async Task DownloadAsync_Should_DownloadFileDependingOnPlatform()
         {
             var sut = new DeutscheFiskalFccDownloadService(_fixture.Configuration, Mock.Of<ILogger<IFccDownloadService>>());
-            await sut.DownloadFccAsync(_fixture.Configuration.FccDirectory);
+            await sut.DownloadFccAsync(_fixture.Configuration.FccDirectory, null);
         }
     }
 }