Merge pull request #11 from fiskaltrust/user/tsc/scu-config

Make SCU params configurable via intent
fiskaltrust · Oct 16, 2020 · 9939752 · 9939752
2 parents d39ad4f + 1028474
commit 9939752
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 8 deletions.
diff --git a/...fiskaltrust.AndroidLauncher/AndroidService/Broadcasting/StartLauncherBroadcastReceiver.cs b/...fiskaltrust.AndroidLauncher/AndroidService/Broadcasting/StartLauncherBroadcastReceiver.cs
@@ -5,6 +5,7 @@
 using Android.Widget;
 using fiskaltrust.AndroidLauncher.Enums;
 using fiskaltrust.AndroidLauncher.Exceptions;
+using fiskaltrust.AndroidLauncher.Extensions;
 using System.Threading.Tasks;
 
 namespace fiskaltrust.AndroidLauncher.AndroidService.Broadcasting
@@ -18,9 +19,10 @@ public override void OnReceive(Context context, Intent intent)
             var cashboxId = intent.GetStringExtra("cashboxid");
             var accessToken = intent.GetStringExtra("accesstoken");
             var isSandbox = intent.GetBooleanExtra("sandbox", false);
+            var scuParams = intent.GetScuConfigParameters();
 
             Toast.MakeText(context, $"Starting fiskaltrust Middleware with cashbox '{cashboxId}' (Sandbox: {isSandbox}). Initializing might take up to 45 seconds, depending on the TSE.", ToastLength.Long).Show();
-            MiddlewareLauncherService.Start(ServiceConnectionProvider.GetConnection(), cashboxId, accessToken, isSandbox);
+            MiddlewareLauncherService.Start(ServiceConnectionProvider.GetConnection(), cashboxId, accessToken, isSandbox, scuParams);
             Task.Run(async () =>
             {
                 try

diff --git a/src/fiskaltrust.AndroidLauncher/AndroidService/MiddlewareLauncherService.cs b/src/fiskaltrust.AndroidLauncher/AndroidService/MiddlewareLauncherService.cs
@@ -4,9 +4,12 @@
 using Android.Runtime;
 using fiskaltrust.AndroidLauncher.Enums;
 using fiskaltrust.AndroidLauncher.Extensions;
+using fiskaltrust.AndroidLauncher.Helpers.Hosting;
 using fiskaltrust.AndroidLauncher.Services;
 using fiskaltrust.ifPOS.v1;
+using Java.Util;
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace fiskaltrust.AndroidLauncher.AndroidService
@@ -26,6 +29,7 @@ public override IBinder OnBind(Intent intent)
             var cashboxIdString = intent.GetStringExtra("cashboxid");
             var accesstoken = intent.GetStringExtra("accesstoken");
             var isSandbox = intent.GetBooleanExtra("sandbox", false);
+            var scuParams = intent.GetScuConfigParameters(removePrefix: true);            
 
             if (string.IsNullOrEmpty(cashboxIdString) || !Guid.TryParse(cashboxIdString, out var cashboxId))
             {
@@ -36,7 +40,7 @@ public override IBinder OnBind(Intent intent)
                 throw new ArgumentException("The extra 'accesstoken' needs to be set in this intent.", "accesstoken");
             }
 
-            _posProvider = new POSProvider(cashboxId, accesstoken, isSandbox);
+            _posProvider = new POSProvider(cashboxId, accesstoken, isSandbox, scuParams);
             Binder = new POSProviderBinder(this);
             return Binder;
         }
@@ -72,14 +76,16 @@ public override void OnDestroy()
 
         public async Task StopAsync() => await _posProvider.StopAsync();
 
-        public static void Start(IMiddlewareServiceConnection serviceConnection, string cashboxId, string accessToken, bool isSandbox)
+        public static void Start(IMiddlewareServiceConnection serviceConnection, string cashboxId, string accessToken, bool isSandbox, Dictionary<string, object> additionalScuParams)
         {
             if (!IsRunning(typeof(MiddlewareLauncherService)))
             {
                 var intent = new Intent(Application.Context, typeof(MiddlewareLauncherService));
                 intent.PutExtra("cashboxid", cashboxId);
                 intent.PutExtra("accesstoken", accessToken);
                 intent.PutExtra("sandbox", isSandbox);
+                intent.PutExtras(additionalScuParams);
+
                 Application.Context.BindService(intent, serviceConnection, Bind.AutoCreate);
                 Application.Context.StartForegroundServiceCompat<MiddlewareLauncherService>();
             }

diff --git a/src/fiskaltrust.AndroidLauncher/Extensions/IntentExtensions.cs b/src/fiskaltrust.AndroidLauncher/Extensions/IntentExtensions.cs
@@ -0,0 +1,28 @@
+using Android.Content;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace fiskaltrust.AndroidLauncher.Extensions
+{
+    public static class IntentExtensions
+    {
+        private const string SCU_CONFIG_PREFIX = "scu-config-";
+
+        public static Dictionary<string, object> GetScuConfigParameters(this Intent intent, bool removePrefix = false)
+        {
+            string GetKey(string key) => removePrefix ? key.Substring(SCU_CONFIG_PREFIX.Length) : key;
+
+            return intent.Extras.KeySet()
+                .Where(x => x.StartsWith(SCU_CONFIG_PREFIX))
+                .ToDictionary<string, string, object>(key => GetKey(key), key => intent.Extras.Get(key));
+        }
+
+        public static void PutExtras(this Intent intent, Dictionary<string, object> dict)
+        {
+            foreach (var extra in dict)
+            {
+                intent.PutExtra(extra.Key, extra.Value.ToString());
+            }
+        }
+    }
+}
diff --git a/src/fiskaltrust.AndroidLauncher/Services/MiddlewareLauncher.cs b/src/fiskaltrust.AndroidLauncher/Services/MiddlewareLauncher.cs
@@ -5,8 +5,10 @@
 using fiskaltrust.AndroidLauncher.Services.SCU;
 using fiskaltrust.ifPOS.v1;
 using fiskaltrust.Middleware.Interface.Client.Grpc;
+using fiskaltrust.Middleware.SCU.DE.Fiskaly;
 using fiskaltrust.storage.serialization.V0;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -20,6 +22,7 @@ internal class MiddlewareLauncher
         private readonly Guid _cashboxId;
         private readonly string _accessToken;
         private readonly bool _isSandbox;
+        private readonly Dictionary<string, object> _scuParams;
         private readonly IConfigurationProvider _configurationProvider;
         private readonly ILocalConfigurationProvider _localConfigurationProvider;
 
@@ -30,11 +33,12 @@ internal class MiddlewareLauncher
 
         public bool IsRunning { get; set; }
 
-        public MiddlewareLauncher(Guid cashboxId, string accessToken, bool isSandbox)
+        public MiddlewareLauncher(Guid cashboxId, string accessToken, bool isSandbox, Dictionary<string, object> scuParams)
         {
             _cashboxId = cashboxId;
             _accessToken = accessToken;
             _isSandbox = isSandbox;
+            _scuParams = scuParams;
 
             _configurationProvider = new HelipadConfigurationProvider();
             _localConfigurationProvider = new LocalConfigurationProvider();
@@ -59,12 +63,16 @@ public async Task StartAsync()
             foreach (var scuConfig in configuration.ftSignaturCreationDevices)
             {
                 scuConfig.Configuration["sandbox"] = _isSandbox;
+
                 switch (scuConfig.Package)
                 {
                     case PACKAGE_NAME_SWISSBIT:
                         await InitializeSwissbitScuAsync(scuConfig);
                         break;
                     case PACKAGE_NAME_FISKALY:
+                        if (_scuParams.TryGetValue(nameof(FiskalySCUConfiguration.FislayClientTimeout), out var clientTimeout)) scuConfig.Configuration[nameof(FiskalySCUConfiguration.FislayClientTimeout)] = clientTimeout;
+                        if (_scuParams.TryGetValue(nameof(FiskalySCUConfiguration.FislayClientSmaersTimeout), out var smaersTimeout)) scuConfig.Configuration[nameof(FiskalySCUConfiguration.FislayClientSmaersTimeout)] = smaersTimeout;
+
                         await InitializeFiskalyScuAsync(scuConfig);
                         break;
                     default:

diff --git a/src/fiskaltrust.AndroidLauncher/Services/POSProvider.cs b/src/fiskaltrust.AndroidLauncher/Services/POSProvider.cs
@@ -1,5 +1,6 @@
 using fiskaltrust.ifPOS.v1;
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace fiskaltrust.AndroidLauncher.Services
@@ -9,9 +10,9 @@ class POSProvider : IPOSProvider
         private MiddlewareLauncher _launcher;
         private IPOS _pos;
 
-        public POSProvider(Guid cashboxId, string accessToken, bool isSandbox)
+        public POSProvider(Guid cashboxId, string accessToken, bool isSandbox, Dictionary<string, object> scuParams)
         {
-            _launcher = new MiddlewareLauncher(cashboxId, accessToken, isSandbox);
+            _launcher = new MiddlewareLauncher(cashboxId, accessToken, isSandbox, scuParams);
         }
 
         public async Task<IPOS> GetPOSAsync()

diff --git a/src/fiskaltrust.AndroidLauncher/fiskaltrust.AndroidLauncher.csproj b/src/fiskaltrust.AndroidLauncher/fiskaltrust.AndroidLauncher.csproj
@@ -53,7 +53,7 @@
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
     <AndroidLinkMode>None</AndroidLinkMode>
     <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>8.0</LangVersion>    
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -71,6 +71,7 @@
     <Compile Include="Exceptions\ConfigurationNotFoundException.cs" />
     <Compile Include="Exceptions\RemountRequiredException.cs" />
     <Compile Include="Extensions\ContextExtensions.cs" />
+    <Compile Include="Extensions\IntentExtensions.cs" />
     <Compile Include="Extensions\ServiceCollectionExtensions.cs" />
     <Compile Include="Helpers\Hosting\DESSCDClientFactory.cs" />
     <Compile Include="Helpers\Hosting\GrpcHelper.cs" />

diff --git a/version.json b/version.json
@@ -1,5 +1,5 @@
 {
-    "version": "1.3.9-rc3",
+    "version": "1.3.9-rc4",
     "releaseBranches": [
       "^refs/heads/master$",
       "^refs/heads/release/\\d+(?:\\.\\d+)*(?:-.*)?$",