Merge pull request #178 from TechnologyEnhancedLearning/RC

Merge RC  to master

Author: AnjuJose011

Auth/LearningHub.Nhs.Auth.Tests/LearningHub.Nhs.Auth.Tests.csproj

@@ -9,7 +9,7 @@
 
 
   <ItemGroup>
-    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+    <PackageReference Include="elfhHub.Nhs.Models" Version="3.0.10" />
     <PackageReference Include="LearningHub.Nhs.Models" Version="3.0.33" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="17.12.0" />

Auth/LearningHub.Nhs.Auth/Configuration/ServiceMappings.cs

@@ -40,12 +40,22 @@ public static void AddServiceMappings(this IServiceCollection services, IConfigu
                             ServerCertificateCustomValidationCallback =
                                           HttpClientHandler.DangerousAcceptAnyServerCertificateValidator,
                         });
+
+                services.AddHttpClient<IMoodleHttpClient, MoodleHttpClient>()
+                    .ConfigurePrimaryHttpMessageHandler(
+                        () => new HttpClientHandler
+                        {
+                            ServerCertificateCustomValidationCallback =
+                                          HttpClientHandler.DangerousAcceptAnyServerCertificateValidator,
+                        });
             }
             else
             {
                 services.AddHttpClient<IUserApiHttpClient, UserApiHttpClient>();
+                services.AddHttpClient<IMoodleHttpClient, MoodleHttpClient>();
             }
 
+            services.AddScoped<IMoodleApiService, MoodleApiService>();
             services.AddDistributedMemoryCache();
             services.AddScoped<IExternalSystemService, ExternalSystemService>();
             services.AddTransient<IRegistrationService, RegistrationService>();

Auth/LearningHub.Nhs.Auth/Configuration/WebSettings.cs

@@ -61,5 +61,10 @@ public class WebSettings
         /// Gets or sets a value indicating whether IsPasswordUpdate.
         /// </summary>
         public bool IsPasswordUpdate { get; set; }
-  }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether gets or sets a value to Enable Moodle.
+        /// </summary>
+        public bool EnableMoodle { get; set; }
+    }
 }

Auth/LearningHub.Nhs.Auth/Controllers/AccountController.cs

@@ -5,6 +5,7 @@
     using System.Linq;
     using System.Net;
     using System.Threading.Tasks;
+    using Azure.Core;
     using elfhHub.Nhs.Models.Common;
     using elfhHub.Nhs.Models.Enums;
     using IdentityModel;
@@ -22,9 +23,11 @@
     using LearningHub.Nhs.Models.Common;
     using Microsoft.AspNetCore.Authentication;
     using Microsoft.AspNetCore.Authorization;
+    using Microsoft.AspNetCore.Http;
     using Microsoft.AspNetCore.Mvc;
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Options;
+    using UAParser;
 
     /// <summary>
     /// Account Controller operations.
@@ -163,34 +166,44 @@ await this.interaction.GrantConsentAsync(
 
                 if (loginResult.IsAuthenticated)
                 {
-                    await this.SignInUser(userId, model.Username.Trim(), model.RememberLogin, context.Parameters["ext_referer"]);
-
-                    if (context != null)
+                    var uaParser = Parser.GetDefault();
+                    var clientInfo = uaParser.Parse(this.Request.Headers["User-Agent"]);
+                    var result = await this.UserService.CheckUserHasAnActiveSessionAsync(userId);
+                    if (result.Items.Count == 0 || result.Items[0].BrowserName == clientInfo.UA.Family)
                     {
-                        if (await this.ClientStore.IsPkceClientAsync(context.Client.ClientId))
+                        await this.SignInUser(userId, model.Username.Trim(), model.RememberLogin, context.Parameters["ext_referer"]);
+
+                        if (context != null)
                         {
-                            // if the client is PKCE then we assume it's native, so this change in how to
-                            // return the response is for better UX for the end user.
-                            return this.View("Redirect", new RedirectViewModel { RedirectUrl = model.ReturnUrl });
+                            if (await this.ClientStore.IsPkceClientAsync(context.Client.ClientId))
+                            {
+                                // if the client is PKCE then we assume it's native, so this change in how to
+                                // return the response is for better UX for the end user.
+                                return this.View("Redirect", new RedirectViewModel { RedirectUrl = model.ReturnUrl });
+                            }
+
+                            // we can trust model.ReturnUrl since GetAuthorizationContextAsync returned non-null
+                            return this.Redirect(model.ReturnUrl);
                         }
 
-                        // we can trust model.ReturnUrl since GetAuthorizationContextAsync returned non-null
-                        return this.Redirect(model.ReturnUrl);
-                    }
-
-                    // request for a local page
-                    if (this.Url.IsLocalUrl(model.ReturnUrl))
-                    {
-                        return this.Redirect(model.ReturnUrl);
-                    }
-                    else if (string.IsNullOrEmpty(model.ReturnUrl))
-                    {
-                        return this.Redirect("~/");
+                        // request for a local page
+                        if (this.Url.IsLocalUrl(model.ReturnUrl))
+                        {
+                            return this.Redirect(model.ReturnUrl);
+                        }
+                        else if (string.IsNullOrEmpty(model.ReturnUrl))
+                        {
+                            return this.Redirect("~/");
+                        }
+                        else
+                        {
+                            // user might have clicked on a malicious link - should be logged
+                            throw new Exception("invalid return URL");
+                        }
                     }
                     else
                     {
-                        // user might have clicked on a malicious link - should be logged
-                        throw new Exception("invalid return URL");
+                        return this.View("AlreadyActiveSession");
                     }
                 }
                 else if (userId > 0)

Auth/LearningHub.Nhs.Auth/Interfaces/IMoodleApiService.cs

@@ -0,0 +1,17 @@
+namespace LearningHub.Nhs.Auth.Interfaces
+{
+    using System.Threading.Tasks;
+
+    /// <summary>
+    /// IMoodleApiService.
+    /// </summary>
+    public interface IMoodleApiService
+    {
+        /// <summary>
+        /// GetResourcesAsync.
+        /// </summary>
+        /// <param name="currentUserId">The current User Id.</param>
+        /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
+        Task<int> GetMoodleUserIdByUsernameAsync(int currentUserId);
+    }
+}

Auth/LearningHub.Nhs.Auth/Interfaces/IMoodleHttpClient.cs

@@ -0,0 +1,23 @@
+namespace LearningHub.Nhs.Auth.Interfaces
+{
+    using System.Net.Http;
+    using System.Threading.Tasks;
+
+    /// <summary>
+    /// The Moodle Http Client interface.
+    /// </summary>
+    public interface IMoodleHttpClient
+    {
+        /// <summary>
+        /// The get cient async.
+        /// </summary>
+        /// <returns>The <see cref="Task"/>.</returns>
+        Task<HttpClient> GetClient();
+
+        /// <summary>
+        /// GetDefaultParameters.
+        /// </summary>
+        /// <returns>defaultParameters.</returns>
+        string GetDefaultParameters();
+    }
+}

Auth/LearningHub.Nhs.Auth/Interfaces/IUserService.cs

@@ -114,6 +114,13 @@ public interface IUserService
         /// </returns>
         Task StoreUserHistoryAsync(UserHistoryViewModel userHistory);
 
+        /// <summary>
+        /// check user has an laredy active session.
+        /// </summary>
+        /// <param name="userId">The userId.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        Task<PagedResultSet<UserHistoryViewModel>> CheckUserHasAnActiveSessionAsync(int userId);
+
         /// <summary>
         /// The store user history async.
         /// </summary>

Auth/LearningHub.Nhs.Auth/LearningHub.Nhs.Auth.csproj

@@ -101,7 +101,7 @@
 		<PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.4.0" />
 		<PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.3.0" />
 		<PackageReference Include="Azure.Identity" Version="1.13.2" />
-		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.8" />
+		<PackageReference Include="elfhHub.Nhs.Models" Version="3.0.10" />
 		<PackageReference Include="FluentValidation" Version="11.11.0" />
 		<PackageReference Include="IdentityServer4" Version="4.1.2" />
 		<PackageReference Include="IdentityServer4.Contrib.RedisStore" Version="4.0.0" />

Auth/LearningHub.Nhs.Auth/Models/MoodleUserResponseViewModel.cs

@@ -0,0 +1,121 @@
+namespace LearningHub.Nhs.Auth.Models
+{
+    using System.Collections.Generic;
+
+    /// <summary>
+    /// MoodleUserResponseViewModel.
+    /// </summary>
+    public class MoodleUserResponseViewModel
+    {
+        /// <summary>
+        /// Gets or sets the list of users.
+        /// </summary>
+        public List<MoodleUser> Users { get; set; }
+
+        /// <summary>
+        /// Gets or sets the warnings.
+        /// </summary>
+        public List<object> Warnings { get; set; }
+
+        /// <summary>
+        /// MoodleUser.
+        /// </summary>
+        public class MoodleUser
+        {
+            /// <summary>
+            /// Gets or sets the user ID.
+            /// </summary>
+            public int Id { get; set; }
+
+            /// <summary>
+            /// Gets or sets the username.
+            /// </summary>
+            public string Username { get; set; }
+
+            /// <summary>
+            /// Gets or sets the first name.
+            /// </summary>
+            public string FirstName { get; set; }
+
+            /// <summary>
+            /// Gets or sets the last name.
+            /// </summary>
+            public string LastName { get; set; }
+
+            /// <summary>
+            /// Gets or sets the full name.
+            /// </summary>
+            public string FullName { get; set; }
+
+            /// <summary>
+            /// Gets or sets the email.
+            /// </summary>
+            public string Email { get; set; }
+
+            /// <summary>
+            /// Gets or sets the department.
+            /// </summary>
+            public string Department { get; set; }
+
+            /// <summary>
+            /// Gets or sets the first access timestamp.
+            /// </summary>
+            public long FirstAccess { get; set; }
+
+            /// <summary>
+            /// Gets or sets the last access timestamp.
+            /// </summary>
+            public long LastAccess { get; set; }
+
+            /// <summary>
+            /// Gets or sets the authentication method.
+            /// </summary>
+            public string Auth { get; set; }
+
+            /// <summary>
+            /// Gets or sets a value indicating whether the user is suspended.
+            /// </summary>
+            public bool Suspended { get; set; }
+
+            /// <summary>
+            /// Gets or sets a value indicating whether the user is confirmed.
+            /// </summary>
+            public bool Confirmed { get; set; }
+
+            /// <summary>
+            /// Gets or sets the language.
+            /// </summary>
+            public string Lang { get; set; }
+
+            /// <summary>
+            /// Gets or sets the theme.
+            /// </summary>
+            public string Theme { get; set; }
+
+            /// <summary>
+            /// Gets or sets the timezone.
+            /// </summary>
+            public string Timezone { get; set; }
+
+            /// <summary>
+            /// Gets or sets the mail format.
+            /// </summary>
+            public int MailFormat { get; set; }
+
+            /// <summary>
+            /// Gets or sets the forum tracking preference.
+            /// </summary>
+            public int TrackForums { get; set; }
+
+            /// <summary>
+            /// Gets or sets the small profile image URL.
+            /// </summary>
+            public string ProfileImageUrlSmall { get; set; }
+
+            /// <summary>
+            /// Gets or sets the profile image URL.
+            /// </summary>
+            public string ProfileImageUrl { get; set; }
+        }
+    }
+}

Auth/LearningHub.Nhs.Auth/NLog.config

@@ -39,6 +39,10 @@
   </targets>
 
   <rules>
+
+	 <!-- Block all IdentityServer4 logs from being processed by later rules (like DB) -->
+	 <logger name="IdentityServer4.*" final="true" />
+	  
     <!--<logger name="*" minlevel="Trace" writeTo="logfile" />-->
     <logger name="*" minlevel="Error" writeTo="database" />
   </rules>