From 7206583617a26d4f68ee6f28bf368c44ea66e750 Mon Sep 17 00:00:00 2001 From: Berkan Sasmaz Date: Thu, 16 Jun 2022 17:11:02 +0300 Subject: [PATCH 1/6] Update en.json --- .../AbpIoLocalization/Commercial/Localization/Resources/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json index 4b3abd4d6d..d0022b30a5 100644 --- a/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json +++ b/abp_io/AbpIoLocalization/AbpIoLocalization/Commercial/Localization/Resources/en.json @@ -376,7 +376,7 @@ "StartTrial": "Start My Free Trial", "ContactUsQuestions": "Contact us if you have any questions", "TrialActivatedWarning": "A user is entitled to have only 1 free trial period. You already used your trial period.", - "ActivationRequirement": "You are last one step away from starting a free trial.
After checking your information, we will activate your license. Once your license is activated, we will send an email to {0}. Don't worry, this process won't take long!", + "ActivationRequirement": "You are last one step away from starting your trial.
After checking your information, we will activate your license. Once your license is activated, we will send an email to {0}. Don't worry, this process won't take long!", "SaveAndDownload": "Save And Download", "CompanyNameValidationMessage": "Company name is too long!", "AddressValidationMessage": "Address is too long!", From 2978e4ac524d84b102ef373a70e6cbcb7500a96c Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Thu, 16 Jun 2022 20:02:41 +0300 Subject: [PATCH 2/6] Added revocation permission to refresh_token grant --- .../OpenIddict/OpenIddictDataSeedContributor.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs index 125a029e1c..130ee66428 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs @@ -292,6 +292,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep if (grantType == OpenIddictConstants.GrantTypes.RefreshToken) { application.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.RefreshToken); + application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Revocation); } if (grantType == OpenIddictConstants.GrantTypes.Implicit) From 3476f08449f39c255517532772ecb3aef0c3659d Mon Sep 17 00:00:00 2001 From: Elan Hasson <234704+ElanHasson@users.noreply.github.com> Date: Thu, 16 Jun 2022 22:26:02 -0400 Subject: [PATCH 3/6] Update Authorization.md missing word --- docs/en/Authorization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/Authorization.md b/docs/en/Authorization.md index 199b73d1c8..869c49a52a 100644 --- a/docs/en/Authorization.md +++ b/docs/en/Authorization.md @@ -4,7 +4,7 @@ Authorization is used to check if a user is allowed to perform some specific ope ABP extends [ASP.NET Core Authorization](https://docs.microsoft.com/en-us/aspnet/core/security/authorization/introduction) by adding **permissions** as auto [policies](https://docs.microsoft.com/en-us/aspnet/core/security/authorization/policies) and allowing authorization system to be usable in the **[application services](Application-Services.md)** too. -So, all the ASP.NET Core authorization features and the documentation are valid in an ABP based application. This document focuses on the features that added on top of ASP.NET Core authorization features. +So, all the ASP.NET Core authorization features and the documentation are valid in an ABP based application. This document focuses on the features that are added on top of ASP.NET Core authorization features. ## Authorize Attribute From 91529752d8a7d08fe0a9835435e57ce810309af7 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 17 Jun 2022 10:55:15 +0800 Subject: [PATCH 4/6] Added revocation permission. --- .../Data/OpenIddictDataSeedContributor.cs | 1 + .../Data/OpenIddictDataSeedContributor.cs | 1 + .../OpenIddict/OpenIddictDataSeedContributor.cs | 2 +- .../OpenIddict/OpenIddictDataSeedContributor.cs | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/Data/OpenIddictDataSeedContributor.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/Data/OpenIddictDataSeedContributor.cs index c7e2925aa5..23317f8aaf 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/Data/OpenIddictDataSeedContributor.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/Data/OpenIddictDataSeedContributor.cs @@ -197,6 +197,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep grantType == OpenIddictConstants.GrantTypes.DeviceCode) { application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Token); + application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Revocation); } if (grantType == OpenIddictConstants.GrantTypes.ClientCredentials) diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Data/OpenIddictDataSeedContributor.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Data/OpenIddictDataSeedContributor.cs index c7e2925aa5..23317f8aaf 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Data/OpenIddictDataSeedContributor.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Data/OpenIddictDataSeedContributor.cs @@ -197,6 +197,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep grantType == OpenIddictConstants.GrantTypes.DeviceCode) { application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Token); + application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Revocation); } if (grantType == OpenIddictConstants.GrantTypes.ClientCredentials) diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs index 130ee66428..6b306c1f0a 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs @@ -272,6 +272,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep grantType == OpenIddictConstants.GrantTypes.DeviceCode) { application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Token); + application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Revocation); } if (grantType == OpenIddictConstants.GrantTypes.ClientCredentials) @@ -292,7 +293,6 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep if (grantType == OpenIddictConstants.GrantTypes.RefreshToken) { application.Permissions.Add(OpenIddictConstants.Permissions.GrantTypes.RefreshToken); - application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Revocation); } if (grantType == OpenIddictConstants.GrantTypes.Implicit) diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/OpenIddict/OpenIddictDataSeedContributor.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/OpenIddict/OpenIddictDataSeedContributor.cs index 057cc82167..9fc3a722ba 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/OpenIddict/OpenIddictDataSeedContributor.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/OpenIddict/OpenIddictDataSeedContributor.cs @@ -249,6 +249,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep grantType == OpenIddictConstants.GrantTypes.DeviceCode) { application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Token); + application.Permissions.Add(OpenIddictConstants.Permissions.Endpoints.Revocation); } if (grantType == OpenIddictConstants.GrantTypes.ClientCredentials) From d3b82172d42a1318d6cfa70f392427161a474c6a Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Fri, 17 Jun 2022 14:11:22 +0800 Subject: [PATCH 5/6] Update OpenIddictDataSeedContributor --- .../OpenIddict/OpenIddictDataSeedContributor.cs | 2 +- .../OpenIddict/OpenIddictDataSeedContributor.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs index 6b306c1f0a..3394913dd8 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs @@ -90,7 +90,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep type: OpenIddictConstants.ClientTypes.Confidential, consentType: OpenIddictConstants.ConsentTypes.Implicit, displayName: "Web Application", - secret: configurationSection["MyProjectName_App:ClientSecret"] ?? "1q2w3e*", + secret: configurationSection["MyProjectName_Web:ClientSecret"] ?? "1q2w3e*", grantTypes: new List //Hybrid flow { OpenIddictConstants.GrantTypes.AuthorizationCode, diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/OpenIddict/OpenIddictDataSeedContributor.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/OpenIddict/OpenIddictDataSeedContributor.cs index 9fc3a722ba..fd9024b03a 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/OpenIddict/OpenIddictDataSeedContributor.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/OpenIddict/OpenIddictDataSeedContributor.cs @@ -90,7 +90,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep type: OpenIddictConstants.ClientTypes.Confidential, consentType: OpenIddictConstants.ConsentTypes.Implicit, displayName: "Web Application", - secret: configurationSection["MyProjectName_App:ClientSecret"] ?? "1q2w3e*", + secret: configurationSection["MyProjectName_Web:ClientSecret"] ?? "1q2w3e*", grantTypes: new List //Hybrid flow { OpenIddictConstants.GrantTypes.AuthorizationCode, From 4db6fe874e45f148833b9abb642b786c60932ca7 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Fri, 17 Jun 2022 15:06:59 +0800 Subject: [PATCH 6/6] Update OpenIddictDataSeedContributor --- .../OpenIddict/OpenIddictDataSeedContributor.cs | 6 +++--- .../OpenIddict/OpenIddictDataSeedContributor.cs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs index 3394913dd8..add52f7437 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs @@ -106,7 +106,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep var consoleAndAngularClientId = configurationSection["MyProjectName_App:ClientId"]; if (!consoleAndAngularClientId.IsNullOrWhiteSpace()) { - var webClientRootUrl = configurationSection["MyProjectName_App:RootUrl"]?.TrimEnd('/'); + var consoleAndAngularClientRootUrl = configurationSection["MyProjectName_App:RootUrl"]?.TrimEnd('/'); await CreateApplicationAsync( name: consoleAndAngularClientId, type: OpenIddictConstants.ClientTypes.Public, @@ -121,8 +121,8 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep OpenIddictConstants.GrantTypes.RefreshToken }, scopes: commonScopes, - redirectUri: webClientRootUrl, - postLogoutRedirectUri: webClientRootUrl + redirectUri: consoleAndAngularClientRootUrl, + postLogoutRedirectUri: consoleAndAngularClientRootUrl ); } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/OpenIddict/OpenIddictDataSeedContributor.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/OpenIddict/OpenIddictDataSeedContributor.cs index fd9024b03a..872920cb82 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/OpenIddict/OpenIddictDataSeedContributor.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.AuthServer/OpenIddict/OpenIddictDataSeedContributor.cs @@ -106,7 +106,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep var consoleAndAngularClientId = configurationSection["MyProjectName_App:ClientId"]; if (!consoleAndAngularClientId.IsNullOrWhiteSpace()) { - var webClientRootUrl = configurationSection["MyProjectName_App:RootUrl"]?.TrimEnd('/'); + var consoleAndAngularClientRootUrl = configurationSection["MyProjectName_App:RootUrl"]?.TrimEnd('/'); await CreateApplicationAsync( name: consoleAndAngularClientId, type: OpenIddictConstants.ClientTypes.Public, @@ -121,8 +121,8 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep OpenIddictConstants.GrantTypes.RefreshToken }, scopes: commonScopes, - redirectUri: webClientRootUrl, - postLogoutRedirectUri: webClientRootUrl + redirectUri: consoleAndAngularClientRootUrl, + postLogoutRedirectUri: consoleAndAngularClientRootUrl ); }