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

Jump to bottom

Fix incorrect description #17047

Merged
merged 2 commits into from
Nov 23, 2024
Merged

Fix incorrect description #17047

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
a98bd48
Fix incorrect description
MikeAlhayek Nov 22, 2024
b4b25e1
Merge branch 'main' into ma/fix-typos
MikeAlhayek Nov 22, 2024
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
6 changes: 3 additions & 3 deletions src/OrchardCore.Modules/OrchardCore.Users/Controllers/ExternalAuthenticationsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,9 @@ public async Task<IActionResult> ExternalLoginCallback(string returnUrl = null,

// The user doesn't exist and no information required, we can create the account locally
// instead of redirecting to the ExternalLogin.
var noInformationRequired = externalLoginViewModel.NoPassword
&& externalLoginViewModel.NoEmail
&& externalLoginViewModel.NoUsername;
var noInformationRequired = settings.NoPassword &&
settings.NoEmail &&
settings.NoUsername;

if (noInformationRequired)
{
Expand Down
10 changes: 5 additions & 5 deletions src/OrchardCore.Modules/OrchardCore.Users/Models/RegistrationSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ public class RegistrationSettings

public bool UseSiteTheme { get; set; }

[Obsolete("This property is no longer used and will be removed in the next major release. Instead use ExternalAuthenticationSettings.NoPassword")]
[Obsolete("This property is no longer used and will be removed in the next major release. Instead use ExternalRegistrationSettings.NoPassword")]
public bool NoPasswordForExternalUsers { get; set; }

[Obsolete("This property is no longer used and will be removed in the next major release. Instead use ExternalAuthenticationSettings.NoUsername")]
[Obsolete("This property is no longer used and will be removed in the next major release. Instead use ExternalRegistrationSettings.NoUsername")]
public bool NoUsernameForExternalUsers { get; set; }

[Obsolete("This property is no longer used and will be removed in the next major release. Instead use ExternalAuthenticationSettings.NoEmail")]
[Obsolete("This property is no longer used and will be removed in the next major release. Instead use ExternalRegistrationSettings.NoEmail")]
public bool NoEmailForExternalUsers { get; set; }

[Obsolete("This property is no longer used and will be removed in the next major release. Instead use ExternalAuthenticationSettings.UseScriptToGenerateUsername")]
[Obsolete("This property is no longer used and will be removed in the next major release. Instead use ExternalRegistrationSettings.UseScriptToGenerateUsername")]
public bool UseScriptToGenerateUsername { get; set; }

[Obsolete("This property is no longer used and will be removed in the next major release. Instead use ExternalAuthenticationSettings.GenerateUsernameScript")]
[Obsolete("This property is no longer used and will be removed in the next major release. Instead use ExternalRegistrationSettings.GenerateUsernameScript")]
public string GenerateUsernameScript { get; set; }
}
6 changes: 3 additions & 3 deletions src/OrchardCore/OrchardCore.Users.Core/Models/LoginSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ public class LoginSettings
{
public bool UseSiteTheme { get; set; }

[Obsolete("This property is no longer used and will be removed in the next major release. Instead use ExternalUserLoginSettings.NoPassword")]
[Obsolete("This property is no longer used and will be removed in the next major release. Instead use ExternalLoginSettings.UseExternalProviderIfOnlyOneDefined")]
public bool UseExternalProviderIfOnlyOneDefined { get; set; }

public bool DisableLocalLogin { get; set; }

[Obsolete("This property is no longer used and will be removed in the next major release. Instead use ExternalUserRoleLoginSettings.SyncRolesScript")]
[Obsolete("This property is no longer used and will be removed in the next major release. Instead use ExternalLoginSettings.UseScriptToSyncProperties")]
public bool UseScriptToSyncRoles { get; set; }

[Obsolete("This property is no longer used and will be removed in the next major release. Instead use ExternalUserRoleLoginSettings.SyncRolesScript")]
[Obsolete("This property is no longer used and will be removed in the next major release. Instead use ExternalLoginSettings.SyncPropertiesScript")]
public string SyncRolesScript { get; set; }

public bool AllowChangingUsername { get; set; }
Expand Down