Cutlery/Kavita
1
0
Fork 0
mirror of https://github.com/Kareadita/Kavita.git synced 2025-05-31 20:24:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

v0.7.10.2 - Hotfix 2 (#2382)

Browse Source
This commit is contained in:
Joe Milazzo 2023-10-30 17:10:08 -05:00 committed by GitHub
parent cf1dc7d42c
commit b6d4938e22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
API/Controllers/AccountController.cs
View File

@ -131,10 +131,13 @@ public class AccountController : BaseApiController
var user = new AppUserBuilder(registerDto.Username, registerDto.Email, var user = new AppUserBuilder(registerDto.Username, registerDto.Email,
await _unitOfWork.SiteThemeRepository.GetDefaultTheme()).Build(); await _unitOfWork.SiteThemeRepository.GetDefaultTheme()).Build();
var result = await _userManager.CreateAsync(user, registerDto.Password); var result = await _userManager.CreateAsync(user, registerDto.Password);
if (!result.Succeeded) return BadRequest(result.Errors); if (!result.Succeeded) return BadRequest(result.Errors);
// Assign default streams
user.DashboardStreams = Seed.DefaultStreams.ToList();
user.SideNavStreams = Seed.DefaultSideNavStreams.ToList();
var token = await _userManager.GenerateEmailConfirmationTokenAsync(user); var token = await _userManager.GenerateEmailConfirmationTokenAsync(user);
if (string.IsNullOrEmpty(token)) return BadRequest(await _localizationService.Get("en", "confirm-token-gen")); if (string.IsNullOrEmpty(token)) return BadRequest(await _localizationService.Get("en", "confirm-token-gen"));
if (!await ConfirmEmailToken(token, user)) return BadRequest(await _localizationService.Get("en", "validate-email", token)); if (!await ConfirmEmailToken(token, user)) return BadRequest(await _localizationService.Get("en", "validate-email", token));
@ -610,6 +613,11 @@ public class AccountController : BaseApiController
var result = await _userManager.CreateAsync(user, AccountService.DefaultPassword); var result = await _userManager.CreateAsync(user, AccountService.DefaultPassword);
if (!result.Succeeded) return BadRequest(result.Errors); if (!result.Succeeded) return BadRequest(result.Errors);
// Assign default streams
user.DashboardStreams = Seed.DefaultStreams.ToList();
user.SideNavStreams = Seed.DefaultSideNavStreams.ToList();
// Assign Roles // Assign Roles
var roles = dto.Roles; var roles = dto.Roles;
var hasAdminRole = dto.Roles.Contains(PolicyConstants.AdminRole); var hasAdminRole = dto.Roles.Contains(PolicyConstants.AdminRole);
@ -666,6 +674,7 @@ public class AccountController : BaseApiController
_logger.LogError(ex, "There was an error during invite user flow, unable to create user. Deleting user for retry"); _logger.LogError(ex, "There was an error during invite user flow, unable to create user. Deleting user for retry");
_unitOfWork.UserRepository.Delete(user); _unitOfWork.UserRepository.Delete(user);
await _unitOfWork.CommitAsync(); await _unitOfWork.CommitAsync();
return BadRequest(await _localizationService.Translate(User.GetUserId(), "generic-invite-user"));
} }

2
API/Helpers/Builders/AppUserBuilder.cs
View File

@ -32,8 +32,6 @@ public class AppUserBuilder : IEntityBuilder<AppUser>
DashboardStreams = new List<AppUserDashboardStream>(), DashboardStreams = new List<AppUserDashboardStream>(),
SideNavStreams = new List<AppUserSideNavStream>() SideNavStreams = new List<AppUserSideNavStream>()
}; };
_appUser.DashboardStreams = Seed.DefaultStreams.ToList();
_appUser.SideNavStreams = Seed.DefaultSideNavStreams.ToList();
} }
public AppUserBuilder WithLibrary(Library library, bool createSideNavStream = false) public AppUserBuilder WithLibrary(Library library, bool createSideNavStream = false)

1
API/Services/AccountService.cs
View File

@ -27,6 +27,7 @@ public interface IAccountService
Task<bool> HasChangeRestrictionRole(AppUser? user); Task<bool> HasChangeRestrictionRole(AppUser? user);
Task<bool> CheckIfAccessible(HttpRequest request); Task<bool> CheckIfAccessible(HttpRequest request);
Task<string> GenerateEmailLink(HttpRequest request, string token, string routePart, string email, bool withHost = true); Task<string> GenerateEmailLink(HttpRequest request, string token, string routePart, string email, bool withHost = true);
} }
public class AccountService : IAccountService public class AccountService : IAccountService

4
Kavita.Common/Kavita.Common.csproj
View File

@ -4,7 +4,7 @@
<TargetFramework>net7.0</TargetFramework> <TargetFramework>net7.0</TargetFramework>
<Company>kavitareader.com</Company> <Company>kavitareader.com</Company>
<Product>Kavita</Product> <Product>Kavita</Product>
<AssemblyVersion>0.7.10.1</AssemblyVersion> <AssemblyVersion>0.7.10.2</AssemblyVersion>
<NeutralLanguage>en</NeutralLanguage> <NeutralLanguage>en</NeutralLanguage>
<TieredPGO>true</TieredPGO> <TieredPGO>true</TieredPGO>
</PropertyGroup> </PropertyGroup>
@ -21,4 +21,4 @@
</ItemGroup> </ItemGroup>
</Project> </Project>

11
openapi.json
View File

@ -7,7 +7,7 @@
"name": "GPL-3.0", "name": "GPL-3.0",
"url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE" "url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE"
}, },
"version": "0.7.10.0" "version": "0.7.10.1"
}, },
"servers": [ "servers": [
{ {
@ -4251,20 +4251,17 @@
"content": { "content": {
"text/plain": { "text/plain": {
"schema": { "schema": {
"type": "integer", "$ref": "#/components/schemas/ProgressDto"
"format": "int32"
} }
}, },
"application/json": { "application/json": {
"schema": { "schema": {
"type": "integer", "$ref": "#/components/schemas/ProgressDto"
"format": "int32"
} }
}, },
"text/json": { "text/json": {
"schema": { "schema": {
"type": "integer", "$ref": "#/components/schemas/ProgressDto"
"format": "int32"
} }
} }
} }