Skip to content

Feat/update entity adapt persisted grant db context #757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Qinyouzeng merged 6 commits into from
Mar 4, 2026
+6 −16
Merged

Feat/update entity adapt persisted grant db context #757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
57fa5ce
调整SessionId和Description为可空字符串类型
MayueCif Mar 4, 2026
fb31b9e
移除DeviceFlowCodes与PersistedGrant的聚合根继承
MayueCif Mar 4, 2026
d0e8b93
Merge branch 'main' into feat/update_entity_adapt_PersistedGrantDbCon…
MayueCif Mar 4, 2026
9a61761
移除DeviceFlowCodes和PersistedGrant的命名空间
MayueCif Mar 4, 2026
cfd79bc
简化PersistedGrant实体配置及调整命名空间
MayueCif Mar 4, 2026
7db3fc9
调整DeviceFlowCodes实体配置及版权声明
MayueCif Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ...nnect/Masa.BuildingBlocks.Authentication.OpenIdConnect.Domain/Entities/DeviceFlowCodes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.BuildingBlocks.Authentication.OpenIdConnect.Domain.Entities;

public class DeviceFlowCodes : FullAggregateRoot<Guid, Guid>
public class DeviceFlowCodes
Copy link

Copilot AI Mar 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The class no longer inherits from FullAggregateRoot<Guid, Guid>. Existing EF Core entity configurations for DeviceFlowCodes configure properties like CreationTime (and use soft-delete filters), which are typically provided by the base type; removing the inheritance will break compilation (x => x.CreationTime) and/or the schema mapping. Either keep the FullAggregateRoot base class or update the entity (and all related EntityTypeConfiguration classes) to include/remove those properties consistently.

Suggested change
public class DeviceFlowCodes
public class DeviceFlowCodes : FullAggregateRoot<Guid, Guid>

Copilot uses AI. Check for mistakes.
{
/// <summary>
/// Gets or sets the device code.
Expand Down
4 changes: 1 addition & 3 deletions ...onnect/Masa.BuildingBlocks.Authentication.OpenIdConnect.Domain/Entities/PersistedGrant.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.BuildingBlocks.Authentication.OpenIdConnect.Domain.Entities;

public class PersistedGrant : FullAggregateRoot<Guid, Guid>
public class PersistedGrant
Copy link

Copilot AI Mar 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The class no longer inherits from FullAggregateRoot<Guid, Guid>. This drops base properties (e.g., CreationTime) that are referenced by existing EF Core entity configurations (PersistedGrantEntityTypeConfiguration configures x.CreationTime), which will break compilation and/or mapping. Restore the original base type, or add the required properties and update all related EntityTypeConfiguration classes to match the new model.

Suggested change
public class PersistedGrant
using Masa.BuildingBlocks.Ddd.Domain.Entities;
public class PersistedGrant : FullAggregateRoot<Guid, Guid>

Copilot uses AI. Check for mistakes.
{
public string Key { get; private set; } = null!;

Expand Down
3 changes: 1 addition & 2 deletions ...penIdConnect.EFCore.Oracle/EntityConfigurations/DeviceFlowCodesEntityTypeConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) MASA Stack All rights reserved.
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Authentication.OpenIdConnect.EFCore.Oracle.EntityConfigurations;
Expand All @@ -13,7 +13,6 @@ public void Configure(EntityTypeBuilder<DeviceFlowCodes> builder)
builder.Property(x => x.SessionId).HasMaxLength(100).IsRequired(false);
builder.Property(x => x.ClientId).HasMaxLength(200).IsRequired();
builder.Property(x => x.Description).HasMaxLength(200).IsRequired(false);
builder.Property(x => x.CreationTime).IsRequired();
builder.Property(x => x.Expiration).IsRequired();
// 50000 chosen to be explicit to allow enough size to avoid truncation, yet stay beneath the MySql row size limit of ~65K
// apparently anything over 4K converts to nvarchar(max) on SqlServer
Expand Down
3 changes: 1 addition & 2 deletions ...OpenIdConnect.EFCore.Oracle/EntityConfigurations/PersistedGrantEntityTypeConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) MASA Stack All rights reserved.
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Authentication.OpenIdConnect.EFCore.Oracle.EntityConfigurations;
Expand All @@ -13,7 +13,6 @@ public void Configure(EntityTypeBuilder<PersistedGrant> builder)
builder.Property(x => x.SessionId).HasMaxLength(100).IsRequired(false);
builder.Property(x => x.ClientId).HasMaxLength(200).IsRequired();
builder.Property(x => x.Description).HasMaxLength(200).IsRequired(false);
builder.Property(x => x.CreationTime).IsRequired();
// 50000 chosen to be explicit to allow enough size to avoid truncation, yet stay beneath the MySql row size limit of ~65K
// apparently anything over 4K converts to nvarchar(max) on SqlServer
builder.Property(x => x.Data).HasMaxLength(50000).IsRequired();
Expand Down
1 change: 0 additions & 1 deletion ...dConnect.EFCore.PostgreSql/EntityConfigurations/DeviceFlowCodesEntityTypeConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ public void Configure(EntityTypeBuilder<DeviceFlowCodes> builder)
builder.Property(x => x.SessionId).HasMaxLength(100);
builder.Property(x => x.ClientId).HasMaxLength(200).IsRequired();
builder.Property(x => x.Description).HasMaxLength(200);
builder.Property(x => x.CreationTime).IsRequired();
builder.Property(x => x.Expiration).IsRequired();
// 50000 chosen to be explicit to allow enough size to avoid truncation, yet stay beneath the MySql row size limit of ~65K
// apparently anything over 4K converts to nvarchar(max) on SqlServer
Expand Down
1 change: 0 additions & 1 deletion ...IdConnect.EFCore.PostgreSql/EntityConfigurations/PersistedGrantEntityTypeConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ public void Configure(EntityTypeBuilder<PersistedGrant> builder)
builder.Property(x => x.SessionId).HasMaxLength(100);
builder.Property(x => x.ClientId).HasMaxLength(200).IsRequired();
builder.Property(x => x.Description).HasMaxLength(200);
builder.Property(x => x.CreationTime).IsRequired();
// 50000 chosen to be explicit to allow enough size to avoid truncation, yet stay beneath the MySql row size limit of ~65K
// apparently anything over 4K converts to nvarchar(max) on SqlServer
builder.Property(x => x.Data).HasMaxLength(50000).IsRequired();
Expand Down
3 changes: 1 addition & 2 deletions ...ation.OpenIdConnect.EFCore/EntityConfigurations/DeviceFlowCodesEntityTypeConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) MASA Stack All rights reserved.
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Authentication.OpenIdConnect.EFCore.EntityConfigurations;
Expand All @@ -13,7 +13,6 @@ public void Configure(EntityTypeBuilder<DeviceFlowCodes> builder)
builder.Property(x => x.SessionId).HasMaxLength(100);
builder.Property(x => x.ClientId).HasMaxLength(200).IsRequired();
builder.Property(x => x.Description).HasMaxLength(200);
builder.Property(x => x.CreationTime).IsRequired();
builder.Property(x => x.Expiration).IsRequired();
// 50000 chosen to be explicit to allow enough size to avoid truncation, yet stay beneath the MySql row size limit of ~65K
// apparently anything over 4K converts to nvarchar(max) on SqlServer
Expand Down
3 changes: 1 addition & 2 deletions ...cation.OpenIdConnect.EFCore/EntityConfigurations/PersistedGrantEntityTypeConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) MASA Stack All rights reserved.
// Copyright (c) MASA Stack All rights reserved.
// Licensed under the MIT License. See LICENSE.txt in the project root for license information.

namespace Masa.Contrib.Authentication.OpenIdConnect.EFCore.EntityConfigurations;
Expand All @@ -13,7 +13,6 @@ public void Configure(EntityTypeBuilder<PersistedGrant> builder)
builder.Property(x => x.SessionId).HasMaxLength(100);
builder.Property(x => x.ClientId).HasMaxLength(200).IsRequired();
builder.Property(x => x.Description).HasMaxLength(200);
builder.Property(x => x.CreationTime).IsRequired();
// 50000 chosen to be explicit to allow enough size to avoid truncation, yet stay beneath the MySql row size limit of ~65K
// apparently anything over 4K converts to nvarchar(max) on SqlServer
builder.Property(x => x.Data).HasMaxLength(50000).IsRequired();
Expand Down
Loading