Skip to content

GitHub Issue 139 Fix #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
juileetikekar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

GitHub Issue 139 Fix #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/AasxServerBlazor/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 4 additions & 3 deletions src/AasxServerStandardBib/AasxServerStandardBib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 7 additions & 0 deletions src/AasxServerStandardBib/DataChangeMonitoredItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -788,6 +790,11 @@ private void Publish(

diagnostics.Enqueue(diagnosticInfo);
}

public void SetupResendDataTrigger()
{
throw new NotImplementedException();
}
#endregion

#region Private Fields
Expand Down
5 changes: 5 additions & 0 deletions src/AasxServerStandardBib/SampleNodeManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/AasxServerStandardBib/SampleServer.UserAuthentication.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/AasxServerStandardBib/UASampleClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down