LTI: поддержка протокола LTI 1.3 для интеграции с внешними инструментами.#655
Open
KirillBorisovich wants to merge 23 commits intoInteIIigeNET:masterfrom
Open
LTI: поддержка протокола LTI 1.3 для интеграции с внешними инструментами.#655KirillBorisovich wants to merge 23 commits intoInteIIigeNET:masterfrom
KirillBorisovich wants to merge 23 commits intoInteIIigeNET:masterfrom
Conversation
…askId and ltiTaskId
…porting from an external tool, and also made validating jwt tokens
…pLinkingReturnController, added a check for matching toolId and course.LtiToolId
DedSec256
changed the title
DedSec256
changed the title
DedSec256
reviewed
Mar 7, 2026
| { | ||
| public class HomeworkTaskLtiUrl | ||
| { | ||
| [Key] |
Contributor
There was a problem hiding this comment.
Suggested change
| [Key] | |
| [ForeignKey] |
DedSec256
reviewed
Mar 7, 2026
| [Required] | ||
| public string LtiLaunchUrl { get; set; } | ||
|
|
||
| public string? CustomParams { get; set; } |
DedSec256
reviewed
Mar 7, 2026
| { | ||
| public interface ITasksRepository : ICrudRepository<HomeworkTask, long> | ||
| { | ||
| Task AddLtiUrlAsync(long taskId, LtiLaunchData ltiLaunchData); |
Contributor
There was a problem hiding this comment.
Suggested change
| Task AddLtiUrlAsync(long taskId, LtiLaunchData ltiLaunchData); | |
| Task AddOrUpdateLtiLaunchDataAsync(long taskId, LtiLaunchData ltiLaunchData); |
DedSec256
reviewed
Mar 7, 2026
| return true; | ||
| } | ||
|
|
||
| private async Task FillLtiDataForCourseDtos(IEnumerable<CourseDTO> courses) |
Contributor
There was a problem hiding this comment.
Suggested change
| private async Task FillLtiDataForCourseDtos(IEnumerable<CourseDTO> courses) | |
| private async Task FillNecessaryLtiDataForCourseDtos(params IEnumerable<CourseDTO> courses) |
DedSec256
reviewed
Mar 7, 2026
| var groups = await _groupsRepository.GetGroupsWithGroupMatesByCourse(course.Id).ToArrayAsync(); | ||
| var courseDto = course.ToCourseDto(); | ||
|
|
||
| await FillLtiDataForCourseDtos(new[] { courseDto }); |
Contributor
There was a problem hiding this comment.
Suggested change
| await FillLtiDataForCourseDtos(new[] { courseDto }); | |
| if (courseDto.Lti.... != null) await FillLtiDataForCourseDtos(new[] { courseDto }); |
DedSec256
reviewed
Mar 7, 2026
| var tasksToSave = taskPairs.Select(x => x.NewEntity); | ||
| await _tasksRepository.AddRangeAsync(tasksToSave); | ||
|
|
||
| foreach (var pair in taskPairs) |
DedSec256
reviewed
Mar 7, 2026
| var result = await _courseFilterService.ApplyFiltersToCourses( | ||
| userId, coursesWithValues.Select(c => c.ToCourseDto()).ToArray()); | ||
|
|
||
| await FillLtiDataForCourseDtos(result); |
DedSec256
reviewed
Mar 7, 2026
| return true; | ||
| } | ||
|
|
||
| private async Task FillLtiDataForCourseDtos(IEnumerable<CourseDTO> courses) |
DedSec256
reviewed
Mar 7, 2026
| Task<HomeworkTask> AddTaskAsync(long homeworkId, PostTaskViewModel taskViewModel, LtiLaunchData? ltiLaunchData = null); | ||
| Task DeleteTaskAsync(long taskId); | ||
| Task<HomeworkTask> UpdateTaskAsync(long taskId, PostTaskViewModel taskViewModel, ActionOptions options); | ||
| Task<HomeworkTask> UpdateTaskAsync(long taskId, PostTaskViewModel taskViewModel, ActionOptions options, LtiLaunchData? ltiLaunchData = null); |
Contributor
There was a problem hiding this comment.
Давай LtiLaunchData будет частью PostTaskViewModel, кушать ведь не просит
DedSec256
reviewed
Mar 7, 2026
Comment on lines
+118
to
+126
| public async Task<LtiLaunchData?> GetTaskLtiDataAsync(long taskId) | ||
| { | ||
| return await _tasksRepository.GetLtiDataAsync(taskId); | ||
| } | ||
|
|
||
| public async Task<Dictionary<long, LtiLaunchData>> GetLtiDataForTasksAsync(long[] taskIds) | ||
| { | ||
| return await _tasksRepository.GetLtiDataForTasksAsync(taskIds); | ||
| } |
DedSec256
reviewed
Mar 7, 2026
Comment on lines
+48
to
+50
| var ltiLaunchData = await _tasksService.GetTaskLtiDataAsync(taskId); | ||
| var taskViewModel = task.ToHomeworkTaskViewModel(); | ||
| taskViewModel.LtiLaunchData = ltiLaunchData.ToLtiLaunchData(); |
Contributor
There was a problem hiding this comment.
Должно быть спрятано в сервисе
DedSec256
reviewed
Mar 7, 2026
| var task = await _tasksService.AddTaskAsync( | ||
| homeworkId, | ||
| taskViewModel, | ||
| taskViewModel.LtiLaunchData.ToLtiLaunchData()); |
Contributor
There was a problem hiding this comment.
этот параметр не нужен, давай доставать его изнутри сервиса
DedSec256
reviewed
Mar 7, 2026
Comment on lines
+103
to
+106
| await _tasksService.UpdateTaskAsync(taskId, | ||
| taskViewModel, | ||
| taskViewModel.ActionOptions ?? ActionOptions.Default, | ||
| taskViewModel.LtiLaunchData.ToLtiLaunchData()); |
DedSec256
reviewed
Mar 7, 2026
|
|
||
| const setCurrentState = async () => { | ||
| const course = await ApiSingleton.coursesApi.coursesGetCourseData(+courseId!) | ||
| console.log(course) |
DedSec256
reviewed
Mar 7, 2026
| courseIsLoading: boolean; | ||
|
|
||
| ltiTools: LtiToolDto[]; | ||
| ltiToolId: number | undefined; |
Contributor
There was a problem hiding this comment.
давай, быть может, оперировать названиями?
DedSec256
reviewed
Mar 7, 2026
Comment on lines
+236
to
+264
| {task.ltiLaunchData ? ( | ||
| <LtiLaunchButton | ||
| courseId={courseId} | ||
| toolId={ltiToolId} | ||
| taskId={task.id || 0} | ||
| ltiLaunchData={task.ltiLaunchData} | ||
| /> | ||
| ) : ( | ||
| task.canSendSolution && ( | ||
| <Button | ||
| fullWidth | ||
| size="large" | ||
| variant="contained" | ||
| color={lastSolution ? "secondary" : "primary"} | ||
| onClick={(e) => { | ||
| e.persist() | ||
| setTaskSolutionPage((prevState) => ({ | ||
| ...prevState, | ||
| addSolution: true, | ||
| })) | ||
| }} | ||
| > | ||
| {lastSolution?.state === SolutionState.NUMBER_0 | ||
| ? "Изменить решение" | ||
| : "Добавить решение"} | ||
| </Button> | ||
| ) | ||
| )} | ||
| </Grid> |
DedSec256
reviewed
Mar 7, 2026
Comment on lines
-14
to
+15
| "EventBusUserName": "guest", | ||
| "EventBusPassword": "guest", | ||
| "EventBusUserName": "user", | ||
| "EventBusPassword": "password", |
DedSec256
reviewed
Mar 7, 2026
| await _coursesServiceClient.GetCourseByTask(solution.TaskId); | ||
| var student = await _authServiceClient.GetAccountData(solutionModel.StudentId); | ||
| var studentModel = _mapper.Map<AccountDataDto>(student); | ||
| // _eventBus.Publish(new StudentPassTaskEvent(course, solutionModel, studentModel, task)); |
DedSec256
reviewed
Mar 7, 2026
Comment on lines
+3
to
+19
| public class LtiPlatformConfig | ||
| { | ||
| public string Issuer { get; set; } | ||
| public string OidcAuthorizationEndpoint { get; set; } | ||
| public string DeepLinkReturnUrl { get; set; } | ||
| public string ResourceLinkReturnUrl { get; set; } | ||
| public string AssignmentsGradesEndpoint { get; set; } | ||
| public string AccessTokenUrl { get; set; } | ||
| public string JwksEndpoint { get; set; } | ||
| public LtiSigningKeyConfig SigningKey { get; set; } | ||
| } | ||
|
|
||
| public class LtiSigningKeyConfig | ||
| { | ||
| public string KeyId { get; set; } | ||
| public string PrivateKeyPem { get; set; } | ||
| } No newline at end of file |
Contributor
There was a problem hiding this comment.
в Config, это не модели
DedSec256
reviewed
Mar 7, 2026
| @@ -0,0 +1,19 @@ | |||
| namespace HwProj.APIGateway.API.Lti.Models; | |||
|
|
|||
| public class LtiPlatformConfig | |||
Contributor
There was a problem hiding this comment.
Suggested change
| public class LtiPlatformConfig | |
| internal class LtiPlatformConfig |
DedSec256
reviewed
Mar 7, 2026
| public LtiSigningKeyConfig SigningKey { get; set; } | ||
| } | ||
|
|
||
| public class LtiSigningKeyConfig |
Contributor
There was a problem hiding this comment.
Suggested change
| public class LtiSigningKeyConfig | |
| internal class LtiSigningKeyConfig |
DedSec256
reviewed
Mar 7, 2026
| @@ -0,0 +1,14 @@ | |||
| namespace HwProj.APIGateway.API.Lti.Models | |||
| { | |||
| public class LtiToolConfig | |||
Contributor
There was a problem hiding this comment.
Suggested change
| public class LtiToolConfig | |
| internal class LtiToolConfig |
DedSec256
reviewed
Mar 7, 2026
Comment on lines
+3
to
+20
| public class LtiToolDto( | ||
| long id, | ||
| string name, | ||
| string clientId, | ||
| string jwksEndpoint, | ||
| string initiateLoginUri, | ||
| string launchUrl, | ||
| string deepLink) | ||
| { | ||
| public long Id { get; init; } = id; | ||
| public string Name { get; init; } = name; | ||
| public string ClientId { get; init; } = clientId; | ||
| public string JwksEndpoint { get; init; } = jwksEndpoint; | ||
| public string InitiateLoginUri { get; init; } = initiateLoginUri; | ||
| public string LaunchUrl { get; init; } = launchUrl; | ||
| public string DeepLink { get; init; } = deepLink; | ||
| } | ||
| } No newline at end of file |
DedSec256
reviewed
Mar 7, 2026
|
|
||
| public class LtiDeepLinkingContentItem | ||
| { | ||
| public string Type { get; set; } // "ltiResourceLink" |
DedSec256
reviewed
Mar 7, 2026
| public Task<LtiToolDto?> GetByClientIdAsync(string clientId) | ||
| { | ||
| var cfg = _tools.FirstOrDefault(t => t.ClientId == clientId); | ||
| return Task.FromResult(cfg == null ? null : MapToDto(cfg)); |
Contributor
There was a problem hiding this comment.
Suggested change
| return Task.FromResult(cfg == null ? null : MapToDto(cfg)); | |
| return Task.FromResult(cfg.MapToDto()); |
DedSec256
reviewed
Mar 7, 2026
| public class UserTaskSolutionsPageData | ||
| { | ||
| public long CourseId { get; set; } | ||
| public long? LtiToolId { get; set; } |
DedSec256
reviewed
Mar 7, 2026
| return Task.FromResult<IReadOnlyList<LtiToolDto>>(result); | ||
| } | ||
|
|
||
| public Task<LtiToolDto?> GetByIdAsync(long id) |
Contributor
There was a problem hiding this comment.
почему асинхронное, если синхронное
DedSec256
reviewed
Mar 7, 2026
| } | ||
|
|
||
| var client = httpClientFactory.CreateClient(); | ||
| var json = await client.GetStringAsync(jwksUrl); |
Contributor
There was a problem hiding this comment.
что будет, если здесь упадет запрос?
DedSec256
reviewed
Mar 7, 2026
Comment on lines
+25
to
+26
| // В продакшене здесь стоит добавить Expire Policy (например, MemoryCache), | ||
| // чтобы обновлять ключи раз в сутки. |
DedSec256
reviewed
Mar 7, 2026
Comment on lines
+9
to
+14
| string clientId, | ||
| string toolId, | ||
| string courseId, | ||
| string targetLinkUri, | ||
| string userId, | ||
| string nonce); |
Contributor
There was a problem hiding this comment.
я бы сделал класс с get/init пропертями
DedSec256
reviewed
Mar 7, 2026
| } | ||
|
|
||
| string tokenString = form["JWT"]!; | ||
| var handler = new JwtSecurityTokenHandler(); |
Contributor
There was a problem hiding this comment.
точно мы должны его пересоздавать? Можно ли инжектить?
DedSec256
reviewed
Mar 7, 2026
|
|
||
| var resultList = new List<object>(); | ||
|
|
||
| if (unverifiedToken.Payload.TryGetValue(itemsClaimName, out var itemsObject)) |
Contributor
There was a problem hiding this comment.
Действительно ли структура такая жидкая?
DedSec256
reviewed
Mar 7, 2026
| <body> | ||
| <p>Задача выбрана. Возвращаемся в HwProj...</p> | ||
| <script> | ||
| var payload = {responsePayloadJson}; |
DedSec256
reviewed
Mar 7, 2026
Contributor
DedSec256
left a comment
DedSec256
left a comment
There was a problem hiding this comment.
Крутая работа!
Вот основные замечания сейчас
DedSec256
reviewed
Mar 7, 2026
|
|
||
| var responsePayloadJson = JsonSerializer.Serialize(resultList); | ||
|
|
||
| var htmlResponse = $@" |
Contributor
There was a problem hiding this comment.
Suggested change
| var htmlResponse = $@" | |
| // language=html | |
| var htmlResponse = $@" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Реализация поддержки протокола LTI 1.3 для интеграции с внешними инструментами.