diff --git a/packages/plugins/oidc/src/client/OIDCList.tsx b/packages/plugins/oidc/src/client/OIDCList.tsx
index 5dd8a584e..9c9f41761 100644
--- a/packages/plugins/oidc/src/client/OIDCList.tsx
+++ b/packages/plugins/oidc/src/client/OIDCList.tsx
@@ -8,7 +8,6 @@ import React, { useEffect, useState } from 'react';
export interface OIDCProvider {
clientId: string;
title: string;
- authorizeUrl: string;
}
export const OIDCList = () => {
@@ -75,9 +74,9 @@ export const OIDCList = () => {
display: flex;
`}
>
- {data?.data?.map?.((item) => (
+ {data?.data?.map?.((item: OIDCProvider) => (
} onClick={() => handleOpen(item)}>
- {item.buttonTitle}
+ {item.title}
))}
diff --git a/packages/plugins/oidc/src/client/locale/en-US.ts b/packages/plugins/oidc/src/client/locale/en-US.ts
index fbd242d07..9e2941996 100644
--- a/packages/plugins/oidc/src/client/locale/en-US.ts
+++ b/packages/plugins/oidc/src/client/locale/en-US.ts
@@ -14,7 +14,9 @@ export default {
'Redirect url': 'Redirect url',
'Logout endpoint': 'Logout endpoint',
'Id token sign alg': 'Id token sign alg',
- 'Add provider': 'Add provider',
- 'Edit provider': 'Edit provider',
- 'Delete provider': 'Delete provider',
+ 'Add provider': 'Add',
+ 'Edit provider': 'Edit',
+ 'Delete provider': 'Delete',
+ 'Sign in button name, which will be displayed on the sign in page':
+ 'Sign in button name, which will be displayed on the sign in page',
};
diff --git a/packages/plugins/oidc/src/client/locale/zh-CN.ts b/packages/plugins/oidc/src/client/locale/zh-CN.ts
index 260e168a6..cd8ae7120 100644
--- a/packages/plugins/oidc/src/client/locale/zh-CN.ts
+++ b/packages/plugins/oidc/src/client/locale/zh-CN.ts
@@ -18,7 +18,8 @@ export default {
'Redirect url': '重定向地址',
'Logout endpoint': '登出端点',
'Id token sign alg': 'Id token 签名算法',
- 'Add provider': '添加身份提供者',
- 'Edit provider': '编辑身份提供者',
- 'Delete provider': '删除身份提供者',
+ 'Add provider': '添加',
+ 'Edit provider': '编辑',
+ 'Delete provider': '删除',
+ 'Sign in button name, which will be displayed on the sign in page': '登录按钮名称,将在登录页中显示',
};
diff --git a/packages/plugins/oidc/src/client/schemas/oidc.ts b/packages/plugins/oidc/src/client/schemas/oidc.ts
index 8f63b45d3..268d6548b 100644
--- a/packages/plugins/oidc/src/client/schemas/oidc.ts
+++ b/packages/plugins/oidc/src/client/schemas/oidc.ts
@@ -16,17 +16,6 @@ const collection = {
required: true,
} as ISchema,
},
- {
- type: 'string',
- name: 'buttonTitle',
- interface: 'input',
- uiSchema: {
- title: '{{t("Button title")}}',
- type: 'string',
- 'x-component': 'Input',
- required: true,
- } as ISchema,
- },
{
type: 'string',
name: 'clientId',
@@ -178,10 +167,7 @@ export const formProperties = {
title: {
'x-component': 'CollectionField',
'x-decorator': 'FormItem',
- },
- buttonTitle: {
- 'x-component': 'CollectionField',
- 'x-decorator': 'FormItem',
+ description: '{{t("Sign in button name, which will be displayed on the sign in page")}}',
},
clientId: {
'x-component': 'CollectionField',
diff --git a/packages/plugins/oidc/src/server/actions/getEnabledProviders.ts b/packages/plugins/oidc/src/server/actions/getEnabledProviders.ts
index a97a8995e..02d97b08f 100644
--- a/packages/plugins/oidc/src/server/actions/getEnabledProviders.ts
+++ b/packages/plugins/oidc/src/server/actions/getEnabledProviders.ts
@@ -6,7 +6,7 @@ export const getEnabledProviders = async (ctx: Context, next) => {
filter: {
enabled: true,
},
- fields: ['buttonTitle', 'clientId'],
+ fields: ['title', 'clientId'],
});
return next();
};
diff --git a/packages/plugins/oidc/src/server/collections/oidcProviders.ts b/packages/plugins/oidc/src/server/collections/oidcProviders.ts
index 72eff40ea..bf51755ca 100644
--- a/packages/plugins/oidc/src/server/collections/oidcProviders.ts
+++ b/packages/plugins/oidc/src/server/collections/oidcProviders.ts
@@ -10,10 +10,6 @@ export default {
type: 'string',
name: 'title',
},
- {
- name: 'buttonTitle',
- type: 'string',
- },
{
comment: '客户端id',
type: 'string',
diff --git a/packages/plugins/saml/src/client/SAMLList.tsx b/packages/plugins/saml/src/client/SAMLList.tsx
index b165134e6..64d4d07d2 100644
--- a/packages/plugins/saml/src/client/SAMLList.tsx
+++ b/packages/plugins/saml/src/client/SAMLList.tsx
@@ -76,7 +76,7 @@ export const SAMLList = () => {
>
{data?.data?.map?.((item) => (
} onClick={() => handleOpen(item)}>
- {item.buttonTitle}
+ {item.title}
))}
diff --git a/packages/plugins/saml/src/client/locale/en-US.ts b/packages/plugins/saml/src/client/locale/en-US.ts
index 4da4b3f27..056d2b670 100644
--- a/packages/plugins/saml/src/client/locale/en-US.ts
+++ b/packages/plugins/saml/src/client/locale/en-US.ts
@@ -10,11 +10,14 @@ export default {
'SAML Providers': 'SAML Providers',
'Redirect url': 'Redirect url',
'SP entity id': 'SP entity id',
- 'Add provider': 'Add provider',
- 'Edit provider': 'Edit provider',
+ 'Add provider': 'Add',
+ 'Edit provider': 'Edit',
'Client id': 'Client id',
'Entity id or issuer': 'Entity id or issuer',
'Login Url': 'Login Url',
'Public cert': 'Public cert',
+ 'Delete provider': 'Delete',
'Are you sure you want to delete it?': 'Are you sure you want to delete it?',
+ 'Sign in button name, which will be displayed on the sign in page':
+ 'Sign in button name, which will be displayed on the sign in page',
};
diff --git a/packages/plugins/saml/src/client/locale/zh-CN.ts b/packages/plugins/saml/src/client/locale/zh-CN.ts
index 8e7677547..d9247dc9d 100644
--- a/packages/plugins/saml/src/client/locale/zh-CN.ts
+++ b/packages/plugins/saml/src/client/locale/zh-CN.ts
@@ -4,19 +4,20 @@ export default {
Cancel: '取消',
Submit: '提交',
Actions: '操作',
- Title: '身份提供者名称',
+ Title: '名称',
Enable: '启用',
'Button title': '登录按钮标题',
'SAML manager': 'SAML 管理',
'SAML Providers': 'SAML 身份提供者',
'Redirect url': '重定向地址',
'SP entity id': '应用唯一标识(SP Entity ID)',
- 'Add provider': '添加身份提供者',
- 'Edit provider': '编辑身份提供者',
+ 'Add provider': '添加',
+ 'Edit provider': '编辑',
'Client id': '客户端 id',
'Entity id or issuer': 'IdP 唯一标识',
'Login Url': '登录地址',
'Public cert': '公钥',
- 'Delete provider': '删除身份提供者',
+ 'Delete provider': '删除',
'Are you sure you want to delete it?': '你确定要删除它吗?',
+ 'Sign in button name, which will be displayed on the sign in page': '登录按钮名称,将在登录页中显示',
};
diff --git a/packages/plugins/saml/src/client/schemas/saml.ts b/packages/plugins/saml/src/client/schemas/saml.ts
index 0f9501cd2..b676e94ca 100644
--- a/packages/plugins/saml/src/client/schemas/saml.ts
+++ b/packages/plugins/saml/src/client/schemas/saml.ts
@@ -15,17 +15,6 @@ const collection = {
required: true,
} as ISchema,
},
- {
- type: 'string',
- name: 'buttonTitle',
- interface: 'input',
- uiSchema: {
- title: '{{t("Button title")}}',
- type: 'string',
- 'x-component': 'Input',
- required: true,
- } as ISchema,
- },
{
type: 'string',
name: 'clientId',
@@ -108,10 +97,7 @@ export const formProperties = {
title: {
'x-component': 'CollectionField',
'x-decorator': 'FormItem',
- },
- buttonTitle: {
- 'x-component': 'CollectionField',
- 'x-decorator': 'FormItem',
+ description: '{{t("Sign in button name, which will be displayed on the sign in page")}}',
},
clientId: {
'x-component': 'CollectionField',
diff --git a/packages/plugins/saml/src/server/actions/getEnabledProviders.ts b/packages/plugins/saml/src/server/actions/getEnabledProviders.ts
index bcfb1b617..708e21389 100644
--- a/packages/plugins/saml/src/server/actions/getEnabledProviders.ts
+++ b/packages/plugins/saml/src/server/actions/getEnabledProviders.ts
@@ -6,7 +6,7 @@ export const getEnabledProviders = async (ctx: Context, next) => {
filter: {
enabled: true,
},
- fields: ['buttonTitle', 'clientId'],
+ fields: ['title', 'clientId'],
});
return next();
};
diff --git a/packages/plugins/saml/src/server/collections/samlProviders.ts b/packages/plugins/saml/src/server/collections/samlProviders.ts
index 1fabbe862..9545689f2 100644
--- a/packages/plugins/saml/src/server/collections/samlProviders.ts
+++ b/packages/plugins/saml/src/server/collections/samlProviders.ts
@@ -9,10 +9,6 @@ export default {
type: 'string',
name: 'title',
},
- {
- type: 'string',
- name: 'buttonTitle',
- },
{
comment: '客户端id',
type: 'string',