Skip to content

fix issues role name per tenent and the ability to re-run strapper #40

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
iammukeshm merged 2 commits into from
Sep 4, 2021
Merged

fix issues role name per tenent and the ability to re-run strapper #40

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac03729
fix issuesaround role name per tanant and the ability to re-run the b…
274188A Sep 3, 2021
f46042a
Merge branch 'main' into main
274188A Sep 3, 2021
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
16 changes: 9 additions & 7 deletions src/Infrastructure/Persistence/Extensions/TenantDatabaseExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,16 @@ private static IServiceCollection MigrateAndSeedIdentityData<T>(this IServiceCol
var tenant = options.Tenants.Where(a => a.TID == tenantId).FirstOrDefault();
using var scope = services.BuildServiceProvider().CreateScope();
var dbContext = scope.ServiceProvider.GetRequiredService<T>();

dbContext.Database.SetConnectionString(connectionString);
if (dbContext.Database.GetMigrations().Count() > 0)
{
SeedRoles(tenantId, tenant, dbContext);
SeedTenantAdmins(tenantId, tenant, scope, dbContext);
if (dbContext.Database.GetPendingMigrations().Any())
{
dbContext.Database.Migrate();
SeedRoles(tenantId, tenant, dbContext);
SeedTenantAdmins(tenantId, tenant, scope, dbContext);
_logger.Information($"{tenant.Name} : Migrations complete....");
}

return services;
}
#region Seeding
Expand Down Expand Up @@ -101,9 +103,9 @@ private static void SeedRoles<T>(string tenantId, Tenant tenant, T dbContext)
var roleStore = new RoleStore<ApplicationRole>(dbContext);
if (!dbContext.Roles.IgnoreQueryFilters().Any(r => r.Name == $"{tenant.Name}{roleName}"))
{
var role = new ApplicationRole($"{tenant.Name}{roleName}", tenantId, $"Admin Role for {tenant.Name} Tenant");
var role = new ExtendedRole(roleName, tenantId, $"{roleName} Role for {tenant.Name} Tenant");
roleStore.CreateAsync(role).Wait();
_logger.Information($"{tenant.Name} : Seeding {tenant.Name}{roleName} Role....");
_logger.Information($"{tenant.Name} : Seeding {roleName} Role....");
}
}
}
Expand Down