diff --git a/src/Squidex/Controllers/UI/Account/AccountController.cs b/src/Squidex/Controllers/UI/Account/AccountController.cs index 1ade73ac1..346b12ad6 100644 --- a/src/Squidex/Controllers/UI/Account/AccountController.cs +++ b/src/Squidex/Controllers/UI/Account/AccountController.cs @@ -59,14 +59,20 @@ namespace Squidex.Controllers.UI.Account this.identityOptions = identityOptions; this.signInManager = signInManager; } - - [Authorize] + [HttpGet] [Route("account/forbidden")] public IActionResult Forbidden() { return View("Error"); } + + [HttpGet] + [Route("account/accessdenied")] + public IActionResult AccessDenied() + { + return View("LockedOut"); + } [HttpGet] [Route("client-callback-silent/")] @@ -223,16 +229,9 @@ namespace Squidex.Controllers.UI.Account var user = new IdentityUser { Email = mail, UserName = mail }; - var pictureUrl = externalLogin.Principal.Claims.FirstOrDefault(x => x.Type == SquidexClaimTypes.SquidexPictureUrl); - if (pictureUrl != null) - { - user.AddClaim(pictureUrl); - } - - var displayName = externalLogin.Principal.Claims.FirstOrDefault(x => x.Type == SquidexClaimTypes.SquidexDisplayName); - if (displayName != null) + foreach (var squidexClaim in externalLogin.Principal.Claims.Where(c => c.Type.StartsWith(SquidexClaimTypes.Prefix))) { - user.AddClaim(displayName); + user.AddClaim(squidexClaim); } return user; diff --git a/src/Squidex/Squidex.csproj b/src/Squidex/Squidex.csproj index 5c1d938d0..1e9aa1fd5 100644 --- a/src/Squidex/Squidex.csproj +++ b/src/Squidex/Squidex.csproj @@ -10,10 +10,12 @@ Squidex $(PackageTargetFallback);dnxcore50 1.1.0 + true + PreserveNewest @@ -66,5 +68,5 @@ - + diff --git a/src/Squidex/Views/Account/ClientPopup.cshtml b/src/Squidex/Views/Account/ClientPopup.cshtml index 76a110915..a82fc3012 100644 --- a/src/Squidex/Views/Account/ClientPopup.cshtml +++ b/src/Squidex/Views/Account/ClientPopup.cshtml @@ -1,12 +1,15 @@  - - - + - + new Oidc.UserManager().signinPopupCallback(); + + diff --git a/src/Squidex/Views/Account/ClientSilent.cshtml b/src/Squidex/Views/Account/ClientSilent.cshtml index 231806b2c..c7c6e9bec 100644 --- a/src/Squidex/Views/Account/ClientSilent.cshtml +++ b/src/Squidex/Views/Account/ClientSilent.cshtml @@ -1,12 +1,15 @@  - - - + - + new Oidc.UserManager().signinSilentCallback(); + + diff --git a/src/Squidex/Views/Account/Error.cshtml b/src/Squidex/Views/Account/Error.cshtml index 7a60c5c85..9a15c6693 100644 --- a/src/Squidex/Views/Account/Error.cshtml +++ b/src/Squidex/Views/Account/Error.cshtml @@ -2,16 +2,8 @@ Squidex - Login failed - - + +

Login failed

diff --git a/src/Squidex/Views/Account/LockedOut.cshtml b/src/Squidex/Views/Account/LockedOut.cshtml index dd3cc8304..c9ba77580 100644 --- a/src/Squidex/Views/Account/LockedOut.cshtml +++ b/src/Squidex/Views/Account/LockedOut.cshtml @@ -3,15 +3,7 @@ Squidex - Account locked - +

Account locked

diff --git a/src/Squidex/Views/Account/Login.cshtml b/src/Squidex/Views/Account/Login.cshtml index 464f828f2..8a48920d2 100644 --- a/src/Squidex/Views/Account/Login.cshtml +++ b/src/Squidex/Views/Account/Login.cshtml @@ -7,12 +7,8 @@ Squidex - Login - - + +
@@ -20,7 +16,7 @@

@foreach (var provider in Model.ExternalProviders) { - + }

diff --git a/src/Squidex/appsettings.json b/src/Squidex/appsettings.json index 50170131d..c97e21e19 100644 --- a/src/Squidex/appsettings.json +++ b/src/Squidex/appsettings.json @@ -25,7 +25,8 @@ }, "identity": { "googleClient": "1006817248705-t3lb3ge808m9am4t7upqth79hulk456l.apps.googleusercontent.com", - "googleSecret": "QsEi-fHqkGw2_PjJmtNHf2wg" + "googleSecret": "QsEi-fHqkGw2_PjJmtNHf2wg", + "lockAutomatically": true }, "handleEvents": true } diff --git a/src/Squidex/wwwroot/index.html b/src/Squidex/wwwroot/index.html index 0018360d2..f16e0462d 100644 --- a/src/Squidex/wwwroot/index.html +++ b/src/Squidex/wwwroot/index.html @@ -8,46 +8,7 @@ - +