Common static server address : Fix #424

COMET.Web.Common.Tests/Components/IndexComponentTestFixture.cs

@@ -40,6 +40,7 @@ namespace COMET.Web.Common.Tests.Components
     using COMET.Web.Common.Model;
     using COMET.Web.Common.Services.ConfigurationService;
     using COMET.Web.Common.Services.RegistrationService;
+    using COMET.Web.Common.Services.ServerConnectionService;
     using COMET.Web.Common.Services.SessionManagement;
     using COMET.Web.Common.Services.VersionService;
     using COMET.Web.Common.Test.Helpers;
@@ -66,6 +67,7 @@ public void Setup()
             this.context = new TestContext();
             this.versionService = new Mock<IVersionService>();
             this.sessionService = new Mock<ISessionService>();
+            this.serverConnectionService = new Mock<IServerConnectionService>();
             this.sourceList = new SourceList<Iteration>();
             this.sessionService.Setup(x => x.OpenIterations).Returns(this.sourceList);
 
@@ -79,6 +81,7 @@ public void Setup()
             this.context.Services.AddSingleton(this.authenticationService.Object);
             this.context.Services.AddSingleton(this.sessionService.Object);
             this.context.Services.AddSingleton(this.versionService.Object);
+            this.context.Services.AddSingleton(this.serverConnectionService.Object);
             this.context.Services.AddSingleton<ILoginViewModel, LoginViewModel>();
             this.context.Services.AddSingleton<IOpenModelViewModel, OpenModelViewModel>();
             this.context.Services.AddSingleton(this.registrationService.Object);
@@ -100,6 +103,7 @@ public void Teardown()
         private TestContext context;
         private Mock<IVersionService> versionService;
         private Mock<ISessionService> sessionService;
+        private Mock<IServerConnectionService> serverConnectionService;
         private Mock<IAuthenticationService> authenticationService;
         private TestAuthorizationContext authorization;
         private SourceList<Iteration> sourceList;

COMET.Web.Common.Tests/Components/LoginTestFixture.cs

@@ -30,6 +30,7 @@ namespace COMET.Web.Common.Tests.Components
     using COMET.Web.Common.Components;
     using COMET.Web.Common.Enumerations;
     using COMET.Web.Common.Model.DTO;
+    using COMET.Web.Common.Services.ServerConnectionService;
     using COMET.Web.Common.Services.SessionManagement;
     using COMET.Web.Common.Test.Helpers;
     using COMET.Web.Common.ViewModels.Components;
@@ -49,13 +50,16 @@ public class LoginTestFixture
         private ILoginViewModel viewModel;
         private TestContext context;
         private Mock<IAuthenticationService> authenticationService;
+        private Mock<IServerConnectionService> serverConnectionService;
 
         [SetUp]
         public void Setup()
         {
             this.authenticationService = new Mock<IAuthenticationService>();
+            this.serverConnectionService = new Mock<IServerConnectionService>();
+            this.serverConnectionService.Setup(x => x.ServerAddress).Returns("http://localhost.com");
             this.context = new TestContext();
-            this.viewModel = new LoginViewModel(this.authenticationService.Object);
+            this.viewModel = new LoginViewModel(this.authenticationService.Object, this.serverConnectionService.Object);
             this.context.Services.AddSingleton(this.viewModel);
             this.context.ConfigureDevExpressBlazor();
         }

COMET.Web.Common.Tests/Components/SingleIterationApplicationTemplateTestFixture.cs

@@ -37,7 +37,8 @@ namespace COMET.Web.Common.Tests.Components
     using COMET.Web.Common.Components.Selectors;
     using COMET.Web.Common.Extensions;
     using COMET.Web.Common.Services.ConfigurationService;
-    using COMET.Web.Common.Services.SessionManagement;
+	using COMET.Web.Common.Services.ServerConnectionService;
+	using COMET.Web.Common.Services.SessionManagement;
     using COMET.Web.Common.Test.Helpers;
     using COMET.Web.Common.ViewModels.Components;
     using COMET.Web.Common.ViewModels.Components.Selectors;
@@ -75,6 +76,7 @@ public void Setup()
             this.viewModel.Setup(x => x.SessionService).Returns(sessionService.Object);
             this.context.Services.AddSingleton(this.viewModel.Object);
             this.context.Services.AddSingleton<IOpenModelViewModel, OpenModelViewModel>();
+            this.context.Services.AddSingleton<IServerConnectionService, ServerConnectionService>();
             this.context.Services.AddSingleton(new Mock<IConfigurationService>().Object);
             this.context.Services.AddSingleton(sessionService.Object);
             this.context.ConfigureDevExpressBlazor();

COMET.Web.Common.Tests/Services/ServerConnectionService/ServerConnectionServiceTestFixture.cs

@@ -0,0 +1,143 @@
+// --------------------------------------------------------------------------------------------------------------------
+//  <copyright file="ServerConnectionServiceTestFixture.cs" company="RHEA System S.A.">
+//    Copyright (c) 2023 RHEA System S.A.
+// 
+//    Authors: Sam Gerené, Alex Vorobiev, Alexander van Delft, Jaime Bernar, Théate Antoine, Nabil Abbar
+// 
+//    This file is part of COMET WEB Community Edition
+//    The COMET WEB Community Edition is the RHEA Web Application implementation of ECSS-E-TM-10-25
+//    Annex A and Annex C.
+// 
+//    Licensed under the Apache License, Version 2.0 (the "License");
+//    you may not use this file except in compliance with the License.
+//    You may obtain a copy of the License at
+// 
+//        http://www.apache.org/licenses/LICENSE-2.0
+// 
+//    Unless required by applicable law or agreed to in writing, software
+//    distributed under the License is distributed on an "AS IS" BASIS,
+//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//    See the License for the specific language governing permissions and
+//    limitations under the License.
+// 
+//  </copyright>
+//  --------------------------------------------------------------------------------------------------------------------
+namespace COMET.Web.Common.Tests.Services.ServerConnectionService
+{
+    using System.Net;
+
+    using COMET.Web.Common.Model;
+    using COMET.Web.Common.Services.ServerConnectionService;
+
+    using Microsoft.Extensions.Options;
+
+    using Moq;
+    using Moq.Protected;
+
+    using NUnit.Framework;
+
+    [TestFixture]
+    public class ServerConnectionServiceTestFixture
+    {
+        private IServerConnectionService serverConnectionService;
+
+        [Test]
+        public async Task VerifyService()
+        {
+            var globalOptions = new GlobalOptions
+            {
+                ServerConfigurationFile = null,
+            };
+
+            var options = new Mock<IOptions<GlobalOptions>>();
+            options.Setup(x => x.Value).Returns(globalOptions);
+
+            var handlerMock = new Mock<HttpMessageHandler>();
+
+            var json = """ 
+                        {
+                            "ServerAddress": "http://localhost:5000/"
+                        }
+                        """;
+
+            handlerMock
+                .Protected()
+                .Setup<Task<HttpResponseMessage>>(
+                    "SendAsync",
+                    ItExpr.IsAny<HttpRequestMessage>(),
+                    ItExpr.IsAny<CancellationToken>()
+                )
+                .ReturnsAsync(new HttpResponseMessage
+                {
+                    StatusCode = HttpStatusCode.OK,
+                    Content = new StringContent(json)
+                })
+                .Verifiable();
+
+            var httpClient = new HttpClient(handlerMock.Object)
+            {
+                BaseAddress = new Uri("http://localhost")
+            };
+
+            this.serverConnectionService = new ServerConnectionService(options.Object, httpClient);
+
+            Assert.That(this.serverConnectionService, Is.Not.Null);
+
+            await this.serverConnectionService.InitializeService();
+
+            Assert.Multiple(() =>
+            {
+                Assert.That(this.serverConnectionService.ServerAddress, Is.Not.Null);
+                Assert.That(this.serverConnectionService.ServerAddress, Is.EqualTo("http://localhost:5000/"));	
+            });
+
+			handlerMock
+				.Protected()
+				.Setup<Task<HttpResponseMessage>>(
+					"SendAsync",
+					ItExpr.IsAny<HttpRequestMessage>(),
+					ItExpr.IsAny<CancellationToken>()
+				)
+				.ReturnsAsync(new HttpResponseMessage
+				{
+					StatusCode = HttpStatusCode.NotFound,
+				})
+				.Verifiable();
+
+			httpClient = new HttpClient(handlerMock.Object)
+			{
+				BaseAddress = new Uri("http://localhost")
+			};
+
+			serverConnectionService = new ServerConnectionService(options.Object, httpClient);
+
+			await this.serverConnectionService.InitializeService();
+
+			Assert.That(this.serverConnectionService.ServerAddress, Is.Null);
+
+			handlerMock
+				.Protected()
+				.Setup<Task<HttpResponseMessage>>(
+					"SendAsync",
+					ItExpr.IsAny<HttpRequestMessage>(),
+					ItExpr.IsAny<CancellationToken>()
+				)
+				.ReturnsAsync(new HttpResponseMessage
+				{
+					StatusCode = HttpStatusCode.BadRequest,
+				})
+				.Verifiable();
+
+			httpClient = new HttpClient(handlerMock.Object)
+			{
+				BaseAddress = new Uri("http://localhost")
+			};
+
+			serverConnectionService = new ServerConnectionService(options.Object, httpClient);
+
+			await this.serverConnectionService.InitializeService();
+
+			Assert.That(this.serverConnectionService.ServerAddress, Is.Null);
+		}
+	}
+}

COMET.Web.Common.Tests/ViewModels/Components/SingleIterationApplicationTemplateViewModelTestFixture.cs

@@ -26,9 +26,9 @@
 namespace COMET.Web.Common.Tests.ViewModels.Components
 {
     using CDP4Common.EngineeringModelData;
-	using CDP4Common.SiteDirectoryData;
+    using CDP4Common.SiteDirectoryData;
 
-	using COMET.Web.Common.Services.SessionManagement;
+    using COMET.Web.Common.Services.SessionManagement;
     using COMET.Web.Common.ViewModels.Components;
     using COMET.Web.Common.ViewModels.Components.Selectors;
 
@@ -98,9 +98,9 @@ public void VerifySelectIteration()
                     Iid = Guid.NewGuid(),
                     IterationSetup = new IterationSetup(Guid.NewGuid(), null, null)
                     {
-						IterationNumber = 1,
+                        IterationNumber = 1,
                         Container = new EngineeringModelSetup(Guid.NewGuid(), null, null)
-					}
+                    }
                 },
                 new ()
                 {

COMET.Web.Common/COMET.Web.Common.csproj

@@ -47,5 +47,8 @@
       <Content Update="wwwroot\DefaultTextConfiguration.json">
         <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       </Content>
+      <Content Update="wwwroot\server_configuration.json">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      </Content>
     </ItemGroup>
 </Project>

COMET.Web.Common/Components/Login.razor

@@ -25,14 +25,17 @@
 <EditForm Context="editFormContext" Model="@(this.ViewModel.AuthenticationDto)" OnValidSubmit="this.ExecuteLogin">
 	<DataAnnotationsValidator/>
 	<DxFormLayout CaptionPosition="CaptionPosition.Vertical">
-		<DxFormLayoutItem Caption="Source Address:" ColSpanLg="12">
-			<Template>
-				<DxTextBox Id="sourceaddress" @bind-Text="@(this.ViewModel.AuthenticationDto.SourceAddress)"
-				           ClearButtonDisplayMode="DataEditorClearButtonDisplayMode.Auto"
-				           NullText="Enter the url for the server"
-				           Enabled="@string.IsNullOrEmpty(this.RequestedServer)"/>
-			</Template>
-		</DxFormLayoutItem>
+		@if (string.IsNullOrEmpty(this.ViewModel.serverConnectionService.ServerAddress))
+		{
+			<DxFormLayoutItem Caption="Source Address:" ColSpanLg="12">
+				<Template>
+					<DxTextBox Id="sourceaddress" @bind-Text="@(this.ViewModel.AuthenticationDto.SourceAddress)"
+							   ClearButtonDisplayMode="DataEditorClearButtonDisplayMode.Auto"
+							   NullText="Enter the url for the server"
+							   Enabled="@string.IsNullOrEmpty(this.RequestedServer)" />
+				</Template>
+			</DxFormLayoutItem>
+		}
 		<DxFormLayoutItem Caption="UserName:" BeginRow="true" ColSpanLg="12">
 			<Template>
 				<DxTextBox Id="username" @bind-Text="@(this.ViewModel.AuthenticationDto.UserName)"

COMET.Web.Common/Components/Login.razor.cs

@@ -26,6 +26,7 @@
 namespace COMET.Web.Common.Components
 {
     using COMET.Web.Common.Enumerations;
+    using COMET.Web.Common.Services.ServerConnectionService;
     using COMET.Web.Common.ViewModels.Components;
 
     using Microsoft.AspNetCore.Components;