Browse Source
Merge pull request #13600 from abpframework/auto-merge/rel-6-0/1254
Merge branch dev with rel-6.0
pull/13611/head
maliming
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
2 deletions
-
modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/TokenController.cs
-
modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo/Abp/OpenIddict/Controllers/UserInfoController.cs
|
|
|
@ -1,5 +1,4 @@ |
|
|
|
using System.Linq; |
|
|
|
using System.Threading.Tasks; |
|
|
|
using System.Threading.Tasks; |
|
|
|
using Microsoft.AspNetCore.Mvc; |
|
|
|
using Microsoft.Extensions.DependencyInjection; |
|
|
|
using Microsoft.Extensions.Options; |
|
|
|
@ -9,6 +8,7 @@ using Volo.Abp.OpenIddict.ExtensionGrantTypes; |
|
|
|
namespace Volo.Abp.OpenIddict.Controllers; |
|
|
|
|
|
|
|
[Route("connect/token")] |
|
|
|
[IgnoreAntiforgeryToken] |
|
|
|
[ApiExplorerSettings(IgnoreApi = true)] |
|
|
|
public partial class TokenController : AbpOpenIdDictControllerBase |
|
|
|
{ |
|
|
|
|
|
|
|
@ -11,6 +11,7 @@ using Volo.Abp.Security.Claims; |
|
|
|
namespace Volo.Abp.OpenIddict.Controllers; |
|
|
|
|
|
|
|
[Route("connect/userinfo")] |
|
|
|
[IgnoreAntiforgeryToken] |
|
|
|
[Authorize(AuthenticationSchemes = OpenIddictServerAspNetCoreDefaults.AuthenticationScheme)] |
|
|
|
[ApiExplorerSettings(IgnoreApi = true)] |
|
|
|
public class UserInfoController : AbpOpenIdDictControllerBase |
|
|
|
|