diff --git a/CHANGELOG.md b/CHANGELOG.md index c3df464f2..c927de4cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,19 +1,28 @@ # Changelog -## v3.0-beta1 - 2019-06-24 +## v3.0.0-beta2 - 2019-06-29 -This version contains many major breaking changes. Please read: https://docs.squidex.io/next/02-api-compatibility +### Features + +* **Content**: Editor for custom workflows. + +## v2.2.0 - 2019-06-29 -## Features +### Features + +* **Login**: Redirect to authentication provider automatically if only one provider is active. + +### Bugfixes -* **Contents**: Abstraction for content workflows. -* **API**: Hateaos implementation -* **API**: Full responseo of the resulting resource after PUT and POST. -* **UI**: Show correct elements based o npermissions. +* **GraphQL**: Fix a bug in styles that prevented to autocomplete to show properly + +## v3.0.0-beta1 - 2019-06-24 + +This version contains many major breaking changes. Please read: https://docs.squidex.io/next/02-api-compatibility ## v2.1.0 - 2019-06-22 -## Features +### Features * **Assets**: Parameter to prevent download in Browser. * **Assets**: FTP asset store. @@ -30,7 +39,7 @@ This version contains many major breaking changes. Please read: https://docs.squ * **UI**: Dropdown field for references. * **Users**: Email notifications when contributors is added. -## Bugfixes +### Bugfixes * **Contents**: Fix for scheduled publishing. * **GraphQL**: Fix query parameters for assets. @@ -41,11 +50,11 @@ This version contains many major breaking changes. Please read: https://docs.squ ## v2.0.5 - 2019-04-21 -## Features +### Features * **UI**: Sort content by clicking on the table header. -## Bugfixes +### Bugfixes * **UI**: Fix publish button in content context menu. diff --git a/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs b/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs index 0ced5abe7..7b2553554 100644 --- a/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs +++ b/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs @@ -198,6 +198,17 @@ namespace Squidex.Areas.IdentityServer.Controllers.Account var externalProviders = await signInManager.GetExternalProvidersAsync(); + if (externalProviders.Count == 1 && !allowPasswordAuth) + { + var provider = externalProviders[0].AuthenticationScheme; + + var properties = + signInManager.ConfigureExternalAuthenticationProperties(provider, + Url.Action(nameof(ExternalCallback), new { ReturnUrl = returnUrl })); + + return Challenge(properties, provider); + } + var vm = new LoginVM { ExternalProviders = externalProviders, @@ -242,7 +253,7 @@ namespace Squidex.Areas.IdentityServer.Controllers.Account var isLoggedIn = result.Succeeded; - UserWithClaims user = null; + UserWithClaims user; if (isLoggedIn) { diff --git a/src/Squidex/Areas/IdentityServer/Views/Account/Login.cshtml b/src/Squidex/Areas/IdentityServer/Views/Account/Login.cshtml index dd23d6a95..855d81fdd 100644 --- a/src/Squidex/Areas/IdentityServer/Views/Account/Login.cshtml +++ b/src/Squidex/Areas/IdentityServer/Views/Account/Login.cshtml @@ -87,15 +87,4 @@ else
-} - -@if (!Model.HasPasswordAuth && Model.ExternalProviders.Count == 1) -{ - } \ No newline at end of file