fix: added a parameter required for the protocol

Author: KirillBorisovich

HwProj.APIGateway/HwProj.APIGateway.API/Lti/Controllers/JwksController.cs

@@ -36,19 +36,20 @@ public IActionResult GetJwks()
 
         var publicParams = rsa.ExportParameters(false);
 
-        var securityKey = new RsaSecurityKey(publicParams)
-        {
-            KeyId = keyConfig.KeyId
-        };
-
-        var jwk = JsonWebKeyConverter.ConvertFromRSASecurityKey(securityKey);
-
-        jwk.Use = "sig";
-        jwk.Alg = "RS256";
-
         var jwks = new
         {
-            keys = new[] { jwk }
+            keys = new[]
+            {
+                new
+                {
+                    kty = "RSA",
+                    e = Base64UrlEncoder.Encode(publicParams.Exponent),
+                    n = Base64UrlEncoder.Encode(publicParams.Modulus),
+                    kid = keyConfig.KeyId,
+                    alg = "RS256",
+                    use = "sig"
+                }
+            }
         };
 
         return Ok(jwks);

HwProj.APIGateway/HwProj.APIGateway.API/Lti/Controllers/LtiAuthController.cs

@@ -83,7 +83,7 @@ public async Task<IActionResult> AuthorizeLti(
                     clientId: clientId,
                     toolId: payload.ToolId,
                     courseId: payload.CourseId,
-                    targetLinkUri: tool.DeepLink,
+                    targetLinkUri: redirectUri,
                     userId:  payload.UserId,
                     nonce: nonce
                 );
@@ -93,7 +93,8 @@ public async Task<IActionResult> AuthorizeLti(
                     clientId: clientId,
                     toolId: payload.ToolId,
                     courseId: payload.CourseId,
-                    targetLinkUri: tool.LaunchUrl,
+                    targetLinkUri: redirectUri,
+                    ltiCustomParams: payload.Custom,
                     userId: payload.UserId,
                     nonce: nonce,
                     resourceLinkId: payload.ResourceLinkId!);
@@ -124,6 +125,7 @@ public async Task<IActionResult> StartLti(
         [FromQuery] string? courseId,
         [FromQuery] string? toolId,
         [FromQuery] string? ltiLaunchUrl,
+        [FromQuery] string? ltiCustomParams,
         [FromQuery] bool isDeepLink = false)
     {
         var userId = User.FindFirstValue("_id");
@@ -181,7 +183,8 @@ public async Task<IActionResult> StartLti(
                 UserId = userId,
                 CourseId = courseId,
                 ToolId = toolId,
-                ResourceLinkId = resourceLinkId
+                ResourceLinkId = resourceLinkId,
+                Custom =  ltiCustomParams
             };
         }
         else
@@ -254,5 +257,6 @@ private class LtiHintPayload
         public string? ResourceLinkId { get; set; }
         public string? CourseId { get; set; }
         public string? ToolId { get; set; }
+        public string? Custom { get; set; }
     }
 }

HwProj.APIGateway/HwProj.APIGateway.API/Lti/Controllers/LtiDeepLinkingReturnController.cs

@@ -39,7 +39,7 @@ public async Task<IActionResult> OnDeepLinkingReturnAsync([FromForm] IFormCollec
         }
 
         var unverifiedToken = handler.ReadJwtToken(tokenString);
-        var clientId = unverifiedToken.Subject;
+        var clientId = unverifiedToken.Issuer;
 
         var tool = await toolService.GetByClientIdAsync(clientId);
         if (tool == null)

HwProj.APIGateway/HwProj.APIGateway.API/Lti/Services/ILtiTokenService.cs

@@ -18,6 +18,7 @@ public string CreateResourceLinkToken(
         string toolId,
         string courseId,
         string targetLinkUri,
+        string? ltiCustomParams,
         string userId,
         string nonce,
         string resourceLinkId);

HwProj.APIGateway/HwProj.APIGateway.API/Lti/Services/LtiTokenService.cs

@@ -3,6 +3,7 @@
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 using System.Security.Cryptography;
+using System.Text.Json;
 using HwProj.APIGateway.API.Lti.Models;
 using HwProj.APIGateway.API.LTI.Services;
 using LtiAdvantage.DeepLinking;
@@ -57,6 +58,7 @@ public string CreateResourceLinkToken(
         string toolId,
         string courseId,
         string targetLinkUri,
+        string? ltiCustomParams,
         string userId,
         string nonce,
         string resourceLinkId)
@@ -93,6 +95,21 @@ public string CreateResourceLinkToken(
             }
         };
 
+        if (string.IsNullOrEmpty(ltiCustomParams))
+        {
+            request.Custom = new Dictionary<string, string>();
+            return this.CreateJwt(clientId, request);
+        }
+
+        try
+        {
+            request.Custom = JsonSerializer.Deserialize<Dictionary<string, string>>(ltiCustomParams);
+        }
+        catch (JsonException)
+        {
+            request.Custom = new Dictionary<string, string>();
+        }
+
         return this.CreateJwt(clientId, request);
     }
 

HwProj.AuthService/HwProj.AuthService.API/appsettings.json

@@ -29,8 +29,8 @@
   },
   "EventBus": {
     "EventBusHostName": "localhost",
-    "EventBusUserName": "guest",
-    "EventBusPassword": "guest",
+    "EventBusUserName": "user",
+    "EventBusPassword": "password",
     "EventBusVirtualHost": "/",
     "EventBusQueueName": "AuthService",
     "EventBusRetryCount": "5"

HwProj.Common/HwProj.Models/CoursesService/ViewModels/HomeworkTaskViewModels.cs

@@ -37,7 +37,7 @@ public class HomeworkTaskViewModel
         public bool IsDeferred { get; set; }
 
         [JsonProperty]
-        public string? LtiLaunchUrl { get; set; } 
+        public LtiLaunchData?  LtiLaunchData { get; set; }
     }
 
     public class HomeworkTaskForEditingViewModel
@@ -67,6 +67,12 @@ public class CreateTaskViewModel
 
         public ActionOptions? ActionOptions { get; set; }
 
-        public string? LtiLaunchUrl { get; set; }
+        public LtiLaunchData?  LtiLaunchData { get; set; }
+    }
+
+    public class LtiLaunchData
+    {
+        public string LtiLaunchUrl { get; set; }
+        public string? CustomParams { get; set; }
     }
 }

HwProj.CoursesService/HwProj.CoursesService.API/Controllers/HomeworksController.cs

@@ -89,13 +89,13 @@ private async Task FillLtiUrls(HomeworkViewModel viewModel)
             if (viewModel.Tasks != null && viewModel.Tasks.Any())
             {
                 var taskIds = viewModel.Tasks.Select(t => t.Id).ToArray();
-                var ltiUrls = await _tasksService.GetLtiUrlsForTasksAsync(taskIds);
+                var ltilaunchMultipleData = await _tasksService.GetLtiDataForTasksAsync(taskIds);
 
                 foreach (var task in viewModel.Tasks)
                 {
-                    if (ltiUrls.TryGetValue(task.Id, out var url))
+                    if (ltilaunchMultipleData.TryGetValue(task.Id, out var ltiLaunchData))
                     {
-                        task.LtiLaunchUrl = url;
+                        task.LtiLaunchData = ltiLaunchData.ToLtiLaunchData();
                     }
                 }
             }

HwProj.CoursesService/HwProj.CoursesService.API/Controllers/TasksController.cs

@@ -48,7 +48,9 @@ public async Task<IActionResult> GetTask(long taskId)
             var task = taskFromDb.ToHomeworkTaskViewModel();
 
 
-            task.LtiLaunchUrl = await _tasksService.GetTaskLtiUrlAsync(taskId);
+            var ltiLaunchData = await _tasksService.GetTaskLtiDataAsync(taskId);
+            task.LtiLaunchData = ltiLaunchData.ToLtiLaunchData();
+
             return Ok(task);
         }
 
@@ -78,7 +80,7 @@ public async Task<IActionResult> AddTask(long homeworkId, [FromBody] CreateTaskV
             var task = await _tasksService.AddTaskAsync(
                 homeworkId, 
                 taskViewModel.ToHomeworkTask(), 
-                taskViewModel.LtiLaunchUrl
+                taskViewModel.LtiLaunchData.ToLtiLaunchData()
             );
 
             return Ok(task);
@@ -105,7 +107,7 @@ public async Task<IActionResult> UpdateTask(long taskId, [FromBody] CreateTaskVi
                 taskId, 
                 taskViewModel.ToHomeworkTask(),
                 taskViewModel.ActionOptions ?? ActionOptions.Default,
-                taskViewModel.LtiLaunchUrl
+                taskViewModel.LtiLaunchData.ToLtiLaunchData()
             );
 
             return Ok(updatedTask.ToHomeworkTaskViewModel());

HwProj.CoursesService/HwProj.CoursesService.API/Domains/MappingExtensions.cs

@@ -169,7 +169,12 @@ public static HomeworkTaskTemplate ToHomeworkTaskTemplate(this HomeworkTaskViewM
                 IsDeadlineStrict = task.IsDeadlineStrict,
                 HasSpecialPublicationDate = task.PublicationDate != null,
                 HasSpecialDeadlineDate = task.DeadlineDate != null,
-                LtiLaunchUrl = task.LtiLaunchUrl
+                LtiLaunchData = task.LtiLaunchData == null ? null :
+                    new LtiLaunchData
+                    {
+                        LtiLaunchUrl =  task.LtiLaunchData.LtiLaunchUrl,
+                        CustomParams =  task.LtiLaunchData.CustomParams
+                    }
             };
 
         public static Course ToCourse(this CourseTemplate courseTemplate)
@@ -205,5 +210,23 @@ public static HomeworkTask ToHomeworkTask(this HomeworkTaskTemplate taskTemplate
                 PublicationDate = taskTemplate.HasSpecialPublicationDate ? DateToOverride : (DateTime?)null,
                 DeadlineDate = taskTemplate.HasSpecialDeadlineDate ? DateToOverride : (DateTime?)null,
             };
+
+        public static LtiLaunchData? ToLtiLaunchData(
+            this HwProj.Models.CoursesService.ViewModels.LtiLaunchData? ltiLaunchData)
+            => ltiLaunchData == null ? null :
+                new LtiLaunchData
+            {
+                LtiLaunchUrl = ltiLaunchData.LtiLaunchUrl,
+                CustomParams = ltiLaunchData.CustomParams
+            };
+
+        public static HwProj.Models.CoursesService.ViewModels.LtiLaunchData? ToLtiLaunchData(
+             this LtiLaunchData? ltiLaunchData)
+            => ltiLaunchData == null ? null :
+                new HwProj.Models.CoursesService.ViewModels.LtiLaunchData
+            {
+                LtiLaunchUrl = ltiLaunchData.LtiLaunchUrl,
+                CustomParams = ltiLaunchData.CustomParams
+            };
     }
 }