Merge branch 'refs/heads/main' into freezor/refactor-prpgram-env-from…

…-array-to-enumerable

# Conflicts:
#	src/AasxServerBlazor/Properties/launchSettings.json

CONTRIBUTORS.md

@@ -5,7 +5,7 @@ contributes to this project.
 
 ## Contributing Companies
 
-> NOTE: The names of contributing companies and individuals are sorted alphabetically solely for improved readability and do not reflect any value or hierarchy.
+> **NOTE**: The names of contributing companies and individuals are sorted alphabetically solely for improved readability and do not reflect any value or hierarchy.
 
 Our heartfelt thanks go to the following companies and institutes, whose support and collaboration have been invaluable to the success of this project. Their
 contributions matter greatly and are deeply appreciated:
@@ -23,6 +23,9 @@ contributions matter greatly and are deeply appreciated:
 | [TUD Dresden University of Technology](https://tu-dresden.de/)                                          | <img src="https://tu-dresden.de/++theme++tud.theme.webcms2/img/tud-logo.svg" alt="TU Dresden Logo" style="max-width:250px;">                                |
 | [ZHAW Zürcher Hochschule für Angewandte Wissenschaften](https://www.zhaw.ch/)                           | <img src="https://upload.wikimedia.org/wikipedia/commons/thumb/e/e6/ZHAW_Logo.svg/514px-ZHAW_Logo.svg.png" alt="ZHAW Logo" style="max-width:250px;">        |
 
+> **NOTE:** All logos provided here are direct links from the respective company or organization's website and are not stored or used directly on our site. Each logo is licensed under its respective organization. The rights to use these logos within this project are held by the IDTA e.V.; however, the original rights remain with the respective organizations. For any questions or requests regarding additional use, please contact the IDTA at [email protected].
+
+
 ## Contributing People
 
 We are profoundly grateful to the following individuals for their time, effort, and dedication. Their contributions have been instrumental in the development
@@ -32,12 +35,12 @@ and success of this project:
 * [AlexanderWollbrink](https://github.com/AlexanderWollbrink) ([Fraunhofer IOSB-INA](https://www.iosb-ina.fraunhofer.de/))
 * [Andreas Orzelski](https://github.com/aorzelskiGH) ([Phoenix Contact](https://www.phoenixcontact.com/))
 * [Bastian Roessl](mailto:[email protected]) ([Fraunhofer IOSB-INA](https://www.iosb-ina.fraunhofer.de/))
-* [dschubertpxc](https://github.com/dschubertpxc)
+* [dschubertpxc](https://github.com/dschubertpxc) ([Phoenix Contact](https://www.phoenixcontact.com/))
 * [Gerd Brost](mailto:[email protected]) ([Fraunhofer AISEC](https://www.aisec.fraunhofer.de/))
 * [Harish Itian](https://github.com/harishpakala) ([Otto Von Guericke University](https://www.ovgu.de))
 * [jjtikekar](https://github.com/jjtikekar) ([Fraunhofer IOSB-INA](https://www.iosb-ina.fraunhofer.de/))
 * [Juilee Tikekar](https://github.com/juileetikekar) ([Industrial Digital Twin Association e.V. (IDTA)](https://www.idtwin.org/))
-* [Magnus Redeker](https://github.com/magnus-redeker)
+* [Magnus Redeker](https://github.com/magnus-redeker) ([Fraunhofer IOSB-INA](https://www.iosb-ina.fraunhofer.de/))
 * [Marko Ristin](https://github.com/mristin) ([ZHAW Zürcher Hochschule für Angewandte Wissenschaften](https://www.zhaw.ch/))
 * [Marta Fullen](https://github.com/martafullen) ([Fraunhofer IOSB-INA](https://www.iosb-ina.fraunhofer.de/))
 * [Michael Hoffmeister](https://github.com/MichaelHoffmeisterFesto) ([Festo](https://www.festo.com))

src/AasxServerBlazor/Properties/launchSettings.json

@@ -1,4 +1,4 @@
-{
+{
   "profiles": {
     "IIS Express": {
       "commandName": "IISExpress",
@@ -14,7 +14,7 @@
       "launchBrowser": true,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development",
-        "AASREGISTRY": "https://registry.dpp40-2-v2.industrialdigitaltwin.org",
+        "AASREGISTRY": "http://localhost:50001",
         "IFRAMEPATH": "https://dpp40-2-v2.industrialdigitaltwin.org/dashboard/submodelViewV3.html"
       },
       "applicationUrl": "http://localhost:5001",

src/AasxServerBlazor/startForDemo.bat

@@ -1 +1 @@
-AasxServerBlazor.exe --no-security --data-path aasxs
+AasxServerBlazor.exe --no-security --data-path aasxs --external-blazor http://localhost:5001

src/AasxServerBlazor/startForDemo.sh

@@ -1 +1 @@
-dotnet AasxServerBlazor.dll --no-security --data-path ./aasxs --host 0.0.0.0 $OPTIONSAASXSERVER
+dotnet AasxServerBlazor.dll --no-security --data-path ./aasxs --external-blazor http://localhost:5001

src/AasxServerStandardBib/SecurityClient.cs

@@ -333,6 +333,9 @@ static void operation_authenticate(Operation op, int envIndex, DateTime timeStam
                         if (authServerEndPoint != null && authServerCertificate != null && clientCertificate != null
                             && accessToken != null)
                         {
+                            if (accessToken.Value == null)
+                                accessToken.Value = "";
+
                             if (accessToken.Value != "")
                             {
                                 bool valid = true;

src/docker/Dockerfile-AasxServerBlazor

@@ -8,7 +8,8 @@ COPY ./LICENSE.TXT /repo/LICENSE.txt
 RUN dotnet publish -c Release -o /out/AasxServerBlazor AasxServerBlazor
 
 FROM mcr.microsoft.com/dotnet/aspnet:6.0 as base
-RUN apt-get update && apt-get install -y libgdiplus
+RUN apt update && apt upgrade --yes
+RUN apt install -y curl nano libgdiplus
 EXPOSE 5001
 COPY --from=build-env /out/AasxServerBlazor/ /AasxServerBlazor/
 COPY ./content-for-demo/ /AasxServerBlazor/