imhven
/
abp
mirror of https://github.com/abpframework/abp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IdentityServer Client improvements

Browse Source
pull/705/head
Halil ibrahim Kalkan 7 years ago
parent b770d204ec
commit 20ae2c5633
4 changed files with 65 additions and 49 deletions
Show Stats Download Patch File Download Diff File

10
modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/Client.cs
Unescape View File

@ -163,11 +163,21 @@ namespace Volo.Abp.IdentityServer.Clients
ClientSecrets.Add(new ClientSecret(Id, value, expiration, type, description));
}
public virtual void RemoveSecret([NotNull] string value, string type = IdentityServerConstants.SecretTypes.SharedSecret)
{
ClientSecrets.RemoveAll(s => s.Value == value && s.Type == type);
}
public virtual void RemoveAllSecrets()
{
ClientSecrets.Clear();
}
public virtual ClientSecret FindSecret([NotNull] string value, string type = IdentityServerConstants.SecretTypes.SharedSecret)
{
return ClientSecrets.FirstOrDefault(s => s.Type == type && s.Value == value);
}
public virtual void AddScope([NotNull] string scope)
{
AllowedScopes.Add(new ClientScope(Id, scope));

5
modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Clients/ClientSecret.cs
Unescape View File

@ -28,6 +28,11 @@ namespace Volo.Abp.IdentityServer.Clients
ClientId = clientId;
}
public virtual bool Equals(Guid clientId, [NotNull] string value, string type = IdentityServerConstants.SecretTypes.SharedSecret)
{
return ClientId == clientId && Value == value && Type == type;
}
public override object[] GetKeys()
{
return new object[] { ClientId, Type, Value };

1
modules/identityserver/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Secret.cs
Unescape View File

@ -1,5 +1,6 @@
using System;
using IdentityServer4;
using IdentityServer4.Models;
using JetBrains.Annotations;
using Volo.Abp.Domain.Entities;

98
modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/Clients/ClientRepository.cs
Unescape View File

@ -42,74 +42,74 @@ namespace Volo.Abp.IdentityServer.Clients
return await DbSet.CountAsync();
}
public override async Task<Client> UpdateAsync(Client entity, bool autoSave = false, CancellationToken cancellationToken = default)
{
//public override async Task<Client> UpdateAsync(Client entity, bool autoSave = false, CancellationToken cancellationToken = default)
//{
var secrets = DbContext.Set<ClientSecret>().Where(s => s.ClientId == entity.Id);
// var secrets = DbContext.Set<ClientSecret>().Where(s => s.ClientId == entity.Id);
foreach (var secret in secrets)
{
DbContext.Set<ClientSecret>().Remove(secret);
}
// foreach (var secret in secrets)
// {
// DbContext.Set<ClientSecret>().Remove(secret);
// }
var claims = DbContext.Set<ClientClaim>().Where(s => s.ClientId == entity.Id);
// var claims = DbContext.Set<ClientClaim>().Where(s => s.ClientId == entity.Id);
foreach (var claim in claims)
{
DbContext.Set<ClientClaim>().Remove(claim);
}
// foreach (var claim in claims)
// {
// DbContext.Set<ClientClaim>().Remove(claim);
// }
var grantTypes = DbContext.Set<ClientGrantType>().Where(s => s.ClientId == entity.Id);
// var grantTypes = DbContext.Set<ClientGrantType>().Where(s => s.ClientId == entity.Id);
foreach (var grantType in grantTypes)
{
DbContext.Set<ClientGrantType>().Remove(grantType);
}
// foreach (var grantType in grantTypes)
// {
// DbContext.Set<ClientGrantType>().Remove(grantType);
// }
var restrictions = DbContext.Set<ClientIdPRestriction>().Where(s => s.ClientId == entity.Id);
// var restrictions = DbContext.Set<ClientIdPRestriction>().Where(s => s.ClientId == entity.Id);
foreach (var restriction in restrictions)
{
DbContext.Set<ClientIdPRestriction>().Remove(restriction);
}
// foreach (var restriction in restrictions)
// {
// DbContext.Set<ClientIdPRestriction>().Remove(restriction);
// }
var properties = DbContext.Set<ClientProperty>().Where(s => s.ClientId == entity.Id);
// var properties = DbContext.Set<ClientProperty>().Where(s => s.ClientId == entity.Id);
foreach (var clientProperty in properties)
{
DbContext.Set<ClientProperty>().Remove(clientProperty);
}
// foreach (var clientProperty in properties)
// {
// DbContext.Set<ClientProperty>().Remove(clientProperty);
// }
var scopes = DbContext.Set<ClientScope>().Where(s => s.ClientId == entity.Id);
// var scopes = DbContext.Set<ClientScope>().Where(s => s.ClientId == entity.Id);
foreach (var scope in scopes)
{
DbContext.Set<ClientScope>().Remove(scope);
}
// foreach (var scope in scopes)
// {
// DbContext.Set<ClientScope>().Remove(scope);
// }
var corsOrigins = DbContext.Set<ClientCorsOrigin>().Where(s => s.ClientId == entity.Id);
// var corsOrigins = DbContext.Set<ClientCorsOrigin>().Where(s => s.ClientId == entity.Id);
foreach (var corsOrigin in corsOrigins)
{
DbContext.Set<ClientCorsOrigin>().Remove(corsOrigin);
}
// foreach (var corsOrigin in corsOrigins)
// {
// DbContext.Set<ClientCorsOrigin>().Remove(corsOrigin);
// }
var redirectUris = DbContext.Set<ClientRedirectUri>().Where(s => s.ClientId == entity.Id);
// var redirectUris = DbContext.Set<ClientRedirectUri>().Where(s => s.ClientId == entity.Id);
foreach (var redirectUri in redirectUris)
{
DbContext.Set<ClientRedirectUri>().Remove(redirectUri);
}
// foreach (var redirectUri in redirectUris)
// {
// DbContext.Set<ClientRedirectUri>().Remove(redirectUri);
// }
var postLogoutRedirectUris = DbContext.Set<ClientPostLogoutRedirectUri>().Where(s => s.ClientId == entity.Id);
// var postLogoutRedirectUris = DbContext.Set<ClientPostLogoutRedirectUri>().Where(s => s.ClientId == entity.Id);
foreach (var postLogoutRedirectUri in postLogoutRedirectUris)
{
DbContext.Set<ClientPostLogoutRedirectUri>().Remove(postLogoutRedirectUri);
}
// foreach (var postLogoutRedirectUri in postLogoutRedirectUris)
// {
// DbContext.Set<ClientPostLogoutRedirectUri>().Remove(postLogoutRedirectUri);
// }
return await base.UpdateAsync(entity, autoSave, cancellationToken);
}
// return await base.UpdateAsync(entity, autoSave, cancellationToken);
//}
public override IQueryable<Client> WithDetails()
{

Write Preview
Loading…
Cancel
Save