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

Fix ExternalAuthenticationMigrations namespace #17370

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+6 −6
Open

Fix ExternalAuthenticationMigrations namespace #17370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8589ba
Fix ExternalAuthenticationMigrations namespace
hishamco Jan 17, 2025
7e746d9
Merge branch 'main' into hishamco/external-auth-migrations
hishamco Jan 17, 2025
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
2 changes: 1 addition & 1 deletion ...tions/ExternalAuthenticationMigrations.cs → ...tions/ExternalAuthenticationMigrations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using OrchardCore.Settings;
using OrchardCore.Users.Models;

namespace OrchardCore.Users.DataMigrations;
namespace OrchardCore.Users.Migrations;

public sealed class ExternalAuthenticationMigrations : DataMigration
{
Expand Down
6 changes: 3 additions & 3 deletions ...e.Modules/OrchardCore.Users/Migrations.cs → ...dCore.Users/Migrations/UsersMigrations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
using YesSql;
using YesSql.Sql;

namespace OrchardCore.Users;
namespace OrchardCore.Users.Migrations;

public sealed class Migrations : DataMigration
public sealed class UsersMigrations : DataMigration
{
public async Task<int> CreateAsync()
{
Expand Down Expand Up @@ -251,7 +251,7 @@ public int UpdateFrom12()
{
var session = scope.ServiceProvider.GetRequiredService<ISession>();
var dbConnectionAccessor = scope.ServiceProvider.GetService<IDbConnectionAccessor>();
var logger = scope.ServiceProvider.GetService<ILogger<Migrations>>();
var logger = scope.ServiceProvider.GetService<ILogger<UsersMigrations>>();
var tablePrefix = session.Store.Configuration.TablePrefix;
var documentTableName = session.Store.Configuration.TableNameConvention.GetDocumentTable();
var table = $"{session.Store.Configuration.TablePrefix}{documentTableName}";
Expand Down
4 changes: 2 additions & 2 deletions src/OrchardCore.Modules/OrchardCore.Users/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
using OrchardCore.Sms;
using OrchardCore.Users.Commands;
using OrchardCore.Users.Controllers;
using OrchardCore.Users.DataMigrations;
using OrchardCore.Users.Deployment;
using OrchardCore.Users.Drivers;
using OrchardCore.Users.Events;
using OrchardCore.Users.Handlers;
using OrchardCore.Users.Indexes;
using OrchardCore.Users.Liquid;
using OrchardCore.Users.Migrations;
using OrchardCore.Users.Models;
using OrchardCore.Users.Recipes;
using OrchardCore.Users.Services;
Expand Down Expand Up @@ -112,7 +112,7 @@ public override void ConfigureServices(IServiceCollection services)
});

services.AddTransient<IPostConfigureOptions<SecurityStampValidatorOptions>, ConfigureSecurityStampOptions>();
services.AddDataMigration<Migrations>();
services.AddDataMigration<UsersMigrations>();

services.AddScoped<IUserClaimsProvider, EmailClaimsProvider>();
services.AddSingleton<IUserIdGenerator, DefaultUserIdGenerator>();
Expand Down