Cutlery/Kavita
1
0
Fork 0
mirror of https://github.com/Kareadita/Kavita.git synced 2025-05-24 00:52:23 -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,
await _unitOfWork.SiteThemeRepository.GetDefaultTheme()).Build();
var result = await _userManager.CreateAsync(user, registerDto.Password);
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);
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));
@ -610,6 +613,11 @@ public class AccountController : BaseApiController
var result = await _userManager.CreateAsync(user, AccountService.DefaultPassword);
if (!result.Succeeded) return BadRequest(result.Errors);
// Assign default streams
user.DashboardStreams = Seed.DefaultStreams.ToList();
user.SideNavStreams = Seed.DefaultSideNavStreams.ToList();
// Assign Roles
var roles = dto.Roles;
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");
_unitOfWork.UserRepository.Delete(user);
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>(),
SideNavStreams = new List<AppUserSideNavStream>()
};
_appUser.DashboardStreams = Seed.DefaultStreams.ToList();
_appUser.SideNavStreams = Seed.DefaultSideNavStreams.ToList();
}
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> CheckIfAccessible(HttpRequest request);
Task<string> GenerateEmailLink(HttpRequest request, string token, string routePart, string email, bool withHost = true);
}
public class AccountService : IAccountService

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

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

11
openapi.json
View File

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