Skip to content

Commit b6d4938

Browse files
authored
v0.7.10.2 - Hotfix 2 (#2382)
1 parent cf1dc7d commit b6d4938

File tree

5 files changed

+17
-12
lines changed

5 files changed

+17
-12
lines changed

API/Controllers/AccountController.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,13 @@ public async Task<ActionResult<UserDto>> RegisterFirstUser(RegisterDto registerD
131131
var user = new AppUserBuilder(registerDto.Username, registerDto.Email,
132132
await _unitOfWork.SiteThemeRepository.GetDefaultTheme()).Build();
133133

134-
135134
var result = await _userManager.CreateAsync(user, registerDto.Password);
136135
if (!result.Succeeded) return BadRequest(result.Errors);
137136

137+
// Assign default streams
138+
user.DashboardStreams = Seed.DefaultStreams.ToList();
139+
user.SideNavStreams = Seed.DefaultSideNavStreams.ToList();
140+
138141
var token = await _userManager.GenerateEmailConfirmationTokenAsync(user);
139142
if (string.IsNullOrEmpty(token)) return BadRequest(await _localizationService.Get("en", "confirm-token-gen"));
140143
if (!await ConfirmEmailToken(token, user)) return BadRequest(await _localizationService.Get("en", "validate-email", token));
@@ -610,6 +613,11 @@ public async Task<ActionResult<string>> InviteUser(InviteUserDto dto)
610613
var result = await _userManager.CreateAsync(user, AccountService.DefaultPassword);
611614
if (!result.Succeeded) return BadRequest(result.Errors);
612615

616+
// Assign default streams
617+
user.DashboardStreams = Seed.DefaultStreams.ToList();
618+
user.SideNavStreams = Seed.DefaultSideNavStreams.ToList();
619+
620+
613621
// Assign Roles
614622
var roles = dto.Roles;
615623
var hasAdminRole = dto.Roles.Contains(PolicyConstants.AdminRole);
@@ -666,6 +674,7 @@ public async Task<ActionResult<string>> InviteUser(InviteUserDto dto)
666674
_logger.LogError(ex, "There was an error during invite user flow, unable to create user. Deleting user for retry");
667675
_unitOfWork.UserRepository.Delete(user);
668676
await _unitOfWork.CommitAsync();
677+
return BadRequest(await _localizationService.Translate(User.GetUserId(), "generic-invite-user"));
669678
}
670679

671680

API/Helpers/Builders/AppUserBuilder.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ public AppUserBuilder(string username, string email, SiteTheme? theme = null)
3232
DashboardStreams = new List<AppUserDashboardStream>(),
3333
SideNavStreams = new List<AppUserSideNavStream>()
3434
};
35-
_appUser.DashboardStreams = Seed.DefaultStreams.ToList();
36-
_appUser.SideNavStreams = Seed.DefaultSideNavStreams.ToList();
3735
}
3836

3937
public AppUserBuilder WithLibrary(Library library, bool createSideNavStream = false)

API/Services/AccountService.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public interface IAccountService
2727
Task<bool> HasChangeRestrictionRole(AppUser? user);
2828
Task<bool> CheckIfAccessible(HttpRequest request);
2929
Task<string> GenerateEmailLink(HttpRequest request, string token, string routePart, string email, bool withHost = true);
30+
3031
}
3132

3233
public class AccountService : IAccountService

Kavita.Common/Kavita.Common.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFramework>net7.0</TargetFramework>
55
<Company>kavitareader.com</Company>
66
<Product>Kavita</Product>
7-
<AssemblyVersion>0.7.10.1</AssemblyVersion>
7+
<AssemblyVersion>0.7.10.2</AssemblyVersion>
88
<NeutralLanguage>en</NeutralLanguage>
99
<TieredPGO>true</TieredPGO>
1010
</PropertyGroup>
@@ -21,4 +21,4 @@
2121
</ItemGroup>
2222

2323

24-
</Project>
24+
</Project>

openapi.json

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"name": "GPL-3.0",
88
"url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE"
99
},
10-
"version": "0.7.10.0"
10+
"version": "0.7.10.1"
1111
},
1212
"servers": [
1313
{
@@ -4251,20 +4251,17 @@
42514251
"content": {
42524252
"text/plain": {
42534253
"schema": {
4254-
"type": "integer",
4255-
"format": "int32"
4254+
"$ref": "#/components/schemas/ProgressDto"
42564255
}
42574256
},
42584257
"application/json": {
42594258
"schema": {
4260-
"type": "integer",
4261-
"format": "int32"
4259+
"$ref": "#/components/schemas/ProgressDto"
42624260
}
42634261
},
42644262
"text/json": {
42654263
"schema": {
4266-
"type": "integer",
4267-
"format": "int32"
4264+
"$ref": "#/components/schemas/ProgressDto"
42684265
}
42694266
}
42704267
}

0 commit comments

Comments
 (0)