Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-02-17 02:01:53 +01:00
Code Issues Projects Releases Wiki Activity

persist login. allow log out

Browse Source
This commit is contained in:
Kyle Spearrin 2018-03-23 10:12:09 -04:00
parent 1b313e6df4
commit 0d12cf9217
5 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Admin/Controllers/LoginController.cs
View File

@ -40,7 +40,7 @@ namespace Bit.Admin.Controllers
public async Task<IActionResult> Confirm(string email, string token, string returnUrl)
{
var result = await _signInManager.PasswordlessSignInAsync(email, token, false);
var result = await _signInManager.PasswordlessSignInAsync(email, token, true);
if(!result.Succeeded)
{
// TODO: error?
@ -54,5 +54,13 @@ namespace Bit.Admin.Controllers
return RedirectToAction("Index", "Home");
}
[HttpPost]
[ValidateAntiForgeryToken]
public async Task<IActionResult> Logout()
{
await _signInManager.SignOutAsync();
return RedirectToAction("Index");
}
}
}

2
src/Admin/Startup.cs
View File

@ -4,11 +4,9 @@ using Bit.Core.Identity;
using Bit.Core.Utilities;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Logging;
using Serilog.Events;
using Stripe;

13
src/Admin/Views/Shared/_Layout.cshtml
View File

@ -1,4 +1,5 @@
<!DOCTYPE html>
@inject SignInManager<IdentityUser> SignInManager
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
@ -39,6 +40,16 @@
<a class="nav-link" asp-controller="Organizations" asp-action="Index">Organizations</a>
</li>
</ul>
@if(SignInManager.IsSignedIn(User))
{
<form asp-controller="Login" asp-action="Logout" method="post">
<button type="submit" class="btn btn-secondary">Log Out</button>
</form>
}
else
{
<a class="btn btn-secondary" asp-controller="Login" asp-action="Index">Log In</a>
}
</div>
</div>
</nav>

1
src/Admin/Views/_ViewImports.cshtml
View File

@ -1,3 +1,4 @@
@using Microsoft.AspNetCore.Identity
@using Bit.Admin
@using Bit.Admin.Models
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

2
src/Core/Utilities/ServiceCollectionExtensions.cs
View File

@ -223,7 +223,7 @@ namespace Bit.Core.Utilities
options.AccessDeniedPath = "/login?accessDenied=1";
options.Cookie.Name = $"Bitwarden_{globalSettings.ProjectName}";
options.Cookie.HttpOnly = true;
options.ExpireTimeSpan = TimeSpan.FromMinutes(60);
options.Cookie.Expiration = options.ExpireTimeSpan = TimeSpan.FromDays(2);
options.ReturnUrlParameter = "returnUrl";
options.SlidingExpiration = true;
});