feat: добавил поддержку подписки на календарь и экспорт расписания лекций в формате .ics
Backend CI / build-and-test (push) Successful in 57s
Frontend CI / build-and-check (push) Failing after 26s
🚀 Create and publish a Docker image / Detect changes in backend and frontend (push) Successful in 11s
🚀 Create and publish a Docker image / Build & publish backend image (push) Successful in 2m33s
🚀 Create and publish a Docker image / Build & publish frontend image (push) Successful in 33s
🚀 Create and publish a Docker image / Update stack on Portainer (push) Successful in 8s

This commit is contained in:
2026-06-02 21:26:48 +03:00
parent 7050851bd4
commit 136bcce7db
16 changed files with 639 additions and 8 deletions
@@ -47,6 +47,9 @@ public class EndpointAuthorizationTests : IClassFixture<ApiWebApplicationFactory
body: """{"displayName":"Test","avatarUrl":null}"""); body: """{"displayName":"Test","avatarUrl":null}""");
yield return E("users/me/stats [AnyAuth]", "GET", "api/v1/users/me/stats", "Student"); yield return E("users/me/stats [AnyAuth]", "GET", "api/v1/users/me/stats", "Student");
yield return E("users/me/enrollments [AnyAuth]", "GET", "api/v1/users/me/enrollments", "Student"); yield return E("users/me/enrollments [AnyAuth]", "GET", "api/v1/users/me/enrollments", "Student");
yield return E("users/me/enrollments/calendar-subscription [AnyAuth]", "GET", "api/v1/users/me/enrollments/calendar-subscription", "Student");
yield return E("users/me/enrollments.ics [AnyAuth]", "GET", "api/v1/users/me/enrollments.ics", "Student");
yield return E("users/me/enrollments/{id}.ics [AnyAuth]", "GET", "api/v1/users/me/enrollments/1.ics", "Student");
yield return E("users/me/reviews [AnyAuth]", "GET", "api/v1/users/me/reviews", "Student"); yield return E("users/me/reviews [AnyAuth]", "GET", "api/v1/users/me/reviews", "Student");
yield return E("users/me/achievements [AnyAuth]", "GET", "api/v1/users/me/achievements", "Student"); yield return E("users/me/achievements [AnyAuth]", "GET", "api/v1/users/me/achievements", "Student");
yield return E("users/me/transactions [AnyAuth]", "GET", "api/v1/users/me/transactions", "Student"); yield return E("users/me/transactions [AnyAuth]", "GET", "api/v1/users/me/transactions", "Student");
@@ -192,6 +195,7 @@ public class EndpointAuthorizationTests : IClassFixture<ApiWebApplicationFactory
// dev login доступен в окружении Development // dev login доступен в окружении Development
yield return new object[] { "auth/login/dev POST", "POST", "api/v1/auth/login/dev", yield return new object[] { "auth/login/dev POST", "POST", "api/v1/auth/login/dev",
"""{"email":"test@test.com","displayName":"Test","role":"Student"}""" }; """{"email":"test@test.com","displayName":"Test","role":"Student"}""" };
yield return new object[] { "users/calendar/enrollments/{token}.ics GET", "GET", "api/v1/users/calendar/enrollments/bad-token.ics" };
// refresh читает из cookie — возвращает 401, если нет cookie, но это не 401 от промежуточного ПО авторизации // refresh читает из cookie — возвращает 401, если нет cookie, но это не 401 от промежуточного ПО авторизации
// (он возвращает 401 явно в теле действия, что отличается от Auth Challenge) // (он возвращает 401 явно в теле действия, что отличается от Auth Challenge)
// Мы тестируем это отдельно, чтобы убедиться, что заголовок JWT не требуется // Мы тестируем это отдельно, чтобы убедиться, что заголовок JWT не требуется
@@ -20,6 +20,7 @@ using UniVerse.Application.DTOs.Tags;
using UniVerse.Application.DTOs.Users; using UniVerse.Application.DTOs.Users;
using UniVerse.Application.Interfaces; using UniVerse.Application.Interfaces;
using UniVerse.Domain.Enums; using UniVerse.Domain.Enums;
using UniVerse.Domain.Exceptions;
using UniVerse.Infrastructure.Data; using UniVerse.Infrastructure.Data;
namespace UniVerse.Api.Tests.Helpers; namespace UniVerse.Api.Tests.Helpers;
@@ -177,6 +178,13 @@ public class ApiWebApplicationFactory : WebApplicationFactory<Program>
3, 3,
[new EnrollmentSlotRuleDto(1, 3), new EnrollmentSlotRuleDto(3, 5), new EnrollmentSlotRuleDto(4, 7)])); [new EnrollmentSlotRuleDto(1, 3), new EnrollmentSlotRuleDto(3, 5), new EnrollmentSlotRuleDto(4, 7)]));
stub.GetEnrollmentsAsync(Arg.Any<int>(), Arg.Any<PaginationRequest>()).Returns(pagedLectures); stub.GetEnrollmentsAsync(Arg.Any<int>(), Arg.Any<PaginationRequest>()).Returns(pagedLectures);
stub.GetMyEnrollmentsIcsAsync(Arg.Any<int>()).Returns("BEGIN:VCALENDAR\r\nEND:VCALENDAR\r\n");
stub.GetEnrollmentIcsAsync(Arg.Any<int>(), Arg.Any<int>()).Returns("BEGIN:VCALENDAR\r\nEND:VCALENDAR\r\n");
stub.GetCalendarSubscriptionTokenAsync(Arg.Any<int>()).Returns("test-token");
stub.GetEnrollmentsIcsBySubscriptionTokenAsync("bad-token")
.Returns(Task.FromException<string>(new ForbiddenException("Invalid calendar subscription token.")));
stub.GetEnrollmentsIcsBySubscriptionTokenAsync(Arg.Is<string>(token => token != "bad-token"))
.Returns(Task.FromResult("BEGIN:VCALENDAR\r\nEND:VCALENDAR\r\n"));
stub.GetAllAsync(Arg.Any<UserFilterRequest>()).Returns(pagedUsers); stub.GetAllAsync(Arg.Any<UserFilterRequest>()).Returns(pagedUsers);
stub.SetRolesAsync(Arg.Any<int>(), Arg.Any<IReadOnlyCollection<UserRole>>()).Returns(Task.CompletedTask); stub.SetRolesAsync(Arg.Any<int>(), Arg.Any<IReadOnlyCollection<UserRole>>()).Returns(Task.CompletedTask);
stub.SetActiveAsync(Arg.Any<int>(), Arg.Any<bool>()).Returns(Task.CompletedTask); stub.SetActiveAsync(Arg.Any<int>(), Arg.Any<bool>()).Returns(Task.CompletedTask);
@@ -1,4 +1,5 @@
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Logging.Abstractions;
using NSubstitute; using NSubstitute;
using UniVerse.Application.DTOs.Notifications; using UniVerse.Application.DTOs.Notifications;
@@ -193,6 +194,56 @@ public class UserServiceTests
Assert.Equal(2, Assert.Single(result.Items).Id); Assert.Equal(2, Assert.Single(result.Items).Id);
} }
[Fact]
public async Task CalendarSubscriptionToken_Roundtrip_ReturnsUserEnrollmentsIcs()
{
await using var db = CreateDbContext();
var startsAt = new DateTime(2026, 1, 10, 9, 0, 0, DateTimeKind.Utc);
db.Users.Add(new User { Id = 1, Email = "student@test.local" });
db.Courses.Add(new Course { Id = 1, Name = "Course" });
db.Lectures.Add(Lecture(1, startsAt));
db.LectureEnrollments.Add(new LectureEnrollment { LectureId = 1, UserId = 1 });
await db.SaveChangesAsync();
var service = CreateService(db);
var token = await service.GetCalendarSubscriptionTokenAsync(1);
var ics = await service.GetEnrollmentsIcsBySubscriptionTokenAsync(token);
Assert.Contains("BEGIN:VCALENDAR", ics);
Assert.Contains("Lecture 1", ics);
}
[Fact]
public async Task CalendarSubscriptionToken_RejectsTamperedToken()
{
await using var db = CreateDbContext();
db.Users.Add(new User { Id = 1, Email = "student@test.local" });
await db.SaveChangesAsync();
var service = CreateService(db);
var token = await service.GetCalendarSubscriptionTokenAsync(1);
var tampered = token[..^1] + (token[^1] == 'A' ? 'B' : 'A');
await Assert.ThrowsAsync<ForbiddenException>(() =>
service.GetEnrollmentsIcsBySubscriptionTokenAsync(tampered));
}
[Fact]
public async Task GetEnrollmentIcsAsync_ReturnsLectureIcsWithoutEnrollment()
{
await using var db = CreateDbContext();
var startsAt = new DateTime(2026, 2, 10, 9, 0, 0, DateTimeKind.Utc);
db.Users.Add(new User { Id = 1, Email = "student@test.local" });
db.Courses.Add(new Course { Id = 1, Name = "Course" });
db.Lectures.Add(Lecture(1853, startsAt));
await db.SaveChangesAsync();
var service = CreateService(db);
var ics = await service.GetEnrollmentIcsAsync(1, 1853);
Assert.Contains("BEGIN:VCALENDAR", ics);
Assert.Contains("Lecture 1853", ics);
}
private static AppDbContext CreateDbContext() private static AppDbContext CreateDbContext()
{ {
var options = new DbContextOptionsBuilder<AppDbContext>() var options = new DbContextOptionsBuilder<AppDbContext>()
@@ -215,7 +266,13 @@ public class UserServiceTests
.Returns(Task.CompletedTask); .Returns(Task.CompletedTask);
var gamification = new GamificationService(db, notifications, NullLogger<GamificationService>.Instance); var gamification = new GamificationService(db, notifications, NullLogger<GamificationService>.Instance);
return new UserService(db, gamification); var config = new ConfigurationBuilder()
.AddInMemoryCollection(new Dictionary<string, string?>
{
["Jwt:Secret"] = "test-calendar-subscription-secret-32chars"
})
.Build();
return new UserService(db, gamification, config);
} }
private static void SeedLevelThresholds(AppDbContext db) private static void SeedLevelThresholds(AppDbContext db)
@@ -5,6 +5,7 @@ using UniVerse.Application.DTOs.Users;
using UniVerse.Application.Interfaces; using UniVerse.Application.Interfaces;
using UniVerse.Domain.Enums; using UniVerse.Domain.Enums;
using System.Security.Claims; using System.Security.Claims;
using System.Text;
namespace UniVerse.Api.Controllers; namespace UniVerse.Api.Controllers;
@@ -83,6 +84,52 @@ public class UsersController : ControllerBase
public async Task<ActionResult> MyEnrollments([FromQuery] PaginationRequest pagination) => public async Task<ActionResult> MyEnrollments([FromQuery] PaginationRequest pagination) =>
Ok(await _users.GetEnrollmentsAsync(CurrentUserId, pagination)); Ok(await _users.GetEnrollmentsAsync(CurrentUserId, pagination));
[HttpGet("me/enrollments/calendar-subscription")]
[ProducesResponseType(typeof(CalendarSubscriptionDto), StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
public async Task<ActionResult<CalendarSubscriptionDto>> CalendarSubscription()
{
var token = await _users.GetCalendarSubscriptionTokenAsync(CurrentUserId);
var feedUrl = Url.Action(
nameof(CalendarEnrollmentsIcs),
null,
new { token },
Request.Scheme)
?? $"{Request.Scheme}://{Request.Host}/api/v1/users/calendar/enrollments/{token}.ics";
return Ok(new CalendarSubscriptionDto(feedUrl));
}
[AllowAnonymous]
[HttpGet("calendar/enrollments/{token}.ics")]
[Produces("text/calendar")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status403Forbidden)]
public async Task<FileContentResult> CalendarEnrollmentsIcs(string token)
{
var ics = await _users.GetEnrollmentsIcsBySubscriptionTokenAsync(token);
return File(Encoding.UTF8.GetBytes(ics), "text/calendar; charset=utf-8", "my-lectures.ics");
}
[HttpGet("me/enrollments.ics")]
[Produces("text/calendar")]
[ProducesResponseType(StatusCodes.Status200OK)]
public async Task<FileContentResult> MyEnrollmentsIcs()
{
var ics = await _users.GetMyEnrollmentsIcsAsync(CurrentUserId);
return File(Encoding.UTF8.GetBytes(ics), "text/calendar; charset=utf-8", "my-lectures.ics");
}
[HttpGet("me/enrollments/{lectureId:int}.ics")]
[Produces("text/calendar")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<FileContentResult> EnrollmentIcs(int lectureId)
{
var ics = await _users.GetEnrollmentIcsAsync(CurrentUserId, lectureId);
return File(Encoding.UTF8.GetBytes(ics), "text/calendar; charset=utf-8", $"lecture-{lectureId}.ics");
}
/// <summary>Получить отзывы текущего пользователя.</summary> /// <summary>Получить отзывы текущего пользователя.</summary>
/// <param name="pagination">Параметры пагинации.</param> /// <param name="pagination">Параметры пагинации.</param>
/// <response code="200">Список отзывов (пагинированный).</response> /// <response code="200">Список отзывов (пагинированный).</response>
+150
View File
@@ -3789,6 +3789,146 @@
] ]
} }
}, },
"/api/v1/users/me/enrollments/calendar-subscription": {
"get": {
"tags": [
"Users"
],
"description": "**Required:** any authenticated user",
"responses": {
"200": {
"description": "OK",
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/CalendarSubscriptionDto"
}
}
}
},
"401": {
"description": "Unauthorized",
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/ProblemDetails"
}
}
}
}
},
"security": [
{
"Bearer": [ ]
}
]
}
},
"/api/v1/users/calendar/enrollments/{token}.ics": {
"get": {
"tags": [
"Users"
],
"parameters": [
{
"name": "token",
"in": "path",
"required": true,
"schema": {
"type": "string"
}
}
],
"responses": {
"200": {
"description": "OK"
},
"403": {
"description": "Forbidden",
"content": {
"text/calendar": {
"schema": {
"$ref": "#/components/schemas/ProblemDetails"
}
},
"application/json": {
"schema": {
"$ref": "#/components/schemas/ProblemDetails"
}
}
}
}
}
}
},
"/api/v1/users/me/enrollments.ics": {
"get": {
"tags": [
"Users"
],
"description": "**Required:** any authenticated user",
"responses": {
"200": {
"description": "OK"
},
"401": {
"description": "Unauthorized — JWT token missing or invalid"
}
},
"security": [
{
"Bearer": [ ]
}
]
}
},
"/api/v1/users/me/enrollments/{lectureId}.ics": {
"get": {
"tags": [
"Users"
],
"description": "**Required:** any authenticated user",
"parameters": [
{
"name": "lectureId",
"in": "path",
"required": true,
"schema": {
"type": "integer",
"format": "int32"
}
}
],
"responses": {
"200": {
"description": "OK"
},
"404": {
"description": "Not Found",
"content": {
"text/calendar": {
"schema": {
"$ref": "#/components/schemas/ProblemDetails"
}
},
"application/json": {
"schema": {
"$ref": "#/components/schemas/ProblemDetails"
}
}
}
},
"401": {
"description": "Unauthorized — JWT token missing or invalid"
}
},
"security": [
{
"Bearer": [ ]
}
]
}
},
"/api/v1/users/me/reviews": { "/api/v1/users/me/reviews": {
"get": { "get": {
"tags": [ "tags": [
@@ -4843,6 +4983,16 @@
}, },
"additionalProperties": false "additionalProperties": false
}, },
"CalendarSubscriptionDto": {
"type": "object",
"properties": {
"feedUrl": {
"type": "string",
"nullable": true
}
},
"additionalProperties": false
},
"CoinTransactionDto": { "CoinTransactionDto": {
"type": "object", "type": "object",
"properties": { "properties": {
@@ -51,6 +51,8 @@ public record AdminDashboardStatsDto(
public record EnrollmentSlotRuleDto(int Level, int Slots); public record EnrollmentSlotRuleDto(int Level, int Slots);
public record CalendarSubscriptionDto(string FeedUrl);
public record UpdateUserRequest( public record UpdateUserRequest(
string? DisplayName, string? DisplayName,
string? AvatarUrl string? AvatarUrl
@@ -12,6 +12,10 @@ public interface IUserService
Task<UserStatsDto> GetStatsAsync(int id); Task<UserStatsDto> GetStatsAsync(int id);
Task<AdminDashboardStatsDto> GetAdminDashboardStatsAsync(); Task<AdminDashboardStatsDto> GetAdminDashboardStatsAsync();
Task<PagedResult<LectureDto>> GetEnrollmentsAsync(int id, PaginationRequest pagination); Task<PagedResult<LectureDto>> GetEnrollmentsAsync(int id, PaginationRequest pagination);
Task<string> GetMyEnrollmentsIcsAsync(int userId);
Task<string> GetEnrollmentIcsAsync(int userId, int lectureId);
Task<string> GetCalendarSubscriptionTokenAsync(int userId);
Task<string> GetEnrollmentsIcsBySubscriptionTokenAsync(string token);
Task<PagedResult<UserDto>> GetAllAsync(UserFilterRequest filter); Task<PagedResult<UserDto>> GetAllAsync(UserFilterRequest filter);
Task SetRolesAsync(int id, IReadOnlyCollection<UserRole> roles); Task SetRolesAsync(int id, IReadOnlyCollection<UserRole> roles);
Task SetActiveAsync(int id, bool isActive); Task SetActiveAsync(int id, bool isActive);
@@ -1,4 +1,12 @@
using System.Buffers.Binary;
using System.Security.Cryptography;
using System.Text;
using Ical.Net;
using Ical.Net.CalendarComponents;
using Ical.Net.DataTypes;
using Ical.Net.Serialization;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using UniVerse.Application.DTOs.Common; using UniVerse.Application.DTOs.Common;
using UniVerse.Application.DTOs.Lectures; using UniVerse.Application.DTOs.Lectures;
using UniVerse.Application.DTOs.Users; using UniVerse.Application.DTOs.Users;
@@ -13,13 +21,20 @@ namespace UniVerse.Infrastructure.Services;
public class UserService : IUserService public class UserService : IUserService
{ {
private const byte CalendarTokenVersion = 1;
private const int CalendarTokenPayloadLength = 5;
private const int CalendarTokenSignatureLength = 32;
private const string CalendarTokenKeyContext = "universe-calendar-subscription-v1";
private readonly AppDbContext _db; private readonly AppDbContext _db;
private readonly IGamificationService _gamification; private readonly IGamificationService _gamification;
private readonly IConfiguration _config;
public UserService(AppDbContext db, IGamificationService gamification) public UserService(AppDbContext db, IGamificationService gamification, IConfiguration config)
{ {
_db = db; _db = db;
_gamification = gamification; _gamification = gamification;
_config = config;
} }
public async Task<UserDto> GetByIdAsync(int id) public async Task<UserDto> GetByIdAsync(int id)
@@ -115,6 +130,154 @@ public class UserService : IUserService
pagination.PageSize); pagination.PageSize);
} }
public async Task<string> GetMyEnrollmentsIcsAsync(int userId)
{
if (!await _db.Users.AnyAsync(u => u.Id == userId))
throw new NotFoundException("User", userId);
var lectures = await _db.LectureEnrollments
.Where(e => e.UserId == userId)
.Include(e => e.Lecture)
.ThenInclude(l => l.Teacher)
.Include(e => e.Lecture)
.ThenInclude(l => l.Location)
.OrderBy(e => e.Lecture.StartsAt)
.Select(e => e.Lecture)
.ToListAsync();
return BuildIcs(lectures, userId);
}
public async Task<string> GetEnrollmentIcsAsync(int userId, int lectureId)
{
if (!await _db.Users.AnyAsync(u => u.Id == userId))
throw new NotFoundException("User", userId);
var lecture = await _db.Lectures
.Include(l => l.Teacher)
.Include(l => l.Location)
.FirstOrDefaultAsync(l => l.Id == lectureId)
?? throw new NotFoundException("Lecture", lectureId);
return BuildIcs([lecture], userId);
}
public async Task<string> GetCalendarSubscriptionTokenAsync(int userId)
{
if (!await _db.Users.AnyAsync(u => u.Id == userId))
throw new NotFoundException("User", userId);
Span<byte> payload = stackalloc byte[CalendarTokenPayloadLength];
payload[0] = CalendarTokenVersion;
BinaryPrimitives.WriteInt32BigEndian(payload[1..], userId);
var signature = SignCalendarTokenPayload(payload);
var tokenBytes = new byte[CalendarTokenPayloadLength + CalendarTokenSignatureLength];
payload.CopyTo(tokenBytes);
signature.CopyTo(tokenBytes.AsSpan(CalendarTokenPayloadLength));
return ToBase64Url(tokenBytes);
}
public async Task<string> GetEnrollmentsIcsBySubscriptionTokenAsync(string token)
{
var userId = ValidateCalendarSubscriptionToken(token);
return await GetMyEnrollmentsIcsAsync(userId);
}
private int ValidateCalendarSubscriptionToken(string token)
{
var tokenBytes = FromBase64Url(token);
if (tokenBytes.Length != CalendarTokenPayloadLength + CalendarTokenSignatureLength)
throw new ForbiddenException("Invalid calendar subscription token.");
var payload = tokenBytes.AsSpan(0, CalendarTokenPayloadLength);
var signature = tokenBytes.AsSpan(CalendarTokenPayloadLength, CalendarTokenSignatureLength);
if (payload[0] != CalendarTokenVersion)
throw new ForbiddenException("Invalid calendar subscription token.");
var expectedSignature = SignCalendarTokenPayload(payload);
if (!CryptographicOperations.FixedTimeEquals(signature, expectedSignature))
throw new ForbiddenException("Invalid calendar subscription token.");
var userId = BinaryPrimitives.ReadInt32BigEndian(payload[1..]);
if (userId <= 0)
throw new ForbiddenException("Invalid calendar subscription token.");
return userId;
}
private byte[] SignCalendarTokenPayload(ReadOnlySpan<byte> payload)
{
var calendarKey = DeriveCalendarTokenKey();
return HMACSHA256.HashData(calendarKey, payload);
}
private byte[] DeriveCalendarTokenKey()
{
var jwtSecret = _config["Jwt:Secret"];
if (string.IsNullOrWhiteSpace(jwtSecret))
throw new InvalidOperationException("Jwt:Secret is not configured.");
return HMACSHA256.HashData(
Encoding.UTF8.GetBytes(jwtSecret),
Encoding.UTF8.GetBytes(CalendarTokenKeyContext));
}
private static string ToBase64Url(ReadOnlySpan<byte> bytes) =>
Convert.ToBase64String(bytes)
.TrimEnd('=')
.Replace('+', '-')
.Replace('/', '_');
private static byte[] FromBase64Url(string value)
{
try
{
var padded = value.Replace('-', '+').Replace('_', '/');
padded = padded.PadRight(padded.Length + (4 - padded.Length % 4) % 4, '=');
return Convert.FromBase64String(padded);
}
catch (FormatException)
{
throw new ForbiddenException("Invalid calendar subscription token.");
}
}
private static string BuildIcs(List<Domain.Entities.Lecture> lectures, int userId)
{
var calendar = new Calendar
{
Method = "PUBLISH",
ProductId = "-//UniVerse//Lectures Calendar//EN"
};
foreach (var lecture in lectures)
{
var location = lecture.Location is null
? string.Empty
: $"{lecture.Location.Building}{(string.IsNullOrWhiteSpace(lecture.Location.Room) ? string.Empty : $", ауд. {lecture.Location.Room}")}";
var teacherName = lecture.Teacher?.DisplayName
?? lecture.Teacher?.Email
?? "не указан";
calendar.Events.Add(new CalendarEvent
{
Uid = $"lecture-{lecture.Id}-user-{userId}@universe.local",
Summary = lecture.Title,
Description = $"{lecture.Description}\nПреподаватель: {teacherName}",
Location = location,
DtStart = new CalDateTime(DateTime.SpecifyKind(lecture.StartsAt, DateTimeKind.Utc)),
DtEnd = new CalDateTime(DateTime.SpecifyKind(lecture.EndsAt, DateTimeKind.Utc)),
DtStamp = new CalDateTime(DateTime.UtcNow)
});
}
return new CalendarSerializer().SerializeToString(calendar) ?? string.Empty;
}
public async Task<PagedResult<UserDto>> GetAllAsync(UserFilterRequest filter) public async Task<PagedResult<UserDto>> GetAllAsync(UserFilterRequest filter)
{ {
var query = _db.Users.AsQueryable(); var query = _db.Users.AsQueryable();
@@ -13,6 +13,7 @@
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.8" /> <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.8" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.18.0" /> <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.18.0" />
<PackageReference Include="Quartz" Version="3.18.1" /> <PackageReference Include="Quartz" Version="3.18.1" />
<PackageReference Include="Ical.Net" Version="5.2.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
+27
View File
@@ -81,3 +81,30 @@ export function extractItems<T>(payload: T[] | { items?: T[] } | undefined): T[]
if (Array.isArray(payload)) return payload if (Array.isArray(payload)) return payload
return payload?.items ?? [] return payload?.items ?? []
} }
export async function apiRequestBlob(
path: string,
options: RequestInit & { query?: Record<string, unknown> } = {},
): Promise<Blob> {
const headers = new Headers(options.headers)
if (!headers.has('Accept')) headers.set('Accept', 'text/calendar')
if (accessToken) headers.set('Authorization', `Bearer ${accessToken}`)
const response = await fetch(makeUrl(path, options.query), {
...options,
headers,
credentials: 'include',
})
if (!response.ok) {
const body = await parseResponse(response)
const message =
typeof body === 'object' && body && 'message' in body
? String((body as { message: unknown }).message)
: `API request failed with status ${response.status}`
throw new ApiError(message, response.status, body)
}
return response.blob()
}
+7 -1
View File
@@ -1,4 +1,4 @@
import { apiRequest, extractItems } from './client' import { apiRequest, apiRequestBlob, extractItems } from './client'
import type { import type {
AchievementDto, AchievementDto,
AuthResponse, AuthResponse,
@@ -19,6 +19,7 @@ import type {
UpdateReviewPromptRequest, UpdateReviewPromptRequest,
UserAchievementDto, UserAchievementDto,
AdminDashboardStatsDto, AdminDashboardStatsDto,
CalendarSubscriptionDto,
CurrentUserDto, CurrentUserDto,
UserDto, UserDto,
UserQuery, UserQuery,
@@ -76,6 +77,11 @@ export const usersApi = {
) )
return extractItems(payload) return extractItems(payload)
}, },
downloadMyEnrollmentsIcs: () => apiRequestBlob('/users/me/enrollments.ics'),
downloadEnrollmentIcs: (lectureId: string | number) =>
apiRequestBlob(`/users/me/enrollments/${lectureId}.ics`),
getCalendarSubscription: () =>
apiRequest<CalendarSubscriptionDto>('/users/me/enrollments/calendar-subscription'),
async myAchievements() { async myAchievements() {
const payload = await apiRequest< const payload = await apiRequest<
PagedResult<UserAchievementDto> | UserAchievementDto[] | AchievementDto[] PagedResult<UserAchievementDto> | UserAchievementDto[] | AchievementDto[]
+4
View File
@@ -83,6 +83,10 @@ export interface AdminDashboardStatsDto {
pendingReviewsCount: number pendingReviewsCount: number
} }
export interface CalendarSubscriptionDto {
feedUrl: string
}
export interface EnrollmentSlotRuleDto { export interface EnrollmentSlotRuleDto {
level: number level: number
slots: number slots: number
+10
View File
@@ -0,0 +1,10 @@
export function downloadFile(blob: Blob, fileName: string) {
const url = URL.createObjectURL(blob)
const link = document.createElement('a')
link.href = url
link.download = fileName
document.body.appendChild(link)
link.click()
link.remove()
URL.revokeObjectURL(url)
}
+13 -1
View File
@@ -2,6 +2,8 @@
import { computed, inject, onMounted, ref } from 'vue' import { computed, inject, onMounted, ref } from 'vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { useAuthStore } from '@/stores/auth' import { useAuthStore } from '@/stores/auth'
import { usersApi } from '@/api'
import { downloadFile } from '@/utils/downloadFile'
import { useLecturesStore } from '@/stores/lectures' import { useLecturesStore } from '@/stores/lectures'
import { useUserStore } from '@/stores/user' import { useUserStore } from '@/stores/user'
import GlassCard from '@/components/ui/GlassCard.vue' import GlassCard from '@/components/ui/GlassCard.vue'
@@ -66,6 +68,16 @@ const levelProgressText = computed(() =>
: `${userXp.value} XP`, : `${userXp.value} XP`,
) )
async function downloadLectureIcs(id: string) {
try {
const blob = await usersApi.downloadEnrollmentIcs(id)
downloadFile(blob, `lecture-${id}.ics`)
addToast?.("Файл календаря скачан", "success")
} catch (err) {
addToast?.(err instanceof Error ? err.message : "Не удалось скачать .ics", "error")
}
}
onMounted(async () => { onMounted(async () => {
await Promise.all([ await Promise.all([
lectures.all.length ? Promise.resolve() : lectures.fetchLectures(), lectures.all.length ? Promise.resolve() : lectures.fetchLectures(),
@@ -125,7 +137,7 @@ async function registerLecture(id: string) {
<button class="btn-primary" @click="router.push(`/lecture/${nextLecture.id}`)"> <button class="btn-primary" @click="router.push(`/lecture/${nextLecture.id}`)">
Открыть Открыть
</button> </button>
<button class="btn-secondary">Добавить в календарь</button> <button class="btn-secondary" @click="downloadLectureIcs(nextLecture.id)">Скачать .ics</button>
</div> </div>
</div> </div>
</GlassCard> </GlassCard>
@@ -1,6 +1,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { computed, inject, onMounted, ref } from 'vue' import { computed, inject, onMounted, ref } from 'vue'
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
import { usersApi } from '@/api'
import { downloadFile } from '@/utils/downloadFile'
import { useLecturesStore } from '@/stores/lectures' import { useLecturesStore } from '@/stores/lectures'
import { useUserStore } from '@/stores/user' import { useUserStore } from '@/stores/user'
import GlassCard from '@/components/ui/GlassCard.vue' import GlassCard from '@/components/ui/GlassCard.vue'
@@ -37,6 +39,16 @@ onMounted(async () => {
await lecturesStore.fetchLecture(lectureId.value) await lecturesStore.fetchLecture(lectureId.value)
}) })
async function downloadLectureIcs(id: string) {
try {
const blob = await usersApi.downloadEnrollmentIcs(id)
downloadFile(blob, `lecture-${id}.ics`)
addToast?.("Файл календаря скачан", "success")
} catch (err) {
addToast?.(err instanceof Error ? err.message : "Не удалось скачать .ics", "error")
}
}
async function registerLecture() { async function registerLecture() {
if (!lecture.value) return if (!lecture.value) return
if (slotRegistrationDisabled.value) { if (slotRegistrationDisabled.value) {
@@ -90,7 +102,7 @@ async function registerLecture() {
<button v-else class="btn-secondary" @click="lecturesStore.unregister(lecture.id)"> <button v-else class="btn-secondary" @click="lecturesStore.unregister(lecture.id)">
Отменить запись Отменить запись
</button> </button>
<button class="btn-secondary">Добавить в календарь</button> <button class="btn-secondary" @click="downloadLectureIcs(lecture.id)">Скачать .ics</button>
<button v-if="isAttended" class="btn-primary" @click="router.push(`/review/${lecture.id}`)"> <button v-if="isAttended" class="btn-primary" @click="router.push(`/review/${lecture.id}`)">
Оставить отзыв Оставить отзыв
</button> </button>
+127 -3
View File
@@ -1,6 +1,8 @@
<script setup lang="ts"> <script setup lang="ts">
import { computed, onMounted, ref } from 'vue' import { computed, inject, onMounted, ref } from 'vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { usersApi } from '@/api'
import { downloadFile } from '@/utils/downloadFile'
import { useLecturesStore } from '@/stores/lectures' import { useLecturesStore } from '@/stores/lectures'
import { useAuthStore } from '@/stores/auth' import { useAuthStore } from '@/stores/auth'
import GlassCard from '@/components/ui/GlassCard.vue' import GlassCard from '@/components/ui/GlassCard.vue'
@@ -14,6 +16,11 @@ const router = useRouter()
const activeTab = ref<'upcoming' | 'history'>('upcoming') const activeTab = ref<'upcoming' | 'history'>('upcoming')
const cancelModal = ref(false) const cancelModal = ref(false)
const selectedId = ref<string | null>(null) const selectedId = ref<string | null>(null)
const calendarSubscriptionUrl = ref<string | null>(null)
const calendarActionPending = ref(false)
const addToast = inject('addToast') as
| ((message: string, type?: 'success' | 'error' | 'info') => void)
| undefined
const upcoming = computed(() => const upcoming = computed(() =>
lecturesStore.registeredLectures.map((l) => ({ ...l, status: 'registered' })), lecturesStore.registeredLectures.map((l) => ({ ...l, status: 'registered' })),
@@ -26,6 +33,98 @@ onMounted(async () => {
if (auth.user) await lecturesStore.fetchRegisteredForCurrentUser() if (auth.user) await lecturesStore.fetchRegisteredForCurrentUser()
}) })
async function downloadLectureIcs(id: string) {
try {
const blob = await usersApi.downloadEnrollmentIcs(id)
downloadFile(blob, `lecture-${id}.ics`)
} catch (err) {
addToast?.(err instanceof Error ? err.message : 'Не удалось скачать .ics', 'error')
}
}
async function downloadAllIcs() {
try {
const blob = await usersApi.downloadMyEnrollmentsIcs()
downloadFile(blob, 'my-lectures.ics')
} catch (err) {
addToast?.(err instanceof Error ? err.message : 'Не удалось скачать .ics', 'error')
}
}
async function getCalendarSubscriptionUrl() {
if (calendarSubscriptionUrl.value) return calendarSubscriptionUrl.value
const subscription = await usersApi.getCalendarSubscription()
calendarSubscriptionUrl.value = subscription.feedUrl
return subscription.feedUrl
}
async function copyText(value: string) {
if (navigator.clipboard?.writeText) {
try {
await navigator.clipboard.writeText(value)
return true
} catch {
// Browser may block async clipboard writes after awaiting the subscription request.
}
}
const textarea = document.createElement('textarea')
textarea.value = value
textarea.style.position = 'fixed'
textarea.style.left = '-9999px'
document.body.appendChild(textarea)
textarea.focus()
textarea.select()
const copied = document.execCommand('copy')
textarea.remove()
return copied
}
async function copyCalendarSubscriptionUrl() {
try {
calendarActionPending.value = true
const feedUrl = await getCalendarSubscriptionUrl()
if (!await copyText(feedUrl)) throw new Error('Браузер заблокировал копирование ссылки')
addToast?.('ICS-ссылка скопирована', 'success')
} catch (err) {
addToast?.(err instanceof Error ? err.message : 'Не удалось скопировать ссылку', 'error')
} finally {
calendarActionPending.value = false
}
}
async function syncWithGoogleCalendar() {
const googleWindow = window.open('about:blank', '_blank')
try {
calendarActionPending.value = true
const feedUrl = await getCalendarSubscriptionUrl()
const copied = await copyText(feedUrl)
const googleUrl = `https://calendar.google.com/calendar/r?cid=${encodeURIComponent(feedUrl)}`
if (googleWindow) {
googleWindow.opener = null
googleWindow.location.href = googleUrl
} else {
window.open(googleUrl, '_blank', 'noopener,noreferrer')
}
addToast?.(
copied
? 'ICS-ссылка скопирована. Google Calendar открыт в новой вкладке.'
: 'Google Calendar открыт. Если ссылка не подставилась, скопируйте ICS-ссылку отдельно.',
copied ? 'success' : 'info',
)
} catch (err) {
googleWindow?.close()
addToast?.(
err instanceof Error ? err.message : 'Не удалось подготовить ссылку для Google Calendar',
'error',
)
} finally {
calendarActionPending.value = false
}
}
function openCancel(id: string) { function openCancel(id: string) {
selectedId.value = id selectedId.value = id
cancelModal.value = true cancelModal.value = true
@@ -46,7 +145,25 @@ async function confirmCancel() {
Управляйте регистрациями, экспортируйте расписание и оставляйте отзывы. Управляйте регистрациями, экспортируйте расписание и оставляйте отзывы.
</p> </p>
</div> </div>
<button class="btn-secondary">Экспорт в календарь</button> <div class="calendar-actions">
<button
class="btn-primary"
:disabled="calendarActionPending"
@click="syncWithGoogleCalendar"
>
Синхронизировать с Google Calendar
</button>
<button
class="btn-secondary"
:disabled="calendarActionPending"
@click="copyCalendarSubscriptionUrl"
>
Скопировать ICS-ссылку
</button>
<button class="btn-secondary" @click="downloadAllIcs">
Скачать все мои лекции (.ics)
</button>
</div>
</div> </div>
<div class="tabs"> <div class="tabs">
@@ -76,7 +193,7 @@ async function confirmCancel() {
</div> </div>
<div class="lecture-actions"> <div class="lecture-actions">
<StatusBadge status="registered" /> <StatusBadge status="registered" />
<button class="btn-secondary btn-sm">Добавить в календарь</button> <button class="btn-secondary btn-sm" @click="downloadLectureIcs(item.id)">Скачать .ics</button>
<button class="btn-danger btn-sm" @click="openCancel(item.id)">Отменить</button> <button class="btn-danger btn-sm" @click="openCancel(item.id)">Отменить</button>
</div> </div>
</GlassCard> </GlassCard>
@@ -133,6 +250,13 @@ async function confirmCancel() {
gap: 12px; gap: 12px;
flex-wrap: wrap; flex-wrap: wrap;
} }
.calendar-actions {
display: flex;
align-items: center;
justify-content: flex-end;
gap: 8px;
flex-wrap: wrap;
}
.tabs { .tabs {
display: inline-flex; display: inline-flex;
width: fit-content; width: fit-content;