fix: load custom claim provider

Aguafrommars · Mar 23, 2022 · f8581f0 · f8581f0
1 parent 9b5599a
commit f8581f0
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/IdentityServer/Shared/Aguacongas.IdentityServer.Admin.Shared/Services/ProfileService.cs b/src/IdentityServer/Shared/Aguacongas.IdentityServer.Admin.Shared/Services/ProfileService.cs
@@ -142,12 +142,18 @@ protected virtual Task<IEnumerable<Claim>> GetClaimsFromResource(Resource resour
 
             if (provider == null)
             {
-                var path = resource.Properties[ProfileServiceProperties.ClaimProviderAssemblyPathKey];
-#pragma warning disable S3885 // "Assembly.Load" should be used
-                var assembly = Assembly.LoadFrom(path);
-#pragma warning restore S3885 // "Assembly.Load" should be used
-                var type = assembly.GetType(providerTypeName);
-                provider = Activator.CreateInstance(type) as IProvideClaims;
+                try
+                {
+                    var path = resource.Properties[ProfileServiceProperties.ClaimProviderAssemblyPathKey];
+                    var assembly = Assembly.LoadFile(path);
+                    var type = assembly.GetType(providerTypeName, true);
+                    provider = Activator.CreateInstance(type) as IProvideClaims;
+                }
+                catch(Exception e)
+                {
+                    Logger.LogError(e, e.Message);
+                    return Task.FromResult(Array.Empty<Claim>().AsEnumerable());
+                }
             }
 
             return provider.ProvideClaims(subject, client, caller, resource);