fix: saml oidc text (#1164)

This commit is contained in:
anuoua 2022-11-30 14:38:06 +08:00 committed by GitHub
parent 6799c9615d
commit b16a764f19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 26 additions and 56 deletions

View File

@ -8,7 +8,6 @@ import React, { useEffect, useState } from 'react';
export interface OIDCProvider { export interface OIDCProvider {
clientId: string; clientId: string;
title: string; title: string;
authorizeUrl: string;
} }
export const OIDCList = () => { export const OIDCList = () => {
@ -75,9 +74,9 @@ export const OIDCList = () => {
display: flex; display: flex;
`} `}
> >
{data?.data?.map?.((item) => ( {data?.data?.map?.((item: OIDCProvider) => (
<Button shape="round" block key={item.clientId} icon={<LoginOutlined />} onClick={() => handleOpen(item)}> <Button shape="round" block key={item.clientId} icon={<LoginOutlined />} onClick={() => handleOpen(item)}>
{item.buttonTitle} {item.title}
</Button> </Button>
))} ))}
</Space> </Space>

View File

@ -14,7 +14,9 @@ export default {
'Redirect url': 'Redirect url', 'Redirect url': 'Redirect url',
'Logout endpoint': 'Logout endpoint', 'Logout endpoint': 'Logout endpoint',
'Id token sign alg': 'Id token sign alg', 'Id token sign alg': 'Id token sign alg',
'Add provider': 'Add provider', 'Add provider': 'Add',
'Edit provider': 'Edit provider', 'Edit provider': 'Edit',
'Delete provider': 'Delete provider', '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',
}; };

View File

@ -18,7 +18,8 @@ export default {
'Redirect url': '重定向地址', 'Redirect url': '重定向地址',
'Logout endpoint': '登出端点', 'Logout endpoint': '登出端点',
'Id token sign alg': 'Id token 签名算法', 'Id token sign alg': 'Id token 签名算法',
'Add provider': '添加身份提供者', 'Add provider': '添加',
'Edit provider': '编辑身份提供者', 'Edit provider': '编辑',
'Delete provider': '删除身份提供者', 'Delete provider': '删除',
'Sign in button name, which will be displayed on the sign in page': '登录按钮名称,将在登录页中显示',
}; };

View File

@ -16,17 +16,6 @@ const collection = {
required: true, required: true,
} as ISchema, } as ISchema,
}, },
{
type: 'string',
name: 'buttonTitle',
interface: 'input',
uiSchema: {
title: '{{t("Button title")}}',
type: 'string',
'x-component': 'Input',
required: true,
} as ISchema,
},
{ {
type: 'string', type: 'string',
name: 'clientId', name: 'clientId',
@ -178,10 +167,7 @@ export const formProperties = {
title: { title: {
'x-component': 'CollectionField', 'x-component': 'CollectionField',
'x-decorator': 'FormItem', 'x-decorator': 'FormItem',
}, description: '{{t("Sign in button name, which will be displayed on the sign in page")}}',
buttonTitle: {
'x-component': 'CollectionField',
'x-decorator': 'FormItem',
}, },
clientId: { clientId: {
'x-component': 'CollectionField', 'x-component': 'CollectionField',

View File

@ -6,7 +6,7 @@ export const getEnabledProviders = async (ctx: Context, next) => {
filter: { filter: {
enabled: true, enabled: true,
}, },
fields: ['buttonTitle', 'clientId'], fields: ['title', 'clientId'],
}); });
return next(); return next();
}; };

View File

@ -10,10 +10,6 @@ export default {
type: 'string', type: 'string',
name: 'title', name: 'title',
}, },
{
name: 'buttonTitle',
type: 'string',
},
{ {
comment: '客户端id', comment: '客户端id',
type: 'string', type: 'string',

View File

@ -76,7 +76,7 @@ export const SAMLList = () => {
> >
{data?.data?.map?.((item) => ( {data?.data?.map?.((item) => (
<Button shape="round" block key={item.clientId} icon={<LoginOutlined />} onClick={() => handleOpen(item)}> <Button shape="round" block key={item.clientId} icon={<LoginOutlined />} onClick={() => handleOpen(item)}>
{item.buttonTitle} {item.title}
</Button> </Button>
))} ))}
</Space> </Space>

View File

@ -10,11 +10,14 @@ export default {
'SAML Providers': 'SAML Providers', 'SAML Providers': 'SAML Providers',
'Redirect url': 'Redirect url', 'Redirect url': 'Redirect url',
'SP entity id': 'SP entity id', 'SP entity id': 'SP entity id',
'Add provider': 'Add provider', 'Add provider': 'Add',
'Edit provider': 'Edit provider', 'Edit provider': 'Edit',
'Client id': 'Client id', 'Client id': 'Client id',
'Entity id or issuer': 'Entity id or issuer', 'Entity id or issuer': 'Entity id or issuer',
'Login Url': 'Login Url', 'Login Url': 'Login Url',
'Public cert': 'Public cert', 'Public cert': 'Public cert',
'Delete provider': 'Delete',
'Are you sure you want to delete it?': 'Are you sure you want to delete it?', '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',
}; };

View File

@ -4,19 +4,20 @@ export default {
Cancel: '取消', Cancel: '取消',
Submit: '提交', Submit: '提交',
Actions: '操作', Actions: '操作',
Title: '身份提供者名称', Title: '名称',
Enable: '启用', Enable: '启用',
'Button title': '登录按钮标题', 'Button title': '登录按钮标题',
'SAML manager': 'SAML 管理', 'SAML manager': 'SAML 管理',
'SAML Providers': 'SAML 身份提供者', 'SAML Providers': 'SAML 身份提供者',
'Redirect url': '重定向地址', 'Redirect url': '重定向地址',
'SP entity id': '应用唯一标识SP Entity ID', 'SP entity id': '应用唯一标识SP Entity ID',
'Add provider': '添加身份提供者', 'Add provider': '添加',
'Edit provider': '编辑身份提供者', 'Edit provider': '编辑',
'Client id': '客户端 id', 'Client id': '客户端 id',
'Entity id or issuer': 'IdP 唯一标识', 'Entity id or issuer': 'IdP 唯一标识',
'Login Url': '登录地址', 'Login Url': '登录地址',
'Public cert': '公钥', 'Public cert': '公钥',
'Delete provider': '删除身份提供者', 'Delete provider': '删除',
'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': '登录按钮名称,将在登录页中显示',
}; };

View File

@ -15,17 +15,6 @@ const collection = {
required: true, required: true,
} as ISchema, } as ISchema,
}, },
{
type: 'string',
name: 'buttonTitle',
interface: 'input',
uiSchema: {
title: '{{t("Button title")}}',
type: 'string',
'x-component': 'Input',
required: true,
} as ISchema,
},
{ {
type: 'string', type: 'string',
name: 'clientId', name: 'clientId',
@ -108,10 +97,7 @@ export const formProperties = {
title: { title: {
'x-component': 'CollectionField', 'x-component': 'CollectionField',
'x-decorator': 'FormItem', 'x-decorator': 'FormItem',
}, description: '{{t("Sign in button name, which will be displayed on the sign in page")}}',
buttonTitle: {
'x-component': 'CollectionField',
'x-decorator': 'FormItem',
}, },
clientId: { clientId: {
'x-component': 'CollectionField', 'x-component': 'CollectionField',

View File

@ -6,7 +6,7 @@ export const getEnabledProviders = async (ctx: Context, next) => {
filter: { filter: {
enabled: true, enabled: true,
}, },
fields: ['buttonTitle', 'clientId'], fields: ['title', 'clientId'],
}); });
return next(); return next();
}; };

View File

@ -9,10 +9,6 @@ export default {
type: 'string', type: 'string',
name: 'title', name: 'title',
}, },
{
type: 'string',
name: 'buttonTitle',
},
{ {
comment: '客户端id', comment: '客户端id',
type: 'string', type: 'string',