From e1c54744dced5751f1671e0d291df8d17bd5b093 Mon Sep 17 00:00:00 2001 From: Yang Luo Date: Tue, 8 Feb 2022 20:59:20 +0800 Subject: [PATCH] Add cert to ApplicationEditPage.js --- web/src/ApplicationEditPage.js | 24 ++++++++++++++++++++++++ web/src/ApplicationListPage.js | 1 + web/src/locales/de/data.json | 2 ++ web/src/locales/en/data.json | 2 ++ web/src/locales/fr/data.json | 2 ++ web/src/locales/ja/data.json | 2 ++ web/src/locales/ko/data.json | 2 ++ web/src/locales/ru/data.json | 2 ++ web/src/locales/zh/data.json | 2 ++ 9 files changed, 39 insertions(+) diff --git a/web/src/ApplicationEditPage.js b/web/src/ApplicationEditPage.js index 2e321d7f..a0a7320e 100644 --- a/web/src/ApplicationEditPage.js +++ b/web/src/ApplicationEditPage.js @@ -16,6 +16,7 @@ import React from "react"; import {Button, Card, Col, Input, Popover, Row, Select, Switch, Upload} from 'antd'; import {LinkOutlined, UploadOutlined} from "@ant-design/icons"; import * as ApplicationBackend from "./backend/ApplicationBackend"; +import * as CertBackend from "./backend/CertBackend"; import * as Setting from "./Setting"; import * as ProviderBackend from "./backend/ProviderBackend"; import * as OrganizationBackend from "./backend/OrganizationBackend"; @@ -43,6 +44,7 @@ class ApplicationEditPage extends React.Component { applicationName: props.match.params.applicationName, application: null, organizations: [], + certs: [], providers: [], uploading: false, }; @@ -51,6 +53,7 @@ class ApplicationEditPage extends React.Component { UNSAFE_componentWillMount() { this.getApplication(); this.getOrganizations(); + this.getCerts(); this.getProviders(); } @@ -72,6 +75,15 @@ class ApplicationEditPage extends React.Component { }); } + getCerts() { + CertBackend.getCerts("admin") + .then((res) => { + this.setState({ + certs: (res.msg === undefined) ? res : [], + }); + }); + } + getProviders() { ProviderBackend.getProviders("admin") .then((res) => { @@ -226,6 +238,18 @@ class ApplicationEditPage extends React.Component { }} /> + + + {Setting.getLabel(i18next.t("general:Cert"), i18next.t("general:Cert - Tooltip"))} : + + + + + {Setting.getLabel(i18next.t("application:Redirect URLs"), i18next.t("application:Redirect URLs - Tooltip"))} : diff --git a/web/src/ApplicationListPage.js b/web/src/ApplicationListPage.js index 5a3d2e2d..2b8f2cf1 100644 --- a/web/src/ApplicationListPage.js +++ b/web/src/ApplicationListPage.js @@ -47,6 +47,7 @@ class ApplicationListPage extends BaseListPage { {name: "Phone", visible: true, required: true, rule: "None"}, {name: "Agreement", visible: true, required: true, rule: "None"}, ], + cert: "cert-built-in", redirectUris: ["http://localhost:9000/callback"], tokenFormat: "JWT", expireInHours: 24 * 7, diff --git a/web/src/locales/de/data.json b/web/src/locales/de/data.json index 20fb2cea..4d8e7928 100644 --- a/web/src/locales/de/data.json +++ b/web/src/locales/de/data.json @@ -92,6 +92,8 @@ "Avatar - Tooltip": "Avatar to show to others", "Back Home": "Zurück zu Hause", "Captcha": "Captcha", + "Cert": "Cert", + "Cert - Tooltip": "Cert - Tooltip", "Certs": "Certs", "Client IP": "Client-IP", "Created time": "Erstellte Zeit", diff --git a/web/src/locales/en/data.json b/web/src/locales/en/data.json index 0954ba08..6fe9e0fa 100644 --- a/web/src/locales/en/data.json +++ b/web/src/locales/en/data.json @@ -92,6 +92,8 @@ "Avatar - Tooltip": "Avatar - Tooltip", "Back Home": "Back Home", "Captcha": "Captcha", + "Cert": "Cert", + "Cert - Tooltip": "Cert - Tooltip", "Certs": "Certs", "Client IP": "Client IP", "Created time": "Created time", diff --git a/web/src/locales/fr/data.json b/web/src/locales/fr/data.json index 4493ef75..0f33049d 100644 --- a/web/src/locales/fr/data.json +++ b/web/src/locales/fr/data.json @@ -92,6 +92,8 @@ "Avatar - Tooltip": "Avatar to show to others", "Back Home": "Retour à la page d'accueil", "Captcha": "Captcha", + "Cert": "Cert", + "Cert - Tooltip": "Cert - Tooltip", "Certs": "Certes", "Client IP": "IP du client", "Created time": "Date de création", diff --git a/web/src/locales/ja/data.json b/web/src/locales/ja/data.json index d3c44d67..624335d5 100644 --- a/web/src/locales/ja/data.json +++ b/web/src/locales/ja/data.json @@ -92,6 +92,8 @@ "Avatar - Tooltip": "Avatar to show to others", "Back Home": "ホーム", "Captcha": "Captcha", + "Cert": "Cert", + "Cert - Tooltip": "Cert - Tooltip", "Certs": "Certs", "Client IP": "クライアント IP", "Created time": "作成日時", diff --git a/web/src/locales/ko/data.json b/web/src/locales/ko/data.json index 2dc7b696..c816d612 100644 --- a/web/src/locales/ko/data.json +++ b/web/src/locales/ko/data.json @@ -92,6 +92,8 @@ "Avatar - Tooltip": "Avatar to show to others", "Back Home": "Back Home", "Captcha": "Captcha", + "Cert": "Cert", + "Cert - Tooltip": "Cert - Tooltip", "Certs": "Certs", "Client IP": "Client IP", "Created time": "Created time", diff --git a/web/src/locales/ru/data.json b/web/src/locales/ru/data.json index aa1517bb..a01f464c 100644 --- a/web/src/locales/ru/data.json +++ b/web/src/locales/ru/data.json @@ -92,6 +92,8 @@ "Avatar - Tooltip": "Avatar to show to others", "Back Home": "Назад", "Captcha": "Капча", + "Cert": "Cert", + "Cert - Tooltip": "Cert - Tooltip", "Certs": "Сертификаты", "Client IP": "IP клиента", "Created time": "Время создания", diff --git a/web/src/locales/zh/data.json b/web/src/locales/zh/data.json index 9af83849..c0742abd 100644 --- a/web/src/locales/zh/data.json +++ b/web/src/locales/zh/data.json @@ -92,6 +92,8 @@ "Avatar - Tooltip": "向其他人展示的头像", "Back Home": "返回到首页", "Captcha": "人机验证码", + "Cert": "证书", + "Cert - Tooltip": "该应用所对应的客户端SDK需要验证的公钥证书", "Certs": "证书", "Client IP": "客户端IP", "Created time": "创建时间",