Skip to content

Commit e20bc7d

Browse files
wuweilaiyaMayue
wuweilaiya
and
Mayue
authored
feature(oidc):add Oidc.EntityFramework、Oidc.Cache.Storage (#78)
* add oidc project * feat(oidc):oidc * feat(oidc):oidc * feat(oidc):oidc * feat(oidc):oidc * feat(oidc):oidc * feat(oidc):oidc * feat(oidc):oidc * feat(oidc):oidc * feat:add redis cache options * feat(oidc):oidc * feat(oidc):oidc * feat(oidc):oidc * feat:update cache * feat(oidc):oidc * feat(oidc)Loidc * feat(oidc):oidc * feat(oidc):oidc * refactor:formatting code * feat(oidc):remove AddAllAsync,add ResetAsync * refactor(code):refactor code * refactor:refactor code * refactor:refactor code * refactor:refactor code * refactor(code):refactor code * merge:merges the latest code in the main branch Co-authored-by: Mayue <mayue@lonsid.cn>
1 parent 5bcedfb commit e20bc7d

File tree

53 files changed

+1822
-48
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1822
-48
lines changed

‎Masa.Contrib.sln

+120-47
Large diffs are not rendered by default.

‎src/Authentication/Masa.Contrib.Authentication.Oidc.Cache.Storage/Masa.Contrib.Authentication.Oidc.Cache.Storage.csproj

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
7+
<WarningsAsErrors>
8+
$(WarningsAsErrors);CS8600;CS8601;CS8602;CS8603;CS8604;CS8609;CS8610;CS8614;CS8616;CS8618;CS8619;CS8620;CS8622;CS8625
9+
</WarningsAsErrors>
10+
</PropertyGroup>
11+
12+
<ItemGroup>
13+
<PackageReference Include="Masa.Utils.Caching.DistributedMemory" Version="$(MasaUtilsPackageVersion)" />
14+
<PackageReference Include="Masa.Utils.Caching.Redis" Version="$(MasaUtilsPackageVersion)" />
15+
</ItemGroup>
16+
17+
<ItemGroup>
18+
<ProjectReference Include="..\..\BuildingBlocks\MASA.BuildingBlocks\src\Authentication\Masa.BuildingBlocks.Authentication.Oidc.Storage\Masa.BuildingBlocks.Authentication.Oidc.Storage.csproj" />
19+
<ProjectReference Include="..\Masa.Contrib.Authentication.Oidc.Cache\Masa.Contrib.Authentication.Oidc.Cache.csproj" />
20+
</ItemGroup>
21+
22+
</Project>

‎src/Authentication/Masa.Contrib.Authentication.Oidc.Cache.Storage/ServiceCollectionExtensions.cs

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// Copyright (c) MASA Stack All rights reserved.
2+
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
3+
4+
namespace Masa.Contrib.Authentication.Oidc.Cache.Storage;
5+
6+
public static class ServiceCollectionExtensions
7+
{
8+
public static IServiceCollection AddOidcCacheStorage(this IServiceCollection services, RedisConfigurationOptions options)
9+
{
10+
services.AddOidcCache(options);
11+
services.AddSingleton<IClientStore, ClientStore>();
12+
services.AddSingleton<IResourceStore, ResourceStore>();
13+
services.AddSingleton<IPersistedGrantStore, PersistedGrantStore>();
14+
services.AddSingleton<IDeviceFlowStore, DeviceFlowStore>();
15+
16+
return services;
17+
}
18+
}

‎src/Authentication/Masa.Contrib.Authentication.Oidc.Cache.Storage/Stores/ClientStore.cs

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Copyright (c) MASA Stack All rights reserved.
2+
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
3+
4+
namespace Masa.Contrib.Authentication.Oidc.Cache.Storage.Stores;
5+
6+
public class ClientStore : IClientStore
7+
{
8+
IClientCache _clientCache;
9+
10+
public ClientStore(IClientCache clientCache)
11+
{
12+
_clientCache = clientCache;
13+
}
14+
15+
public async Task<ClientModel?> FindClientByIdAsync(string clientId)
16+
{
17+
ArgumentNullException.ThrowIfNull(clientId);
18+
19+
var client = await _clientCache.GetAsync(clientId);
20+
return client;
21+
}
22+
}

‎src/Authentication/Masa.Contrib.Authentication.Oidc.Cache.Storage/Stores/DeviceFlowStore.cs

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// Copyright (c) MASA Stack All rights reserved.
2+
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
3+
4+
namespace Masa.Contrib.Authentication.Oidc.Cache.Storage.Stores;
5+
6+
public class DeviceFlowStore : IDeviceFlowStore
7+
{
8+
public Task<DeviceCodeModel> FindByDeviceCodeAsync(string deviceCode)
9+
{
10+
throw new NotImplementedException();
11+
}
12+
13+
public Task<DeviceCodeModel> FindByUserCodeAsync(string userCode)
14+
{
15+
throw new NotImplementedException();
16+
}
17+
18+
public Task RemoveByDeviceCodeAsync(string deviceCode)
19+
{
20+
throw new NotImplementedException();
21+
}
22+
23+
public Task StoreDeviceAuthorizationAsync(string deviceCode, string userCode, DeviceCodeModel data)
24+
{
25+
throw new NotImplementedException();
26+
}
27+
28+
public Task UpdateByUserCodeAsync(string userCode, DeviceCodeModel data)
29+
{
30+
throw new NotImplementedException();
31+
}
32+
}

‎src/Authentication/Masa.Contrib.Authentication.Oidc.Cache.Storage/Stores/PersistedGrantStore.cs

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// Copyright (c) MASA Stack All rights reserved.
2+
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
3+
4+
namespace Masa.Contrib.Authentication.Oidc.Cache.Storage.Stores;
5+
6+
public class PersistedGrantStore : IPersistedGrantStore
7+
{
8+
public Task<IEnumerable<PersistedGrantModel>> GetAllAsync(PersistedGrantFilter filter)
9+
{
10+
throw new NotImplementedException();
11+
}
12+
13+
public Task<PersistedGrantModel> GetAsync(string key)
14+
{
15+
throw new NotImplementedException();
16+
}
17+
18+
public Task RemoveAllAsync(PersistedGrantFilter filter)
19+
{
20+
throw new NotImplementedException();
21+
}
22+
23+
public Task RemoveAsync(string key)
24+
{
25+
throw new NotImplementedException();
26+
}
27+
28+
public Task StoreAsync(PersistedGrantModel grant)
29+
{
30+
throw new NotImplementedException();
31+
}
32+
}

‎src/Authentication/Masa.Contrib.Authentication.Oidc.Cache.Storage/Stores/ResourceStore.cs

+58
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
// Copyright (c) MASA Stack All rights reserved.
2+
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
3+
4+
namespace Masa.Contrib.Authentication.Oidc.Cache.Storage.Stores;
5+
6+
public class ResourceStore : IResourceStore
7+
{
8+
IIdentityResourceCache _identityResourceCache;
9+
IApiResourceCache _apiResourceCache;
10+
IApiScopeCache _apiScopeCache;
11+
12+
public ResourceStore(IIdentityResourceCache identityResourceCache, IApiResourceCache apiResourceCache, IApiScopeCache apiScopeCache)
13+
{
14+
_identityResourceCache = identityResourceCache;
15+
_apiResourceCache = apiResourceCache;
16+
_apiScopeCache = apiScopeCache;
17+
}
18+
19+
public async Task<IEnumerable<ApiResourceModel>> FindApiResourcesByNameAsync(IEnumerable<string> apiResourceNames)
20+
{
21+
ArgumentNullException.ThrowIfNull(apiResourceNames);
22+
23+
return await _apiResourceCache.GetListAsync(apiResourceNames);
24+
}
25+
26+
public async Task<IEnumerable<ApiResourceModel>> FindApiResourcesByScopeNameAsync(IEnumerable<string> scopeNames)
27+
{
28+
ArgumentNullException.ThrowIfNull(scopeNames);
29+
30+
var apiResources = await _apiResourceCache.GetListAsync();
31+
return apiResources.Where(apiResource => apiResource.Scopes?.Any(scope => scopeNames.Contains(scope)) is true);
32+
}
33+
34+
public async Task<IEnumerable<ApiScopeModel>> FindApiScopesByNameAsync(IEnumerable<string> scopeNames)
35+
{
36+
ArgumentNullException.ThrowIfNull(scopeNames);
37+
38+
var apiScopes = await _apiScopeCache.GetListAsync(scopeNames);
39+
return apiScopes;
40+
}
41+
42+
public async Task<IEnumerable<IdentityResourceModel>> FindIdentityResourcesByScopeNameAsync(IEnumerable<string> scopeNames)
43+
{
44+
ArgumentNullException.ThrowIfNull(scopeNames);
45+
46+
var identityResources = await _identityResourceCache.GetListAsync(scopeNames);
47+
return identityResources;
48+
}
49+
50+
public async Task<ResourcesModel> GetAllResourcesAsync()
51+
{
52+
var identityResources = await _identityResourceCache.GetListAsync();
53+
var apiScopes = await _apiScopeCache.GetListAsync();
54+
var apiResources = await _apiResourceCache.GetListAsync();
55+
var resources = new ResourcesModel(identityResources, apiResources, apiScopes);
56+
return resources;
57+
}
58+
}

‎src/Authentication/Masa.Contrib.Authentication.Oidc.Cache.Storage/_Imports.cs

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// Copyright (c) MASA Stack All rights reserved.
2+
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
3+
4+
global using Masa.BuildingBlocks.Authentication.Oidc.Cache.Caches;
5+
global using Masa.BuildingBlocks.Authentication.Oidc.Models.Models;
6+
global using Masa.BuildingBlocks.Authentication.Oidc.Storage.Stores;
7+
global using Masa.Contrib.Authentication.Oidc.Cache.Storage.Stores;
8+
global using Microsoft.Extensions.DependencyInjection;
9+
global using Masa.Utils.Caching.Redis.Models;

‎src/Authentication/Masa.Contrib.Authentication.Oidc.Cache/Caches/ApiResourceCache.cs

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
// Copyright (c) MASA Stack All rights reserved.
2+
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
3+
4+
namespace Masa.Contrib.Authentication.Oidc.Cache.Caches;
5+
6+
public class ApiResourceCache : IApiResourceCache
7+
{
8+
IMemoryCacheClient _memoryCacheClient;
9+
10+
public ApiResourceCache(IMemoryCacheClient memoryCacheClient)
11+
{
12+
_memoryCacheClient = memoryCacheClient;
13+
}
14+
15+
public async Task<List<ApiResourceModel>> GetListAsync(IEnumerable<string> names)
16+
{
17+
var keys = names.Select(name => $"{CacheKeyConstants.API_RESOURCE_KEY}_{name}");
18+
var apiResources = await _memoryCacheClient.GetListAsync<ApiResourceModel>(keys.ToArray());
19+
return apiResources.Where(i => i is not null).ToList()!;
20+
}
21+
22+
public async Task<List<ApiResourceModel>> GetListAsync()
23+
{
24+
var apiResources = await _memoryCacheClient.GetAsync<List<ApiResourceModel>>(CacheKeyConstants.API_RESOURCE_KEY) ?? new();
25+
return apiResources;
26+
}
27+
28+
public async Task SetAsync(ApiResource apiResource)
29+
{
30+
var model = apiResource.ToModel();
31+
string key = $"{CacheKeyConstants.API_RESOURCE_KEY}_{apiResource.Name}";
32+
await _memoryCacheClient.SetAsync(key, model);
33+
// update list cache
34+
var list = await GetListAsync();
35+
list.Set(model, item => item.Name);
36+
await UpdateListAsync(list);
37+
}
38+
39+
public async Task SetRangeAsync(IEnumerable<ApiResource> apiResources)
40+
{
41+
var models = apiResources.Select(apiScope => apiScope.ToModel());
42+
var map = models.ToDictionary(model => $"{CacheKeyConstants.API_RESOURCE_KEY}_{model.Name}", model => model);
43+
await _memoryCacheClient.SetListAsync(map);
44+
// update list cache
45+
var list = await GetListAsync();
46+
list.SetRange(models, item => item.Name);
47+
await UpdateListAsync(list);
48+
}
49+
50+
public async Task RemoveAsync(ApiResource apiResource)
51+
{
52+
string key = $"{CacheKeyConstants.API_RESOURCE_KEY}_{apiResource.Name}";
53+
await _memoryCacheClient.RemoveAsync<ApiResourceModel>(key);
54+
// update list cache
55+
var list = await GetListAsync();
56+
list.Remove(item => item.Name == apiResource.Name);
57+
await UpdateListAsync(list);
58+
}
59+
60+
public async Task ResetAsync(IEnumerable<ApiResource> apiResources)
61+
{
62+
var models = apiResources.Select(apiScope => apiScope.ToModel());
63+
await UpdateListAsync(models);
64+
var map = models.ToDictionary(model => $"{CacheKeyConstants.API_RESOURCE_KEY}_{model.Name}", model => model);
65+
await _memoryCacheClient.SetListAsync(map);
66+
}
67+
68+
private async Task UpdateListAsync(IEnumerable<ApiResourceModel> models)
69+
{
70+
await _memoryCacheClient.SetAsync(CacheKeyConstants.API_RESOURCE_KEY, models);
71+
}
72+
}

‎src/Authentication/Masa.Contrib.Authentication.Oidc.Cache/Caches/ApiScopeCache.cs

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
// Copyright (c) MASA Stack All rights reserved.
2+
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
3+
4+
namespace Masa.Contrib.Authentication.Oidc.Cache.Caches;
5+
6+
public class ApiScopeCache : IApiScopeCache
7+
{
8+
IMemoryCacheClient _memoryCacheClient;
9+
10+
public ApiScopeCache(IMemoryCacheClient memoryCacheClient)
11+
{
12+
_memoryCacheClient = memoryCacheClient;
13+
}
14+
15+
public async Task<List<ApiScopeModel>> GetListAsync(IEnumerable<string> names)
16+
{
17+
var keys = names.Select(name => $"{CacheKeyConstants.API_SCOPE_KEY}_{name}");
18+
var apiScopes = await _memoryCacheClient.GetListAsync<ApiScopeModel>(keys.ToArray());
19+
return apiScopes.Where(i => i is not null).ToList()!;
20+
}
21+
22+
public async Task<List<ApiScopeModel>> GetListAsync()
23+
{
24+
var ApiScopes = await _memoryCacheClient.GetAsync<List<ApiScopeModel>>(CacheKeyConstants.API_SCOPE_KEY) ?? new();
25+
return ApiScopes;
26+
}
27+
28+
public async Task SetAsync(ApiScope apiScope)
29+
{
30+
string key = $"{CacheKeyConstants.API_SCOPE_KEY}_{apiScope.Name}";
31+
var model = apiScope.ToModel();
32+
await _memoryCacheClient.SetAsync(key, model);
33+
// update list cache
34+
var list = await GetListAsync();
35+
list.Set(model, item => item.Name);
36+
await UpdateListAsync(list);
37+
}
38+
39+
public async Task SetRangeAsync(IEnumerable<ApiScope> apiScopes)
40+
{
41+
var models = apiScopes.Select(apiScope => apiScope.ToModel());
42+
var data = models.ToDictionary(model => $"{CacheKeyConstants.API_SCOPE_KEY}_{model.Name}", model => model);
43+
await _memoryCacheClient.SetListAsync(data);
44+
// update list cache
45+
var list = await GetListAsync();
46+
list.SetRange(models, item => item.Name);
47+
await UpdateListAsync(list);
48+
}
49+
50+
public async Task RemoveAsync(ApiScope apiScope)
51+
{
52+
string key = $"{CacheKeyConstants.API_SCOPE_KEY}_{apiScope.Name}";
53+
await _memoryCacheClient.RemoveAsync<ApiScopeModel>(key);
54+
// update list cache
55+
var list = await GetListAsync();
56+
list.Remove(item => item.Name == apiScope.Name);
57+
await UpdateListAsync(list);
58+
}
59+
60+
public async Task ResetAsync(IEnumerable<ApiScope> apiScopes)
61+
{
62+
var models = apiScopes.Select(apiScope => apiScope.ToModel());
63+
await UpdateListAsync(models);
64+
var map = models.ToDictionary(model => $"{CacheKeyConstants.API_SCOPE_KEY}_{model.Name}", model => model);
65+
await _memoryCacheClient.SetListAsync(map);
66+
}
67+
68+
private async Task UpdateListAsync(IEnumerable<ApiScopeModel> models)
69+
{
70+
await _memoryCacheClient.SetAsync(CacheKeyConstants.API_SCOPE_KEY, models);
71+
}
72+
}

‎src/Authentication/Masa.Contrib.Authentication.Oidc.Cache/Caches/ClientCache.cs

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
// Copyright (c) MASA Stack All rights reserved.
2+
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.
3+
4+
namespace Masa.Contrib.Authentication.Oidc.Cache.Caches;
5+
6+
public class ClientCache : IClientCache
7+
{
8+
IMemoryCacheClient _memoryCacheClient;
9+
10+
public ClientCache(IMemoryCacheClient memoryCacheClient)
11+
{
12+
_memoryCacheClient = memoryCacheClient;
13+
}
14+
15+
public async Task<ClientModel?> GetAsync(string clientId)
16+
{
17+
string key = $"{CacheKeyConstants.CLIENT_KEY}_{clientId}";
18+
return await _memoryCacheClient.GetAsync<ClientModel>(key);
19+
}
20+
21+
public async Task SetAsync(Client client)
22+
{
23+
string key = $"{CacheKeyConstants.CLIENT_KEY}_{client.ClientId}";
24+
await _memoryCacheClient.SetAsync(key, client.ToModel());
25+
}
26+
27+
public async Task RemoveAsync(Client client)
28+
{
29+
string key = $"{CacheKeyConstants.CLIENT_KEY}_{client.ClientId}";
30+
await _memoryCacheClient.RemoveAsync<ClientModel>(key);
31+
}
32+
33+
public async Task SetRangeAsync(IEnumerable<Client> clients)
34+
{
35+
var data = clients.ToDictionary(client => $"{CacheKeyConstants.CLIENT_KEY}_{client.ClientId}", client => client.ToModel());
36+
await _memoryCacheClient.SetListAsync(data);
37+
}
38+
}

0 commit comments

Comments
 (0)