From 91c24ca3b753b37cf2c6d3a4b9527a264683af22 Mon Sep 17 00:00:00 2001
From: juileetikekar <juilee.tikekar@iosb-ina.fraunhofer.de>
Date: Mon, 10 Oct 2022 08:35:30 +0200
Subject: [PATCH] GitHub Issue 139 Fix

---
 src/AasxServerBlazor/Properties/launchSettings.json        | 2 +-
 src/AasxServerStandardBib/AasxServerStandardBib.csproj     | 7 ++++---
 src/AasxServerStandardBib/DataChangeMonitoredItem.cs       | 7 +++++++
 src/AasxServerStandardBib/SampleNodeManager.cs             | 5 +++++
 .../SampleServer.UserAuthentication.cs                     | 3 ++-
 src/AasxServerStandardBib/UASampleClient.cs                | 3 ++-
 6 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/AasxServerBlazor/Properties/launchSettings.json b/src/AasxServerBlazor/Properties/launchSettings.json
index b6b92bb23..ca4734cc0 100644
--- a/src/AasxServerBlazor/Properties/launchSettings.json
+++ b/src/AasxServerBlazor/Properties/launchSettings.json
@@ -18,7 +18,7 @@
     },
     "AasxServerBlazor": {
       "commandName": "Project",
-      "commandLineArgs": "--rest --data-path \"C:\\Development\\AASX\" --edit --external-blazor http://localhost:5001 --no-security",
+      "commandLineArgs": "--opc --data-path \"C:\\Development\\AASX\" --edit --external-blazor http://localhost:5001 --no-security",
       "launchBrowser": true,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
diff --git a/src/AasxServerStandardBib/AasxServerStandardBib.csproj b/src/AasxServerStandardBib/AasxServerStandardBib.csproj
index 3cc1250df..a77e95768 100644
--- a/src/AasxServerStandardBib/AasxServerStandardBib.csproj
+++ b/src/AasxServerStandardBib/AasxServerStandardBib.csproj
@@ -20,16 +20,17 @@
     <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.2" />
     <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.13.1" />
     <PackageReference Include="MQTTnet.NETStandard" Version="3.0.8" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NJsonSchema" Version="10.3.2" />
-    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.359.31" />
+    <PackageReference Include="OPCFoundation.NetStandard.Opc.Ua" Version="1.4.370.12" />
     <PackageReference Include="QRCoder" Version="1.4.1" />
     <PackageReference Include="ScottPlot" Version="4.1.33" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20371.2" />
     <PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.13.1" />
     <PackageReference Include="System.IO.Packaging" Version="4.6.0" />
-    <PackageReference Include="System.Security.Permissions" Version="4.6.0" />
+    <PackageReference Include="System.Security.Permissions" Version="6.0.0" />
+    <PackageReference Include="System.ServiceModel.Primitives" Version="4.10.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/AasxServerStandardBib/DataChangeMonitoredItem.cs b/src/AasxServerStandardBib/DataChangeMonitoredItem.cs
index fe77f2b66..8859653f2 100644
--- a/src/AasxServerStandardBib/DataChangeMonitoredItem.cs
+++ b/src/AasxServerStandardBib/DataChangeMonitoredItem.cs
@@ -636,6 +636,8 @@ public DataChangeFilter DataChangeFilter
             get { return m_filter; }
         }
 
+        public bool IsResendData => throw new NotImplementedException();
+
         /// <summary>
         /// Increments the sample time to the next interval.
         /// </summary>
@@ -788,6 +790,11 @@ private void Publish(
 
             diagnostics.Enqueue(diagnosticInfo);
         }
+
+        public void SetupResendDataTrigger()
+        {
+            throw new NotImplementedException();
+        }
         #endregion
 
         #region Private Fields
diff --git a/src/AasxServerStandardBib/SampleNodeManager.cs b/src/AasxServerStandardBib/SampleNodeManager.cs
index cf97a3852..8779886d2 100644
--- a/src/AasxServerStandardBib/SampleNodeManager.cs
+++ b/src/AasxServerStandardBib/SampleNodeManager.cs
@@ -2991,6 +2991,11 @@ protected virtual void OnSetMonitoringMode(
         {
             // does nothing.
         }
+
+        public void TransferMonitoredItems(OperationContext context, bool sendInitialValues, IList<IMonitoredItem> monitoredItems, IList<bool> processedItems, IList<ServiceResult> errors)
+        {
+            throw new NotImplementedException();
+        }
         #endregion
 
         #region Private Fields
diff --git a/src/AasxServerStandardBib/SampleServer.UserAuthentication.cs b/src/AasxServerStandardBib/SampleServer.UserAuthentication.cs
index 79fea7150..2db5004b5 100644
--- a/src/AasxServerStandardBib/SampleServer.UserAuthentication.cs
+++ b/src/AasxServerStandardBib/SampleServer.UserAuthentication.cs
@@ -29,6 +29,7 @@
 
 using System;
 using System.IdentityModel.Selectors;
+//using System.IdentityModel.Selectors;
 using System.Security.Cryptography.X509Certificates;
 using System.Xml;
 using Opc.Ua;
@@ -62,7 +63,7 @@ private void CreateUserIdentityValidators(ApplicationConfiguration configuration
                             configuration.SecurityConfiguration.RejectedCertificateStore);
 
                         // set custom validator for user certificates.
-                        m_certificateValidator = certificateValidator.GetChannelValidator();
+                        m_certificateValidator = (X509CertificateValidator)certificateValidator.GetChannelValidator();
                     }
                 }
             }
diff --git a/src/AasxServerStandardBib/UASampleClient.cs b/src/AasxServerStandardBib/UASampleClient.cs
index 28084164a..3921b728f 100644
--- a/src/AasxServerStandardBib/UASampleClient.cs
+++ b/src/AasxServerStandardBib/UASampleClient.cs
@@ -106,7 +106,8 @@ public async Task ConsoleSampleClient()
 
             if (haveAppCertificate)
             {
-                config.ApplicationUri = Utils.GetApplicationUriFromCertificate(config.SecurityConfiguration.ApplicationCertificate.Certificate);
+                //config.ApplicationUri = Utils.GetApplicationUriFromCertificate(config.SecurityConfiguration.ApplicationCertificate.Certificate);
+                config.ApplicationUri = X509Utils.GetApplicationUriFromCertificate(config.SecurityConfiguration.ApplicationCertificate.Certificate);
                 if (config.SecurityConfiguration.AutoAcceptUntrustedCertificates)
                 {
                     autoAccept = true;