Skip to content

Commit 3cd90a0

Browse files
committed
Merge remote-tracking branch 'origin/dev' into feat/mudblazor
# Conflicts: # docs/en/package-version-changes.md # templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj # templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyCompanyName.MyProjectName.Blazor.Client.csproj # templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj # templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/MyCompanyName.MyProjectName.Blazor.WebApp.Client.csproj # templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client.csproj # templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.csproj # templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/MyCompanyName.MyProjectName.Blazor.WebApp.csproj # templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/MyCompanyName.MyProjectName.Blazor.Host.Client.csproj
2 parents 7e312f6 + 0a4d666 commit 3cd90a0

61 files changed

Lines changed: 1292 additions & 153 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Directory.Packages.props

Lines changed: 63 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -58,63 +58,63 @@
5858
<PackageVersion Include="Magick.NET-Q16-AnyCPU" Version="14.9.1" />
5959
<PackageVersion Include="MailKit" Version="4.13.0" />
6060
<PackageVersion Include="Markdig.Signed" Version="0.42.0" />
61-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.2" />
62-
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.2" />
63-
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="10.0.2" />
64-
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="10.0.2" />
65-
<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="10.0.2" />
66-
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="10.0.2" />
67-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.2" />
68-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.2" />
69-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.2" />
70-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.2" />
71-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="10.0.20" />
72-
<PackageVersion Include="Microsoft.Maui.Controls" Version="10.0.20" />
73-
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="10.0.2" />
74-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.2" />
75-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="10.0.2" />
76-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.2" />
61+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.7" />
62+
<PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.7" />
63+
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="10.0.7" />
64+
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="10.0.7" />
65+
<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="10.0.7" />
66+
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="10.0.7" />
67+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.7" />
68+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.7" />
69+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.7" />
70+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.7" />
71+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="10.0.51" />
72+
<PackageVersion Include="Microsoft.Maui.Controls" Version="10.0.51" />
73+
<PackageVersion Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="10.0.7" />
74+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.7" />
75+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="10.0.7" />
76+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.7" />
7777
<PackageVersion Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.36" />
78-
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.2" />
79-
<PackageVersion Include="Microsoft.AspNetCore.WebUtilities" Version="10.0.2" />
80-
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.4" />
78+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.7" />
79+
<PackageVersion Include="Microsoft.AspNetCore.WebUtilities" Version="10.0.7" />
80+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.7" />
8181
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
8282
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
83-
<PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.2" />
83+
<PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.7" />
8484
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.1.1" />
85-
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.2" />
86-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.2" />
87-
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.2" />
88-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Proxies" Version="10.0.2" />
89-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.2" />
90-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.2" />
91-
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.2" />
92-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.2" />
85+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.7" />
86+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.7" />
87+
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.7" />
88+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Proxies" Version="10.0.7" />
89+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.7" />
90+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.7" />
91+
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.7" />
92+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.7" />
9393
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.71.0" />
9494
<PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.71.0" />
9595
<PackageVersion Include="Microsoft.Extensions.Caching.Hybrid" Version="9.9.0" />
96-
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.2" />
97-
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.2" />
98-
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.2" />
99-
<PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="10.0.2" />
100-
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.2" />
101-
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.2" />
102-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.2" />
103-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.2" />
104-
<PackageVersion Include="Microsoft.Extensions.FileProviders.Composite" Version="10.0.2" />
105-
<PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.2" />
106-
<PackageVersion Include="Microsoft.Extensions.FileProviders.Physical" Version="10.0.2" />
107-
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.2" />
108-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.2" />
109-
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.2" />
110-
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.2" />
111-
<PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="10.0.2" />
112-
<PackageVersion Include="Microsoft.Extensions.Localization" Version="10.0.2" />
113-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.2" />
114-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.2" />
115-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.2" />
116-
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.2" />
117-
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.2" />
96+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.7" />
97+
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.7" />
98+
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.7" />
99+
<PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="10.0.7" />
100+
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.7" />
101+
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.7" />
102+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.7" />
103+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.7" />
104+
<PackageVersion Include="Microsoft.Extensions.FileProviders.Composite" Version="10.0.7" />
105+
<PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.7" />
106+
<PackageVersion Include="Microsoft.Extensions.FileProviders.Physical" Version="10.0.7" />
107+
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.7" />
108+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.7" />
109+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.7" />
110+
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.7" />
111+
<PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="10.0.7" />
112+
<PackageVersion Include="Microsoft.Extensions.Localization" Version="10.0.7" />
113+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.7" />
114+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.7" />
115+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.7" />
116+
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.7" />
117+
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.7" />
118118
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
119119
<PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
120120
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
@@ -123,7 +123,7 @@
123123
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.16.0" />
124124
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.16.0" />
125125
<PackageVersion Include="Minio" Version="6.0.5" />
126-
<PackageVersion Include="MongoDB.Driver" Version="3.7.1" />
126+
<PackageVersion Include="MongoDB.Driver" Version="3.8.0" />
127127
<PackageVersion Include="NEST" Version="7.17.5" />
128128
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
129129
<PackageVersion Include="Nito.AsyncEx.Context" Version="5.1.2" />
@@ -133,11 +133,11 @@
133133
<PackageVersion Include="NUglify" Version="1.21.17" />
134134
<PackageVersion Include="Nullable" Version="1.3.1" />
135135
<PackageVersion Include="Octokit" Version="14.0.0" />
136-
<PackageVersion Include="OpenIddict.Abstractions" Version="7.3.0" />
137-
<PackageVersion Include="OpenIddict.Core" Version="7.3.0" />
138-
<PackageVersion Include="OpenIddict.Server.AspNetCore" Version="7.3.0" />
139-
<PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="7.3.0" />
140-
<PackageVersion Include="OpenIddict.Validation.ServerIntegration" Version="7.3.0" />
136+
<PackageVersion Include="OpenIddict.Abstractions" Version="7.5.0" />
137+
<PackageVersion Include="OpenIddict.Core" Version="7.5.0" />
138+
<PackageVersion Include="OpenIddict.Server.AspNetCore" Version="7.5.0" />
139+
<PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="7.5.0" />
140+
<PackageVersion Include="OpenIddict.Validation.ServerIntegration" Version="7.5.0" />
141141
<PackageVersion Include="Oracle.EntityFrameworkCore" Version="10.23.26000" />
142142
<PackageVersion Include="Polly" Version="8.6.3" />
143143
<PackageVersion Include="Polly.Extensions.Http" Version="3.0.0" />
@@ -170,17 +170,17 @@
170170
<PackageVersion Include="Spectre.Console" Version="0.51.1" />
171171
<PackageVersion Include="StackExchange.Redis" Version="2.9.17" />
172172
<PackageVersion Include="Swashbuckle.AspNetCore" Version="10.0.1" />
173-
<PackageVersion Include="System.Collections.Immutable" Version="10.0.2" />
173+
<PackageVersion Include="System.Collections.Immutable" Version="10.0.7" />
174174
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
175175
<PackageVersion Include="System.Linq.Dynamic.Core" Version="1.6.7" />
176176
<PackageVersion Include="System.Linq.Queryable" Version="4.3.0" />
177177
<PackageVersion Include="System.Runtime.Loader" Version="4.3.0" />
178-
<PackageVersion Include="System.Security.Cryptography.Xml" Version="10.0.6" />
179-
<PackageVersion Include="System.Security.Permissions" Version="10.0.2" />
178+
<PackageVersion Include="System.Security.Cryptography.Xml" Version="10.0.7" />
179+
<PackageVersion Include="System.Security.Permissions" Version="10.0.7" />
180180
<PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
181-
<PackageVersion Include="System.Text.Encoding.CodePages" Version="10.0.2" />
182-
<PackageVersion Include="System.Text.Encodings.Web" Version="10.0.2" />
183-
<PackageVersion Include="System.Text.Json" Version="10.0.2" />
181+
<PackageVersion Include="System.Text.Encoding.CodePages" Version="10.0.7" />
182+
<PackageVersion Include="System.Text.Encodings.Web" Version="10.0.7" />
183+
<PackageVersion Include="System.Text.Json" Version="10.0.7" />
184184
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
185185
<PackageVersion Include="TencentCloudSDK.Sms" Version="3.0.1273" />
186186
<PackageVersion Include="TimeZoneConverter" Version="7.2.0" />
@@ -195,6 +195,6 @@
195195
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
196196
<PackageVersion Include="ConfigureAwait.Fody" Version="3.3.2" />
197197
<PackageVersion Include="Fody" Version="6.9.3" />
198-
<PackageVersion Include="System.Management" Version="10.0.2"/>
198+
<PackageVersion Include="System.Management" Version="10.0.7" />
199199
</ItemGroup>
200200
</Project>

docs/en/modules/account/shared-user-accounts.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,30 @@ Configure<AbpIdentityPendingTenantUserOptions>(options =>
142142

143143
![new-user--join-strategy-inform](../../images/new-user-join-strategy-inform.png)
144144

145+
## Tenant Admin vs Host Admin Operations
146+
147+
When the Shared strategy is enabled, a user is a **global resource** across host and all tenants. Their identity, activation state, lockout, password policy and two-factor settings live at the host level. Therefore some user management operations are restricted to host administrators and are not available to tenant administrators.
148+
149+
### Host-only operations
150+
151+
The following operations can only be performed by a host administrator when Shared is enabled. Both the Identity Pro UI (MVC + Blazor) and the `IdentityUserAppService` enforce this — a direct API call from a tenant context will be rejected with a `UserFriendlyException`:
152+
153+
- Delete a user
154+
- Activate / deactivate a user (`IsActive`)
155+
- Lock / unlock a user
156+
- Enable or disable two-factor authentication
157+
- Change `LockoutEnabled` or `ShouldChangePasswordOnNextLogin`
158+
159+
### What tenant admins can do
160+
161+
- Invite users to the tenant (see the Invitation flow above)
162+
- Manage role and organization-unit assignments within the tenant
163+
- View audit / security logs scoped to the tenant
164+
165+
### What a user can do for themselves
166+
167+
Users can leave a tenant from their own account menu (`Switch Tenant``Leave`). Leaving marks the tenant membership as `Leaved = true` and preserves the user's host identity, so they can be re-invited later with the same `UserId`.
168+
145169
## Migration Guide
146170

147171
If you plan to migrate an existing multi-tenant application from an isolated strategy to Shared User Accounts, keep the following in mind:

docs/en/modules/elsa-pro.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ After adding the package references, open the module class of the project (e.g.:
4646
4747
### `AbpElsaAspNetCoreModule` and `AbpElsaIdentityModule`
4848

49-
These two modules generally will be added to your authentication project. Please add `Volo.Elsa.Abp.AspNetCore` and `Volo.Elsa.Abp.Identity` packages to your project and add the `AbpElsaAspNetCoreModule` and `AbpElsaIdentityModule` to the `DependsOn` attribute of your module class based on your project structure:
49+
These two modules generally will be added to your authentication project. Please add `Volo.Abp.Elsa.AspNetCore` and `Volo.Abp.Elsa.Identity` packages to your project and add the `AbpElsaAspNetCoreModule` and `AbpElsaIdentityModule` to the `DependsOn` attribute of your module class based on your project structure:
5050

5151
```xml
5252
<PackageReference Include="Volo.Abp.Elsa.AspNetCore" Version="x.x.x" />
@@ -65,20 +65,20 @@ These two modules generally will be added to your authentication project. Please
6565

6666
The Elsa Workflows has its own database provider, and also has a Tenant/Role/User system. They are under active development, so the ABP Elsa module is not yet fully integrated. Below is the current status of each module in the ABP's Elsa Module:
6767

68-
- `AbpElsaAspNetCoreModule(Volo.Elsa.Abp.AspNetCore)` module is used to integrate Elsa authentication.
69-
- `AbpElsaIdentityModule(Volo.Elsa.Abp.Identity)` module is used to integrate ABP Identity authentication.
70-
- `AbpElsaApplicationModule(Volo.Elsa.Abp.Application)` and `AbpElsaApplicationContractsModule(Volo.Elsa.Abp.Application.Contracts)` modules are used to define the Elsa permissions.
68+
- `AbpElsaAspNetCoreModule(Volo.Abp.Elsa.AspNetCore)` module is used to integrate Elsa authentication.
69+
- `AbpElsaIdentityModule(Volo.Abp.Elsa.Identity)` module is used to integrate ABP Identity authentication.
70+
- `AbpElsaApplicationModule(Volo.Abp.Elsa.Application)` and `AbpElsaApplicationContractsModule(Volo.Abp.Elsa.Application.Contracts)` modules are used to define the Elsa permissions.
7171

7272
The rest of the projects/modules are basically empty and will be implemented in the future based on the Elsa features:
7373

74-
- `AbpElsaDomainModule(Volo.Elsa.Abp.Domain)`
75-
- `AbpElsaEntityFrameworkCoreModule(Volo.Elsa.Abp.EntityFrameworkCore)`
76-
- `AbpElsaHttpApiModule(Volo.Elsa.Abp.HttpApi)`
77-
- `AbpElsaHttpApiClientModule(Volo.Elsa.Abp.HttpApi.Client)`
78-
- `AbpElsaBlazorModule(Volo.Elsa.Abp.Blazor)`
79-
- `AbpElsaBlazorServerModule(Volo.Elsa.Abp.Blazor.Server)`
80-
- `AbpElsaBlazorWebAssemblyModule(Volo.Elsa.Abp.Blazor.WebAssembly)`
81-
- `AbpElsaWebModule(Volo.Elsa.Abp.Web)`
74+
- `AbpElsaDomainModule(Volo.Abp.Elsa.Domain)`
75+
- `AbpElsaEntityFrameworkCoreModule(Volo.Abp.Elsa.EntityFrameworkCore)`
76+
- `AbpElsaHttpApiModule(Volo.Abp.Elsa.HttpApi)`
77+
- `AbpElsaHttpApiClientModule(Volo.Abp.Elsa.HttpApi.Client)`
78+
- `AbpElsaBlazorModule(Volo.Abp.Elsa.Blazor)`
79+
- `AbpElsaBlazorServerModule(Volo.Abp.Elsa.Blazor.Server)`
80+
- `AbpElsaBlazorWebAssemblyModule(Volo.Abp.Elsa.Blazor.WebAssembly)`
81+
- `AbpElsaWebModule(Volo.Abp.Elsa.Web)`
8282

8383
## Configure the Elsa Server
8484

@@ -129,7 +129,7 @@ The Elsa Workflow API endpoints check permissions. Also, it has a `*` wildcard p
129129

130130
The ABP Elsa module defines all permissions that are used in the Elsa workflow. You can use ABP Permission Management module to manage the permissions.
131131

132-
`AbpElsaAspNetCoreModule(Volo.Elsa.Abp.AspNetCore)` module will check and add these permissions to the current user's claims:
132+
`AbpElsaAspNetCoreModule(Volo.Abp.Elsa.AspNetCore)` module will check and add these permissions to the current user's claims:
133133

134134
![Elsa Permissions](../images/elsa-permissions.png)
135135

@@ -158,7 +158,7 @@ Elsa Studio requires authentication and there are two ways to authenticate Elsa
158158

159159
##### Elsa Studio - Password Flow Authentication
160160

161-
The `AbpElsaIdentityModule(Volo.Elsa.Abp.Identity)` module is used to integrate with [ABP Identity module](./identity-pro.md) to check Elsa Studio *username* and *password* against ABP Identity.
161+
The `AbpElsaIdentityModule(Volo.Abp.Elsa.Identity)` module is used to integrate with [ABP Identity module](./identity-pro.md) to check Elsa Studio *username* and *password* against ABP Identity.
162162

163163
You need to replace `UseIdentity` with `UseAbpIdentity` when configuring Elsa in your Elsa server project as follows:
164164

0 commit comments

Comments
 (0)