From 6c32b0941f133ec449d1a61a544c825c4c424631 Mon Sep 17 00:00:00 2001
From: wzh425 <wuzihao425@outlook.com>
Date: Wed, 8 May 2024 11:12:47 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20issues=201183=E3=80=811166?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Application/Projects/QueryHandler.cs                      | 4 ++--
 src/Web/Masa.Auth.Web.Sso/Pages/Account/Login/Index.razor     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Services/Masa.Auth.Service.Admin/Application/Projects/QueryHandler.cs b/src/Services/Masa.Auth.Service.Admin/Application/Projects/QueryHandler.cs
index d27975bdc..ec5eff3d4 100644
--- a/src/Services/Masa.Auth.Service.Admin/Application/Projects/QueryHandler.cs
+++ b/src/Services/Masa.Auth.Service.Admin/Application/Projects/QueryHandler.cs
@@ -41,8 +41,8 @@ public async Task GetProjectListAsync(ProjectListQuery query)
     public async Task GetProjectUIAppListAsync(ProjectUIAppListQuery query)
     {
         query.Result = await GetProjectDtoListAsync(_multiEnvironmentUserContext.Environment, AppTypes.UI);
-        var menuPermissions = await _permissionRepository.GetListAsync(p => p.Enabled && p.Type == PermissionTypes.Menu
-                || p.Type == PermissionTypes.Element);
+        var menuPermissions = await _permissionRepository.GetListAsync(p => p.Enabled && (p.Type == PermissionTypes.Menu
+                || p.Type == PermissionTypes.Element));
         query.Result.SelectMany(p => p.Apps).ToList().ForEach(a =>
         {
             a.Navs = menuPermissions.Where(p => p.AppId == a.Identity && p.GetParentId() == Guid.Empty)
diff --git a/src/Web/Masa.Auth.Web.Sso/Pages/Account/Login/Index.razor b/src/Web/Masa.Auth.Web.Sso/Pages/Account/Login/Index.razor
index 7e59cb7f2..501a7b953 100644
--- a/src/Web/Masa.Auth.Web.Sso/Pages/Account/Login/Index.razor
+++ b/src/Web/Masa.Auth.Web.Sso/Pages/Account/Login/Index.razor
@@ -11,7 +11,7 @@
 
 @if (_viewModel.EnableLocalLogin)
 {
-    <MCard Width=510 Height=620 MaxHeight="620">
+    <MCard Width=510 Height=640 MaxHeight="640">
         <div class="tab-header login-tab">
             <MTabs Value="Tab" ValueChanged="TabChanged" BackgroundColor="transparent" Color="primary" HideSlider Grow >
                 <MTab Value="@("login")" Class="neutral-lighten-4--text" Style="height:60px;">

From bdd56d3474248e4cf9b8d3b7ff599d7fe1f84f58 Mon Sep 17 00:00:00 2001
From: wzh425 <wuzihao425@outlook.com>
Date: Wed, 8 May 2024 15:27:06 +0800
Subject: [PATCH 2/4] fix: issues 1291

---
 .../Masa.Auth.Web.Admin.Rcl/Masa.Auth.Web.Admin.Rcl.csproj  | 2 +-
 .../Sso/CustomLoginRegister/CustomLoginRegister.razor.cs    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Masa.Auth.Web.Admin.Rcl.csproj b/src/Web/Masa.Auth.Web.Admin.Rcl/Masa.Auth.Web.Admin.Rcl.csproj
index aaf29ec76..4551c7495 100644
--- a/src/Web/Masa.Auth.Web.Admin.Rcl/Masa.Auth.Web.Admin.Rcl.csproj
+++ b/src/Web/Masa.Auth.Web.Admin.Rcl/Masa.Auth.Web.Admin.Rcl.csproj
@@ -18,7 +18,7 @@
 		<PackageReference Include="Humanizer.Core" Version="2.14.1" />
 		<PackageReference Include="Humanizer.Core.zh-CN" Version="2.14.1" />
 		<PackageReference Include="Mapster" Version="7.3.0" />
-		<PackageReference Include="Masa.Stack.Components" Version="0.0.445" />
+		<PackageReference Include="Masa.Stack.Components" Version="0.0.446" />
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.7" />
 		<!--Support GB2312-->
 		<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/CustomLoginRegister/CustomLoginRegister.razor.cs b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/CustomLoginRegister/CustomLoginRegister.razor.cs
index b3f1cc352..b27a91600 100644
--- a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/CustomLoginRegister/CustomLoginRegister.razor.cs
+++ b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/CustomLoginRegister/CustomLoginRegister.razor.cs
@@ -52,8 +52,6 @@ public int PageSize
 
     private CustomLoginService CustomLoginService => AuthCaller.CustomLoginService;
 
-    protected new string? PageName = "CustomLoginBlock";
-
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
         if (firstRender)
@@ -66,8 +64,10 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
 
     protected override void OnInitialized()
     {
+        PageName = "CustomLoginBlock";
+
         base.OnInitialized();
-        
+
         _headers = new List<DataTableHeader<CustomLoginDto>> {
             new() { Text = T(nameof(ClientDto.LogoUri)), Value = nameof(ClientDto.LogoUri), Sortable = false, Width="105px" },
             new() { Text = T("TitleName"), Value = nameof(CustomLoginDto.Name), Sortable = false},

From 01cfa56778a295340e041ea8ac43d2af8a245cef Mon Sep 17 00:00:00 2001
From: wzh425 <wuzihao425@outlook.com>
Date: Thu, 9 May 2024 17:39:00 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix=EF=BC=9AClient=20token=20configuration?=
 =?UTF-8?q?=20not=20displayed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/Sso/Client/UpdateClientDialog.razor.cs                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/Client/UpdateClientDialog.razor.cs b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/Client/UpdateClientDialog.razor.cs
index 2f14b3888..b2223ae81 100644
--- a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/Client/UpdateClientDialog.razor.cs
+++ b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/Client/UpdateClientDialog.razor.cs
@@ -61,7 +61,7 @@ private void PrepareHeader()
                 { "Dto",_deviceFlowDto }
             };
         }
-        else if (_clientDetailDto.ClientType == ClientTypes.Machine || _clientDetailDto.ClientType == ClientTypes.Web)
+        else if (_clientDetailDto.ClientType == ClientTypes.Machine)
         {
             _tabHeader.Add(T("Client Secret"));
             _otherType = typeof(ClientSecret);

From 89943a4f440a4cdbdfdf6a5e84a3373ec22fd52a Mon Sep 17 00:00:00 2001
From: wzh425 <wuzihao425@outlook.com>
Date: Fri, 10 May 2024 11:47:07 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix=EF=BC=9Aissues=201085=E3=80=81915?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Application/Sso/QueryHandler.cs           | 10 ++---
 .../Assets/I18n/en-US.json                    |  7 ++-
 .../Assets/I18n/zh-CN.json                    |  7 ++-
 .../Masa.Auth.Service.Admin/_Imports.cs       |  1 +
 .../Pages/Sso/Client/Section/ClientType.razor |  2 +-
 .../UpdateThirdPartyIdpDialog.razor           |  2 +-
 .../wwwroot/i18n/en-US.json                   | 43 +++++++++++++++++++
 .../wwwroot/i18n/zh-CN.json                   |  2 +-
 8 files changed, 64 insertions(+), 10 deletions(-)

diff --git a/src/Services/Masa.Auth.Service.Admin/Application/Sso/QueryHandler.cs b/src/Services/Masa.Auth.Service.Admin/Application/Sso/QueryHandler.cs
index 27501616c..6c804af78 100644
--- a/src/Services/Masa.Auth.Service.Admin/Application/Sso/QueryHandler.cs
+++ b/src/Services/Masa.Auth.Service.Admin/Application/Sso/QueryHandler.cs
@@ -74,11 +74,11 @@ public void ClientTypeListAsync(ClientTypeListQuery clientTypeListQuery)
                 Description = ct switch
                 {
                     //todo: i18n
-                    ClientTypes.Web => "Server-side applications where authentication and tokens are handled on the server (for example, Go, Java, ASP.Net, Node.js, PHP)",
-                    ClientTypes.Native => "Desktop or mobile applications that run natively on a device and redirect users to a non-HTTP callback (for example, iOS, Android, React Native)",
-                    ClientTypes.Spa => "Single-page web applications that run in the browser where the client receives tokens (for example, Javascript, Angular, React, Vue)",
-                    ClientTypes.Device => "Input-constrained devices such as a smart TV, IoT device, or printer.",
-                    ClientTypes.Machine => "Interact with APIs using the scoped OAuth 2.0 access tokens for machine-to-machine authentication.",
+                    ClientTypes.Web => I18n.T("WebClientDescription"),
+                    ClientTypes.Native => I18n.T("NativeClientDescription"),
+                    ClientTypes.Spa => I18n.T("SpaClientDescription"),
+                    ClientTypes.Device => I18n.T("DeviceClientDescription"),
+                    ClientTypes.Machine => I18n.T("MachineClientDescription"),
                     _ => ""
                 },
                 Icon = ct switch
diff --git a/src/Services/Masa.Auth.Service.Admin/Assets/I18n/en-US.json b/src/Services/Masa.Auth.Service.Admin/Assets/I18n/en-US.json
index 557a35092..0698665b7 100644
--- a/src/Services/Masa.Auth.Service.Admin/Assets/I18n/en-US.json
+++ b/src/Services/Masa.Auth.Service.Admin/Assets/I18n/en-US.json
@@ -85,5 +85,10 @@
   "PasswordFormatVerificationPrompt": "The password must be a combination of letters and numbers, and the length must not be less than 6",
   "APIScopeNameExist": "API Scope exist this name",
   "IdentitySourceNameExist": "Identity Source exist this name",
-  "WebhookNotExist": "The Webhook does not exist"
+  "WebhookNotExist": "The Webhook does not exist",
+  "WebClientDescription": "Server-side applications where authentication and tokens are handled on the server (for example, Go, Java, ASP.Net, Node.js, PHP)",
+  "NativeClientDescription": "Desktop or mobile applications that run natively on a device and redirect users to a non-HTTP callback (for example, iOS, Android, React Native)",
+  "SpaClientDescription": "Single-page web applications that run in the browser where the client receives tokens (for example, Javascript, Angular, React, Vue)",
+  "DeviceClientDescription": "Input-constrained devices such as a smart TV, IoT device, or printer.",
+  "MachineClientDescription": "Interact with APIs using the scoped OAuth 2.0 access tokens for machine-to-machine authentication."
 }
diff --git a/src/Services/Masa.Auth.Service.Admin/Assets/I18n/zh-CN.json b/src/Services/Masa.Auth.Service.Admin/Assets/I18n/zh-CN.json
index c952f8b0c..896bcefee 100644
--- a/src/Services/Masa.Auth.Service.Admin/Assets/I18n/zh-CN.json
+++ b/src/Services/Masa.Auth.Service.Admin/Assets/I18n/zh-CN.json
@@ -85,5 +85,10 @@
   "PasswordFormatVerificationPrompt": "密码必须是字母和数字的组合，且长度不小于6",
   "APIScopeNameExist": "API 范围已存在该名称",
   "IdentitySourceNameExist": "身份资源已存在该名称",
-  "WebhookNotExist": "Webhook记录不存在"
+  "WebhookNotExist": "Webhook记录不存在",
+  "WebClientDescription": "在服务器上处理身份验证和令牌的服务器端应用程序（例如，Go、Java、ASP.Net、Node.js、PHP）",
+  "NativeClientDescription": "在设备上本地运行并将用户重定向到非HTTP回调的桌面或移动应用程序（例如，iOS、Android、React Native）",
+  "SpaClientDescription": "在客户端接收令牌的浏览器中运行的单页web应用程序（例如，Javascript、Angular、React、Vue）",
+  "DeviceClientDescription": "输入受限的设备，如智能电视、物联网设备或打印机。",
+  "MachineClientDescription": "使用作用域OAuth 2.0访问令牌与API交互以进行机器对机器身份验证。"
 }
diff --git a/src/Services/Masa.Auth.Service.Admin/_Imports.cs b/src/Services/Masa.Auth.Service.Admin/_Imports.cs
index f5e538332..5f8ae12f6 100644
--- a/src/Services/Masa.Auth.Service.Admin/_Imports.cs
+++ b/src/Services/Masa.Auth.Service.Admin/_Imports.cs
@@ -109,6 +109,7 @@
 global using Masa.BuildingBlocks.StackSdks.Scheduler.Model;
 global using Masa.BuildingBlocks.StackSdks.Scheduler.Request;
 global using Masa.BuildingBlocks.Storage.ObjectStorage;
+global using Masa.BuildingBlocks.Globalization.I18n;
 global using Masa.Contrib.Authentication.OpenIdConnect.EFCore.Caches;
 global using Masa.Contrib.Authentication.OpenIdConnect.EFCore.DbContexts;
 global using Masa.Contrib.Authentication.OpenIdConnect.EFCore.Repositories;
diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/Client/Section/ClientType.razor b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/Client/Section/ClientType.razor
index 69b0fd591..670dcabb5 100644
--- a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/Client/Section/ClientType.razor
+++ b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Sso/Client/Section/ClientType.razor
@@ -9,7 +9,7 @@
                     <MCard Color="@(context.Active ? "hover-background" : "")" Height="244"
                        OnClick="()=>{ context.Toggle();TypeChanged.InvokeAsync(_clientType.ClientType); }">
                         <MCardTitle Class="d-flex justify-center h5">
-                            <SIcon Size=24 Class="mr-2">@_clientType.Icon</SIcon> @_clientType.ClientType.ToString()
+                            <SIcon Size=24 Class="mr-2">@_clientType.Icon</SIcon> @T(_clientType.ClientType.ToString())
                         </MCardTitle>
                         <MCardText>
                             @_clientType.Description
diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Subjects/ThirdPartyIdps/UpdateThirdPartyIdpDialog.razor b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Subjects/ThirdPartyIdps/UpdateThirdPartyIdpDialog.razor
index b08b3904f..dd73226fc 100644
--- a/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Subjects/ThirdPartyIdps/UpdateThirdPartyIdpDialog.razor
+++ b/src/Web/Masa.Auth.Web.Admin.Rcl/Pages/Subjects/ThirdPartyIdps/UpdateThirdPartyIdpDialog.razor
@@ -14,7 +14,7 @@
                 <DefaultTitle Class="mb-6">@T("BasicInformation")</DefaultTitle>
                 <MRow Class="mb-6 mt-12">
                     <MCol>
-                        <STextField @bind-Value="ThirdPartyIdpDetail.Name" Required Disabled Label="@T("ThirdPartyIdp.Name")" />
+                        <STextField @bind-Value="ThirdPartyIdpDetail.Name" Required Disabled Label="@T("Name")" />
                     </MCol>
                     <MCol>
                         <STextField @bind-Value="ThirdPartyIdp.DisplayName" Required Label="@T(nameof(ThirdPartyIdp.DisplayName))" />
diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/wwwroot/i18n/en-US.json b/src/Web/Masa.Auth.Web.Admin.Rcl/wwwroot/i18n/en-US.json
index 9432c53ac..4f8616495 100644
--- a/src/Web/Masa.Auth.Web.Admin.Rcl/wwwroot/i18n/en-US.json
+++ b/src/Web/Masa.Auth.Web.Admin.Rcl/wwwroot/i18n/en-US.json
@@ -44,6 +44,8 @@
   },
   "CustomLoginBlock": {
     "TitleName": "Name",
+    "LogoUri": "Logo uri",
+    "ClientName": "Client name",
     "NameRequired": "Name is required",
     "DisplayNameRequired": "DisplayName is required",
     "PhoneNumberAndEmailEmptyError": "One of phone number and email must have a value"
@@ -143,6 +145,16 @@
   "Client": "Client",
   "ClientBlock": {
     "ClientId": "Client ID",
+    "ClientName": "Client name",
+    "ClientURL": "Client url",
+    "ClientType": "Client type",
+    "RequireConsent": "Require consent",
+    "AllowRememberConsent": "Allow remember consent",
+    "ConsentLifetime": "Consent lifetime",
+    "UserCodeType": "User code type",
+    "DeviceCodeLifetime": "Device code lifetime",
+    "RequireRequestObject": "Require request object",
+    "EnableLocalLogin": "Enable local login",
     "UserSsoLifetime": "User SSO lifetime",
     "AllowedCorsOrigins": "Allowed CORS origins",
     "PostLogoutRedirectUri": "Post logout redirect URL",
@@ -157,6 +169,37 @@
   },
   "RepeatAdd": "Add Repeatedly",
   "ThirdPartyIdpBlock": {
+    "DisplayName": "Display name",
+    "ClientId": "Client id",
+    "ClientSecret": "Client secret",
+    "AuthenticationTypes": "Authentication types",
+    "VerifyFile": "Verify file",
+    "AuthenticationType": "Authentication type",
+    "PlatformType": "Platform type",
+    "CallbackPath": "Callback path",
+    "AuthorizationEndpoint": "Authorization endpoint",
+    "TokenEndpoint": "Token endpoint",
+    "UserInformationEndpoint": "User information endpoint",
     "LDAPAccountSynchronizPrompt": "LDAP account synchronization has been executed in the background, please check later"
+  },
+  "ThirdPartyUser": "Third party user",
+  "UserBlock": {
+    "UserState": "User state",
+    "CompanyName": "Company name"
+  },
+  "StaffBlock": {
+    "JobNumber": "Job number",
+    "StaffType": "Staff type",
+    "StaffSyncTemplate": "Staff sync template"
+  },
+  "RoleBlock": {
+    "RoleOwner": "Role owner"
+  },
+  "IdentityResourceBlock": {
+    "DisplayName": "Display name"
+  },
+  "Webhook": {
+    "WebhookEvent": "Webhook event",
+    "IsActive": "Is active"
   }
 }
diff --git a/src/Web/Masa.Auth.Web.Admin.Rcl/wwwroot/i18n/zh-CN.json b/src/Web/Masa.Auth.Web.Admin.Rcl/wwwroot/i18n/zh-CN.json
index ee0929cc8..9c4260ded 100644
--- a/src/Web/Masa.Auth.Web.Admin.Rcl/wwwroot/i18n/zh-CN.json
+++ b/src/Web/Masa.Auth.Web.Admin.Rcl/wwwroot/i18n/zh-CN.json
@@ -469,7 +469,7 @@
     "AbsoluteRefreshTokenLifetimeTips": "刷新令牌的最长生命周期（秒）。默认为2592000秒/ 30天",
     "SlidingRefreshTokenLifetime": "滑动刷新令牌生命周期",
     "SlidingRefreshTokenLifetimeTips": "滑动刷新令牌的生命周期，以秒为单位。默认为1296000秒/ 15天",
-    "PairWiseSubjectSalt": "PairWiseSubjectSalt",
+    "PairWiseSubjectSalt": "一对一主体salt",
     "PairWiseSubjectSaltTips": "客户端的用户，在生成的subjectId中使用的salt值。",
     "IncludeJwtId": "嵌入Jwt唯一Id",
     "IncludeJwtIdTips": "指定JWT访问令牌是否应具有嵌入的唯一ID（通过jti声明）。默认值为ture。",