Browse Source

api & identity resource names are made unique

pull/1746/head
Yunus Emre Kalkan 7 years ago
parent
commit
ce60004537
  1. 4
      modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs
  2. 6
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20190910115959_Initial.Designer.cs
  3. 2
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20190910115959_Initial.cs
  4. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/MyProjectNameMigrationsDbContextModelSnapshot.cs
  5. 9
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations.csproj

4
modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/EntityFrameworkCore/IdentityServerDbContextModelCreatingExtensions.cs

@ -173,6 +173,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
s => JsonConvert.DeserializeObject<Dictionary<string, string>>(s) s => JsonConvert.DeserializeObject<Dictionary<string, string>>(s)
); );
identityResource.HasAlternateKey(x => x.Name);
identityResource.HasMany(x => x.UserClaims).WithOne().HasForeignKey(x => x.IdentityResourceId).IsRequired(); identityResource.HasMany(x => x.UserClaims).WithOne().HasForeignKey(x => x.IdentityResourceId).IsRequired();
}); });
@ -200,6 +202,8 @@ namespace Volo.Abp.IdentityServer.EntityFrameworkCore
s => JsonConvert.DeserializeObject<Dictionary<string, string>>(s) s => JsonConvert.DeserializeObject<Dictionary<string, string>>(s)
); );
apiResource.HasAlternateKey(x => x.Name);
apiResource.HasMany(x => x.Secrets).WithOne().HasForeignKey(x => x.ApiResourceId).IsRequired(); apiResource.HasMany(x => x.Secrets).WithOne().HasForeignKey(x => x.ApiResourceId).IsRequired();
apiResource.HasMany(x => x.Scopes).WithOne().HasForeignKey(x => x.ApiResourceId).IsRequired(); apiResource.HasMany(x => x.Scopes).WithOne().HasForeignKey(x => x.ApiResourceId).IsRequired();
apiResource.HasMany(x => x.UserClaims).WithOne().HasForeignKey(x => x.ApiResourceId).IsRequired(); apiResource.HasMany(x => x.UserClaims).WithOne().HasForeignKey(x => x.ApiResourceId).IsRequired();

6
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20190816092925_Initial.Designer.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20190910115959_Initial.Designer.cs

@ -10,7 +10,7 @@ using MyCompanyName.MyProjectName.EntityFrameworkCore;
namespace MyCompanyName.MyProjectName.Migrations namespace MyCompanyName.MyProjectName.Migrations
{ {
[DbContext(typeof(MyProjectNameMigrationsDbContext))] [DbContext(typeof(MyProjectNameMigrationsDbContext))]
[Migration("20190816092925_Initial")] [Migration("20190910115959_Initial")]
partial class Initial partial class Initial
{ {
protected override void BuildTargetModel(ModelBuilder modelBuilder) protected override void BuildTargetModel(ModelBuilder modelBuilder)
@ -640,6 +640,8 @@ namespace MyCompanyName.MyProjectName.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.HasAlternateKey("Name");
b.ToTable("IdentityServerApiResources"); b.ToTable("IdentityServerApiResources");
}); });
@ -1073,6 +1075,8 @@ namespace MyCompanyName.MyProjectName.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.HasAlternateKey("Name");
b.ToTable("IdentityServerIdentityResources"); b.ToTable("IdentityServerIdentityResources");
}); });

2
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20190816092925_Initial.cs → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/20190910115959_Initial.cs

@ -224,6 +224,7 @@ namespace MyCompanyName.MyProjectName.Migrations
constraints: table => constraints: table =>
{ {
table.PrimaryKey("PK_IdentityServerApiResources", x => x.Id); table.PrimaryKey("PK_IdentityServerApiResources", x => x.Id);
table.UniqueConstraint("AK_IdentityServerApiResources_Name", x => x.Name);
}); });
migrationBuilder.CreateTable( migrationBuilder.CreateTable(
@ -309,6 +310,7 @@ namespace MyCompanyName.MyProjectName.Migrations
constraints: table => constraints: table =>
{ {
table.PrimaryKey("PK_IdentityServerIdentityResources", x => x.Id); table.PrimaryKey("PK_IdentityServerIdentityResources", x => x.Id);
table.UniqueConstraint("AK_IdentityServerIdentityResources_Name", x => x.Name);
}); });
migrationBuilder.CreateTable( migrationBuilder.CreateTable(

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/Migrations/MyProjectNameMigrationsDbContextModelSnapshot.cs

@ -638,6 +638,8 @@ namespace MyCompanyName.MyProjectName.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.HasAlternateKey("Name");
b.ToTable("IdentityServerApiResources"); b.ToTable("IdentityServerApiResources");
}); });
@ -1071,6 +1073,8 @@ namespace MyCompanyName.MyProjectName.Migrations
b.HasKey("Id"); b.HasKey("Id");
b.HasAlternateKey("Name");
b.ToTable("IdentityServerIdentityResources"); b.ToTable("IdentityServerIdentityResources");
}); });

9
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations/MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations.csproj

@ -7,6 +7,11 @@
<RootNamespace>MyCompanyName.MyProjectName</RootNamespace> <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<Compile Remove="Migrations\20190816092925_Initial.cs" />
<Compile Remove="Migrations\20190816092925_Initial.Designer.cs" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\MyCompanyName.MyProjectName.EntityFrameworkCore\MyCompanyName.MyProjectName.EntityFrameworkCore.csproj" /> <ProjectReference Include="..\MyCompanyName.MyProjectName.EntityFrameworkCore\MyCompanyName.MyProjectName.EntityFrameworkCore.csproj" />
</ItemGroup> </ItemGroup>
@ -15,4 +20,8 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.6" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.6" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="Migrations\" />
</ItemGroup>
</Project> </Project>

Loading…
Cancel
Save