Merge pull request #859 from colinin/fix-openiddict

fix(openiddict): rename AbpOpenIddictClaimsPrincipalManager
colinin · Aug 10, 2023 · 4ff0c71 · 4ff0c71
2 parents 76e60a7 + 1d6d62a
commit 4ff0c71
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.../LINGYUN.Abp.OpenIddict.Portal/LINGYUN/Abp/OpenIddict/Portal/PortalTokenExtensionGrant.cs b/.../LINGYUN.Abp.OpenIddict.Portal/LINGYUN/Abp/OpenIddict/Portal/PortalTokenExtensionGrant.cs
@@ -38,7 +38,7 @@ public class PortalTokenExtensionGrant : ITokenExtensionGrant
  protected SignInManager<IdentityUser> SignInManager => LazyServiceProvider.LazyGetRequiredService<SignInManager<IdentityUser>>();
  protected IdentityUserManager UserManager => LazyServiceProvider.LazyGetRequiredService<IdentityUserManager>();
  protected IOpenIddictScopeManager ScopeManager => LazyServiceProvider.LazyGetRequiredService<IOpenIddictScopeManager>();
- protected AbpOpenIddictClaimDestinationsManager OpenIddictClaimDestinationsManager => LazyServiceProvider.LazyGetRequiredService<AbpOpenIddictClaimDestinationsManager>();
+ protected AbpOpenIddictClaimsPrincipalManager OpenIddictClaimsPrincipalManager => LazyServiceProvider.LazyGetRequiredService<AbpOpenIddictClaimsPrincipalManager>();
  protected ILoggerFactory LoggerFactory => LazyServiceProvider.LazyGetRequiredService<ILoggerFactory>();
  protected ILogger Logger => LazyServiceProvider.LazyGetService<ILogger>(provider => LoggerFactory?.CreateLogger(GetType().FullName) ?? NullLogger.Instance);
  protected IServiceScopeFactory ServiceScopeFactory => LazyServiceProvider.LazyGetRequiredService<IServiceScopeFactory>();
@@ -269,7 +269,7 @@ protected virtual async Task<IActionResult> SetSuccessResultAsync(ExtensionGrant
  principal.SetScopes(context.Request.GetScopes());
  principal.SetResources(await GetResourcesAsync(context.Request.GetScopes()));
 
- await SetClaimsDestinationsAsync(principal);
+ await SetClaimsDestinationsAsync(context, principal);
 
  await IdentitySecurityLogManager.SaveAsync(
  new IdentitySecurityLogContext
@@ -314,9 +314,9 @@ protected virtual async Task<IEnumerable<string>> GetResourcesAsync(ImmutableArr
  return resources;
  }
 
- protected virtual async Task SetClaimsDestinationsAsync(ClaimsPrincipal principal)
+ protected virtual async Task SetClaimsDestinationsAsync(ExtensionGrantContext context, ClaimsPrincipal principal)
  {
- await OpenIddictClaimDestinationsManager.SetAsync(principal);
+ await OpenIddictClaimsPrincipalManager.HandleAsync(context.Request, principal);
  }
 
  public virtual ForbidResult Forbid(AuthenticationProperties properties, params string[] authenticationSchemes)