Fix URL replace

Freezor · Jun 6, 2024 · d8889fa · d8889fa
1 parent 48b30a5
commit d8889fa
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/src/AasxServerBlazor/Shared/MainLayout.razor b/src/AasxServerBlazor/Shared/MainLayout.razor
@@ -322,7 +322,7 @@
                         if (replace != "")
                             registryURL = replace;
                     }
-                    link += registryURL;
+                    link += "&registryURL=" + registryURL;
                 }
 
                 queryPara = "";

diff --git a/src/IO.Swagger.Registry.Lib.V3/Services/RegistryInitializerService.cs b/src/IO.Swagger.Registry.Lib.V3/Services/RegistryInitializerService.cs
@@ -203,6 +203,16 @@ public void InitRegistry(List<AasxCredentialsEntry> cList, DateTime timestamp, b
 
                         // basyx with Submodel Registry: read submodel descriptors
                         string requestPath = submodelRegistryUrl + "/submodel-descriptors";
+                        string queryPara = "";
+                        string userPW = "";
+                        string urlEdcWrapper = "";
+                        string replace = "";
+
+                        if (AasxCredentials.get(cs.credentials, requestPath, out queryPara, out userPW, out urlEdcWrapper, out replace))
+                        {
+                            if (replace != "")
+                                requestPath = replace;
+                        }
 
                         var handler = new HttpClientHandler();
 
@@ -279,6 +289,16 @@ public void InitRegistry(List<AasxCredentialsEntry> cList, DateTime timestamp, b
                         string accessToken = null;
                         //string requestPath = greg + "/" + "registry/shell-descriptors";
                         string requestPath = greg + "/shell-descriptors";
+                        string queryPara = "";
+                        string userPW = "";
+                        string urlEdcWrapper = "";
+                        string replace = "";
+
+                        if (AasxCredentials.get(cs.credentials, requestPath, out queryPara, out userPW, out urlEdcWrapper, out replace))
+                        {
+                            if (replace != "")
+                                requestPath = replace;
+                        }
 
                         var handler = new HttpClientHandler();
 
@@ -422,10 +442,10 @@ public void InitRegistry(List<AasxCredentialsEntry> cList, DateTime timestamp, b
                                         }
                                     }
                                     requestPath = endpoint;
-                                    string queryPara = "";
-                                    string userPW = "";
-                                    string urlEdcWrapper = "";
-                                    string replace = "";
+                                    queryPara = "";
+                                    userPW = "";
+                                    urlEdcWrapper = "";
+                                    replace = "";
                                     client.DefaultRequestHeaders.Clear();
                                     if (AasxCredentials.get(cList, requestPath, out queryPara, out userPW, out urlEdcWrapper, out replace))
                                     {