Skip to content

Commit edb4bc5

Browse files
committed
Fix disabling of registration when max organizations reached.
1 parent 89947c7 commit edb4bc5

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

Server/Components/Account/Pages/Register.razor

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ else
6767

6868
@code {
6969
private IEnumerable<IdentityError>? identityErrors;
70-
private int _organizationCount;
7170
private bool _registrationEnabled;
7271

7372
[SupplyParameterFromForm]
@@ -81,12 +80,16 @@ else
8180
protected override async Task OnInitializedAsync()
8281
{
8382
_registrationEnabled = await IsRegistrationEnabled();
84-
_organizationCount = DataService.GetOrganizationCount();
8583
await base.OnInitializedAsync();
8684
}
87-
85+
8886
public async Task RegisterUser(EditContext editContext)
8987
{
88+
if (!await IsRegistrationEnabled())
89+
{
90+
return;
91+
}
92+
9093
var user = CreateUser();
9194

9295
await UserStore.SetUserNameAsync(user, Input.Email, CancellationToken.None);
@@ -124,22 +127,23 @@ else
124127

125128
private RemotelyUser CreateUser()
126129
{
130+
var organizationCount = DataService.GetOrganizationCount();
127131
var user = new RemotelyUser
128132
{
129133
UserName = Input.Email,
130134
Email = Input.Email,
131-
IsServerAdmin = _organizationCount == 0,
135+
IsServerAdmin = organizationCount == 0,
132136
Organization = new Organization()
133137
{
134138
OrganizationName = string.Empty,
135-
IsDefaultOrganization = _organizationCount == 0
139+
IsDefaultOrganization = organizationCount == 0
136140
},
137141
UserOptions = new RemotelyUserOptions(),
138142
IsAdministrator = true,
139143
LockoutEnabled = true
140144
};
141145

142-
if (_organizationCount == 0 && HostEnv.IsDevelopment())
146+
if (organizationCount == 0 && HostEnv.IsDevelopment())
143147
{
144148
user.Organization.ID = AppConstants.DebugOrgId;
145149
user.OrganizationID = AppConstants.DebugOrgId;
@@ -158,8 +162,9 @@ else
158162

159163
private async Task<bool> IsRegistrationEnabled()
160164
{
165+
var organizationCount = DataService.GetOrganizationCount();
161166
var settings = await DataService.GetSettings();
162-
return settings.MaxOrganizationCount < 0 || _organizationCount < settings.MaxOrganizationCount;
167+
return settings.MaxOrganizationCount < 0 || organizationCount < settings.MaxOrganizationCount;
163168
}
164169

165170
private sealed class InputModel

0 commit comments

Comments
 (0)