yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/10.1.1' into v10/dev

Browse Source 
# Conflicts:
#	version.json
This commit is contained in:
Nikolaj
2022-09-07 09:17:07 +02:00
parent 9a2ead4381 7b00c0d3e9
commit d8fafcfeeb
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web.BackOffice/Install/InstallApiController.cs
View File

@@ -87,11 +87,15 @@ public class InstallApiController : ControllerBase
[HttpPost]
public async Task<ActionResult> CompleteInstall()
{
RuntimeLevel levelBeforeRestart = _runtime.State.Level;
await _runtime.RestartAsync();
BackOfficeIdentityUser identityUser =
await _backOfficeUserManager.FindByIdAsync(Constants.Security.SuperUserIdAsString);
_backOfficeSignInManager.SignInAsync(identityUser, false);
if (levelBeforeRestart == RuntimeLevel.Install)
{
BackOfficeIdentityUser identityUser = await _backOfficeUserManager.FindByIdAsync(Core.Constants.Security.SuperUserIdAsString);
_backOfficeSignInManager.SignInAsync(identityUser, false);
}
return NoContent();
}