Skip to content
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

Rename variable to reflect the context better #215

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+43 −43
Open

Rename variable to reflect the context better #215

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Rename variable to reflect the context better
@lazyrainynight
lazyrainynight committed Sep 28, 2024
commit 405c52b3887eccc1efd7dde6b6a18fa27cdda0a8
6 changes: 3 additions & 3 deletions IdentityServer/v5/Quickstarts/4_EntityFramework/src/IdentityServer/Startup.cs
View file
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ public void ConfigureServices(IServiceCollection services)

var migrationsAssembly = typeof(Startup).GetTypeInfo().Assembly.GetName().Name;
const string connectionString = @"Data Source=Duende.IdentityServer.Quickstart.EntityFramework-5.0.0.db";

var builder = services.AddIdentityServer()
.AddTestUsers(TestUsers.Users)
.AddConfigurationStore(options =>
@@ -116,9 +116,9 @@ private void InitializeDatabase(IApplicationBuilder app)

if (!context.ApiScopes.Any())
{
foreach (var resource in Config.ApiScopes)
foreach (var apiScope in Config.ApiScopes)
{
context.ApiScopes.Add(resource.ToEntity());
context.ApiScopes.Add(apiScope.ToEntity());
}
context.SaveChanges();
}
4 changes: 2 additions & 2 deletions ...tityServer/v5/UserInteraction/WsFederationDynamicProviders/IdentityServerHost/SeedData.cs
View file
Original file line number Diff line number Diff line change
@@ -73,9 +73,9 @@ private static void EnsureSeedData(ConfigurationDbContext context)
if (!context.ApiScopes.Any())
{
Log.Debug("ApiScopes being populated");
foreach (var resource in Config.ApiScopes.ToList())
foreach (var apiScope in Config.ApiScopes.ToList())
{
context.ApiScopes.Add(resource.ToEntity());
context.ApiScopes.Add(apiScope.ToEntity());
}
context.SaveChanges();
}
4 changes: 2 additions & 2 deletions IdentityServer/v6/Configuration/Permissions/IdentityServer/SeedData.cs
View file
Original file line number Diff line number Diff line change
@@ -53,9 +53,9 @@ private static void EnsureSeedData(ConfigurationDbContext context)
if (!context.ApiScopes.Any())
{
Log.Debug("ApiScopes being populated");
foreach (var resource in Config.ApiScopes.ToList())
foreach (var apiScope in Config.ApiScopes.ToList())
{
context.ApiScopes.Add(resource.ToEntity());
context.ApiScopes.Add(apiScope.ToEntity());
}
context.SaveChanges();
}
8 changes: 4 additions & 4 deletions IdentityServer/v6/Configuration/PipelineRegistration/IdentityServer/SeedData.cs
View file
Original file line number Diff line number Diff line change
@@ -53,9 +53,9 @@ private static void EnsureSeedData(ConfigurationDbContext context)
if (!context.ApiScopes.Any())
{
Log.Debug("ApiScopes being populated");
foreach (var resource in Config.ApiScopes.ToList())
foreach (var apiScope in Config.ApiScopes.ToList())
{
context.ApiScopes.Add(resource.ToEntity());
context.ApiScopes.Add(apiScope.ToEntity());
}
context.SaveChanges();
}
@@ -67,9 +67,9 @@ private static void EnsureSeedData(ConfigurationDbContext context)
if (!context.ApiResources.Any())
{
Log.Debug("ApiResources being populated");
foreach (var resource in Config.ApiResources.ToList())
foreach (var apiScope in Config.ApiResources.ToList())
{
context.ApiResources.Add(resource.ToEntity());
context.ApiResources.Add(apiScope.ToEntity());
}
context.SaveChanges();
}
4 changes: 2 additions & 2 deletions IdentityServer/v6/Configuration/SimpleDcr/IdentityServer/SeedData.cs
View file
Original file line number Diff line number Diff line change
@@ -53,9 +53,9 @@ private static void EnsureSeedData(ConfigurationDbContext context)
if (!context.ApiScopes.Any())
{
Log.Debug("ApiScopes being populated");
foreach (var resource in Config.ApiScopes.ToList())
foreach (var apiScope in Config.ApiScopes.ToList())
{
context.ApiScopes.Add(resource.ToEntity());
context.ApiScopes.Add(apiScope.ToEntity());
}
context.SaveChanges();
}
4 changes: 2 additions & 2 deletions IdentityServer/v6/Configuration/SoftwareStatement/IdentityServer/SeedData.cs
View file
Original file line number Diff line number Diff line change
@@ -53,9 +53,9 @@ private static void EnsureSeedData(ConfigurationDbContext context)
if (!context.ApiScopes.Any())
{
Log.Debug("ApiScopes being populated");
foreach (var resource in Config.ApiScopes.ToList())
foreach (var apiScope in Config.ApiScopes.ToList())
{
context.ApiScopes.Add(resource.ToEntity());
context.ApiScopes.Add(apiScope.ToEntity());
}
context.SaveChanges();
}
10 changes: 5 additions & 5 deletions IdentityServer/v6/Quickstarts/4_EntityFramework/src/IdentityServer/HostingExtensions.cs
View file
Original file line number Diff line number Diff line change
@@ -38,9 +38,9 @@ private static void InitializeDatabase(IApplicationBuilder app)

if (!context.ApiScopes.Any())
{
foreach (var resource in Config.ApiScopes)
foreach (var apiScope in Config.ApiScopes)
{
context.ApiScopes.Add(resource.ToEntity());
context.ApiScopes.Add(apiScope.ToEntity());
}
context.SaveChanges();
}
@@ -95,9 +95,9 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde

return builder.Build();
}

public static WebApplication ConfigurePipeline(this WebApplication app)
{
{
app.UseSerilogRequestLogging();
if (app.Environment.IsDevelopment())
{
@@ -108,7 +108,7 @@ public static WebApplication ConfigurePipeline(this WebApplication app)

app.UseStaticFiles();
app.UseRouting();

app.UseIdentityServer();

app.UseAuthorization();
4 changes: 2 additions & 2 deletions IdentityServer/v6/UserInteraction/DynamicProviders/IdentityServerHost/SeedData.cs
View file
Original file line number Diff line number Diff line change
@@ -72,9 +72,9 @@ private static void EnsureSeedData(ConfigurationDbContext context)
if (!context.ApiScopes.Any())
{
Log.Debug("ApiScopes being populated");
foreach (var resource in Config.ApiScopes.ToList())
foreach (var apiScope in Config.ApiScopes.ToList())
{
context.ApiScopes.Add(resource.ToEntity());
context.ApiScopes.Add(apiScope.ToEntity());
}
context.SaveChanges();
}
4 changes: 2 additions & 2 deletions ...tityServer/v6/UserInteraction/WsFederationDynamicProviders/IdentityServerHost/SeedData.cs
View file
Original file line number Diff line number Diff line change
@@ -73,9 +73,9 @@ private static void EnsureSeedData(ConfigurationDbContext context)
if (!context.ApiScopes.Any())
{
Log.Debug("ApiScopes being populated");
foreach (var resource in Config.ApiScopes.ToList())
foreach (var apiScope in Config.ApiScopes.ToList())
{
context.ApiScopes.Add(resource.ToEntity());
context.ApiScopes.Add(apiScope.ToEntity());
}
context.SaveChanges();
}
4 changes: 2 additions & 2 deletions IdentityServer/v7/Configuration/Permissions/IdentityServer/SeedData.cs
View file
Original file line number Diff line number Diff line change
@@ -53,9 +53,9 @@ private static void EnsureSeedData(ConfigurationDbContext context)
if (!context.ApiScopes.Any())
{
Log.Debug("ApiScopes being populated");
foreach (var resource in Config.ApiScopes.ToList())
foreach (var apiScope in Config.ApiScopes.ToList())
{
context.ApiScopes.Add(resource.ToEntity());
context.ApiScopes.Add(apiScope.ToEntity());
}
context.SaveChanges();
}
4 changes: 2 additions & 2 deletions IdentityServer/v7/Configuration/PipelineRegistration/IdentityServer/SeedData.cs
View file
Original file line number Diff line number Diff line change
@@ -53,9 +53,9 @@ private static void EnsureSeedData(ConfigurationDbContext context)
if (!context.ApiScopes.Any())
{
Log.Debug("ApiScopes being populated");
foreach (var resource in Config.ApiScopes.ToList())
foreach (var apiScope in Config.ApiScopes.ToList())
{
context.ApiScopes.Add(resource.ToEntity());
context.ApiScopes.Add(apiScope.ToEntity());
}
context.SaveChanges();
}
4 changes: 2 additions & 2 deletions IdentityServer/v7/Configuration/SimpleDcr/IdentityServer/SeedData.cs
View file
Original file line number Diff line number Diff line change
@@ -53,9 +53,9 @@ private static void EnsureSeedData(ConfigurationDbContext context)
if (!context.ApiScopes.Any())
{
Log.Debug("ApiScopes being populated");
foreach (var resource in Config.ApiScopes.ToList())
foreach (var apiScope in Config.ApiScopes.ToList())
{
context.ApiScopes.Add(resource.ToEntity());
context.ApiScopes.Add(apiScope.ToEntity());
}
context.SaveChanges();
}
4 changes: 2 additions & 2 deletions IdentityServer/v7/Configuration/SoftwareStatement/IdentityServer/SeedData.cs
View file
Original file line number Diff line number Diff line change
@@ -53,9 +53,9 @@ private static void EnsureSeedData(ConfigurationDbContext context)
if (!context.ApiScopes.Any())
{
Log.Debug("ApiScopes being populated");
foreach (var resource in Config.ApiScopes.ToList())
foreach (var apiScope in Config.ApiScopes.ToList())
{
context.ApiScopes.Add(resource.ToEntity());
context.ApiScopes.Add(apiScope.ToEntity());
}
context.SaveChanges();
}
14 changes: 7 additions & 7 deletions IdentityServer/v7/Quickstarts/4_EntityFramework/src/IdentityServer/HostingExtensions.cs
View file
Original file line number Diff line number Diff line change
@@ -41,9 +41,9 @@ private static void InitializeDatabase(IApplicationBuilder app)

if (!context.ApiScopes.Any())
{
foreach (var resource in Config.ApiScopes)
foreach (var apiScope in Config.ApiScopes)
{
context.ApiScopes.Add(resource.ToEntity());
context.ApiScopes.Add(apiScope.ToEntity());
}
context.SaveChanges();
}
@@ -84,7 +84,7 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde
options.ClientSecret = googleClientSecret;
});
}

authenticationBuilder.AddOpenIdConnect("oidc", "Demo IdentityServer", options =>
{
options.SignInScheme = IdentityServerConstants.ExternalCookieAuthenticationScheme;
@@ -105,11 +105,11 @@ public static WebApplication ConfigureServices(this WebApplicationBuilder builde

return builder.Build();
}

public static WebApplication ConfigurePipeline(this WebApplication app)
{
{
app.UseSerilogRequestLogging();

if (app.Environment.IsDevelopment())
{
app.UseDeveloperExceptionPage();
@@ -119,7 +119,7 @@ public static WebApplication ConfigurePipeline(this WebApplication app)

app.UseStaticFiles();
app.UseRouting();

app.UseIdentityServer();

app.UseAuthorization();
4 changes: 2 additions & 2 deletions IdentityServer/v7/UserInteraction/DynamicProviders/IdentityServerHost/SeedData.cs
View file
Original file line number Diff line number Diff line change
@@ -72,9 +72,9 @@ private static void EnsureSeedData(ConfigurationDbContext context)
if (!context.ApiScopes.Any())
{
Log.Debug("ApiScopes being populated");
foreach (var resource in Config.ApiScopes.ToList())
foreach (var apiScope in Config.ApiScopes.ToList())
{
context.ApiScopes.Add(resource.ToEntity());
context.ApiScopes.Add(apiScope.ToEntity());
}
context.SaveChanges();
}
4 changes: 2 additions & 2 deletions ...tityServer/v7/UserInteraction/WsFederationDynamicProviders/IdentityServerHost/SeedData.cs
View file
Original file line number Diff line number Diff line change
@@ -73,9 +73,9 @@ private static void EnsureSeedData(ConfigurationDbContext context)
if (!context.ApiScopes.Any())
{
Log.Debug("ApiScopes being populated");
foreach (var resource in Config.ApiScopes.ToList())
foreach (var apiScope in Config.ApiScopes.ToList())
{
context.ApiScopes.Add(resource.ToEntity());
context.ApiScopes.Add(apiScope.ToEntity());
}
context.SaveChanges();
}