Skip to content

Commit 24dfa60

Browse files
romanettromanett
authored
fix GDS (add default users, fixApplicationNameLocales), update to final 1.5.378 (#681)
1 parent 20768af commit 24dfa60

File tree

45 files changed

+155
-68
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+155
-68
lines changed

‎Samples/Client.Net4/UA Sample Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
<Version>10.0.2</Version>
144144
</PackageReference>
145145
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Bindings.Https">
146-
<Version>1.5.378.101-preview</Version>
146+
<Version>1.5.378.106</Version>
147147
</PackageReference>
148148
<PackageReference Include="System.Net.Http">
149149
<Version>4.3.4</Version>

‎Samples/ClientControls.Net4/UA Client Controls.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,16 +1020,16 @@
10201020
<Version>10.0.2</Version>
10211021
</PackageReference>
10221022
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core">
1023-
<Version>1.5.378.101-preview</Version>
1023+
<Version>1.5.378.106</Version>
10241024
</PackageReference>
10251025
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client">
1026-
<Version>1.5.378.101-preview</Version>
1026+
<Version>1.5.378.106</Version>
10271027
</PackageReference>
10281028
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client.ComplexTypes">
1029-
<Version>1.5.378.101-preview</Version>
1029+
<Version>1.5.378.106</Version>
10301030
</PackageReference>
10311031
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration">
1032-
<Version>1.5.378.101-preview</Version>
1032+
<Version>1.5.378.106</Version>
10331033
</PackageReference>
10341034
</ItemGroup>
10351035
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

‎Samples/Controls.Net4/UA Sample Controls.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -703,10 +703,10 @@
703703
<Version>10.0.2</Version>
704704
</PackageReference>
705705
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client.ComplexTypes">
706-
<Version>1.5.378.101-preview</Version>
706+
<Version>1.5.378.106</Version>
707707
</PackageReference>
708708
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server">
709-
<Version>1.5.378.101-preview</Version>
709+
<Version>1.5.378.106</Version>
710710
</PackageReference>
711711
</ItemGroup>
712712
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

‎Samples/GDS/Client/GlobalDiscoveryClient.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,10 @@
144144
<Version>10.0.2</Version>
145145
</PackageReference>
146146
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration">
147-
<Version>1.5.378.101-preview</Version>
147+
<Version>1.5.378.106</Version>
148148
</PackageReference>
149149
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Gds.Client.Common">
150-
<Version>1.5.378.101-preview</Version>
150+
<Version>1.5.378.106</Version>
151151
</PackageReference>
152152
</ItemGroup>
153153
<ItemGroup>

‎Samples/GDS/ClientControls/GlobalDiscoveryClientControls.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,10 @@
222222
<Version>10.0.2</Version>
223223
</PackageReference>
224224
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client">
225-
<Version>1.5.378.101-preview</Version>
225+
<Version>1.5.378.106</Version>
226226
</PackageReference>
227227
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Gds.Client.Common">
228-
<Version>1.5.378.101-preview</Version>
228+
<Version>1.5.378.106</Version>
229229
</PackageReference>
230230
</ItemGroup>
231231
<ItemGroup>

‎Samples/GDS/ConsoleServer/NetCoreGlobalDiscoveryServer.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.2" />
1616
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
1717
<PackageReference Include="Mono.Options" Version="6.12.0.148" />
18-
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Gds.Server.Common" Version="1.5.378.101-preview" />
19-
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration" Version="1.5.378.101-preview" />
18+
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Gds.Server.Common" Version="1.5.378.106" />
19+
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration" Version="1.5.378.106" />
2020
</ItemGroup>
2121

2222
</Project>

‎Samples/GDS/ConsoleServer/Program.cs‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,38 @@ private bool ConfigureUsers(IUserDatabase userDatabase)
322322
userDatabase.CreateUser(username, Encoding.UTF8.GetBytes(password), new List<Role>() { Role.AuthenticatedUser, GdsRole.CertificateAuthorityAdmin, GdsRole.DiscoveryAdmin });
323323
}
324324
}
325+
else
326+
{
327+
//delete existing standard users
328+
userDatabase.DeleteUser("appadmin");
329+
userDatabase.DeleteUser("appuser");
330+
userDatabase.DeleteUser("sysadmin");
331+
userDatabase.DeleteUser("DiscoveryAdmin");
332+
userDatabase.DeleteUser("CertificateAuthorityAdmin");
333+
334+
//create standard users
335+
userDatabase.CreateUser(
336+
"sysadmin",
337+
Encoding.UTF8.GetBytes("demo"),
338+
[GdsRole.CertificateAuthorityAdmin, GdsRole.DiscoveryAdmin, Role.SecurityAdmin, Role
339+
.ConfigureAdmin]);
340+
userDatabase.CreateUser(
341+
"appadmin",
342+
Encoding.UTF8.GetBytes("demo"),
343+
[Role.AuthenticatedUser, GdsRole.CertificateAuthorityAdmin, GdsRole
344+
.DiscoveryAdmin]);
345+
userDatabase.CreateUser("appuser", Encoding.UTF8.GetBytes("demo"), [Role.AuthenticatedUser]);
346+
347+
userDatabase.CreateUser(
348+
"DiscoveryAdmin",
349+
Encoding.UTF8.GetBytes("demo"),
350+
[Role.AuthenticatedUser, GdsRole.DiscoveryAdmin]);
351+
userDatabase.CreateUser(
352+
"CertificateAuthorityAdmin",
353+
Encoding.UTF8.GetBytes("demo"),
354+
[Role.AuthenticatedUser, GdsRole.CertificateAuthorityAdmin]);
355+
}
356+
325357
return createStandardUsers;
326358
}
327359

‎Samples/GDS/Server/GlobalDiscoveryServer.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,10 @@
238238
<Version>10.0.2</Version>
239239
</PackageReference>
240240
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration">
241-
<Version>1.5.378.101-preview</Version>
241+
<Version>1.5.378.106</Version>
242242
</PackageReference>
243243
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Gds.Server.Common">
244-
<Version>1.5.378.101-preview</Version>
244+
<Version>1.5.378.106</Version>
245245
</PackageReference>
246246
</ItemGroup>
247247
<PropertyGroup>

‎Samples/GDS/Server/Program.cs‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,38 @@ private static bool ConfigureUsers(SqlUsersDatabase userDatabase)
143143
userDatabase.CreateUser(username, Encoding.UTF8.GetBytes(password), new List<Role>() { Role.AuthenticatedUser, GdsRole.CertificateAuthorityAdmin, GdsRole.DiscoveryAdmin });
144144
}
145145
}
146+
else
147+
{
148+
//delete existing standard users
149+
userDatabase.DeleteUser("appadmin");
150+
userDatabase.DeleteUser("appuser");
151+
userDatabase.DeleteUser("sysadmin");
152+
userDatabase.DeleteUser("DiscoveryAdmin");
153+
userDatabase.DeleteUser("CertificateAuthorityAdmin");
154+
155+
//create standard users
156+
userDatabase.CreateUser(
157+
"sysadmin",
158+
Encoding.UTF8.GetBytes("demo"),
159+
[GdsRole.CertificateAuthorityAdmin, GdsRole.DiscoveryAdmin, Role.SecurityAdmin, Role
160+
.ConfigureAdmin]);
161+
userDatabase.CreateUser(
162+
"appadmin",
163+
Encoding.UTF8.GetBytes("demo"),
164+
[Role.AuthenticatedUser, GdsRole.CertificateAuthorityAdmin, GdsRole
165+
.DiscoveryAdmin]);
166+
userDatabase.CreateUser("appuser", Encoding.UTF8.GetBytes("demo"), [Role.AuthenticatedUser]);
167+
168+
userDatabase.CreateUser(
169+
"DiscoveryAdmin",
170+
Encoding.UTF8.GetBytes("demo"),
171+
[Role.AuthenticatedUser, GdsRole.DiscoveryAdmin]);
172+
userDatabase.CreateUser(
173+
"CertificateAuthorityAdmin",
174+
Encoding.UTF8.GetBytes("demo"),
175+
[Role.AuthenticatedUser, GdsRole.CertificateAuthorityAdmin]);
176+
177+
}
146178
return createStandardUsers;
147179
}
148180
}

‎Samples/GDS/Server/SqlApplicationsDatabase.cs‎

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -267,13 +267,24 @@ string applicationUri
267267

268268
foreach (var result in results)
269269
{
270-
LocalizedText[] names = null;
270+
var names = new List<LocalizedText>();
271271

272-
if (result.ApplicationName != null)
272+
IEnumerable<ApplicationName> applicationNames =
273+
from ii in entities.ApplicationNames
274+
where ii.ApplicationId == result.ID
275+
select ii;
276+
277+
foreach (ApplicationName applicationName in applicationNames)
273278
{
274-
names = new LocalizedText[] { result.ApplicationName };
279+
names.Add(new LocalizedText(applicationName.Locale, applicationName.Text));
275280
}
276281

282+
if (names.Count == 0 && result.ApplicationName != null)
283+
{
284+
names = [result.ApplicationName];
285+
}
286+
287+
277288
StringCollection discoveryUrls = null;
278289

279290
if (result.ServerEndpoints != null)
@@ -427,10 +438,22 @@ orderby x.ID
427438
lastID = result.ID;
428439
}
429440

441+
var names = new List<LocalizedText>();
442+
443+
IEnumerable<ApplicationName> applicationNames =
444+
from ii in entities.ApplicationNames
445+
where ii.ApplicationId == result.ID
446+
select ii;
447+
448+
foreach (ApplicationName appName in applicationNames)
449+
{
450+
names.Add(new LocalizedText(appName.Locale, appName.Text));
451+
}
452+
430453
records.Add(new ApplicationDescription() {
431454
ApplicationUri = result.ApplicationUri,
432455
ProductUri = result.ProductUri,
433-
ApplicationName = result.ApplicationName,
456+
ApplicationName = names.FirstOrDefault() ?? result.ApplicationName,
434457
ApplicationType = (ApplicationType)result.ApplicationType,
435458
GatewayServerUri = null,
436459
DiscoveryProfileUri = null,

0 commit comments

Comments
 (0)