From 31d981baf1f5af27aac3c41a3b0e8ab7e2717dc2 Mon Sep 17 00:00:00 2001 From: Yang Luo Date: Sun, 23 May 2021 23:38:38 +0800 Subject: [PATCH] Fix small issues. --- authz/authz.go | 1 + object/application.go | 4 ++++ object/provider.go | 2 +- web/src/ProviderEditPage.js | 4 ++-- web/src/ProviderListPage.js | 5 ++++- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/authz/authz.go b/authz/authz.go index 0dcb63a4..07d8c040 100644 --- a/authz/authz.go +++ b/authz/authz.go @@ -88,6 +88,7 @@ p, *, *, POST, /api/unlink, *, * p, *, *, POST, /api/set-password, *, * p, *, *, POST, /api/send-verification-code, *, * p, *, *, GET, /api/get-human-check, *, * +p, *, *, POST, /api/reset-email-or-phone, *, * ` sa := stringadapter.NewAdapter(ruleText) diff --git a/object/application.go b/object/application.go index eb8b9c22..211ec24e 100644 --- a/object/application.go +++ b/object/application.go @@ -57,6 +57,10 @@ func extendApplicationWithProviders(application *Application) { providers := GetProviders(application.Owner) m := map[string]*Provider{} for _, provider := range providers { + if provider.Category != "OAuth" { + continue + } + provider.ClientSecret = "" provider.ProviderUrl = "" m[provider.Name] = provider diff --git a/object/provider.go b/object/provider.go index 687025b0..9a07c127 100644 --- a/object/provider.go +++ b/object/provider.go @@ -84,7 +84,7 @@ func getDefaultEmailProvider() *Provider { } func getDefaultPhoneProvider() *Provider { - provider := Provider{Owner: "admin", Category: "Phone"} + provider := Provider{Owner: "admin", Category: "SMS"} existed, err := adapter.Engine.Get(&provider) if err != nil { panic(err) diff --git a/web/src/ProviderEditPage.js b/web/src/ProviderEditPage.js index e0bf209f..2390e05c 100644 --- a/web/src/ProviderEditPage.js +++ b/web/src/ProviderEditPage.js @@ -187,7 +187,7 @@ class ProviderEditPage extends React.Component { - ) : this.state.provider.category === "Phone" ? ( + ) : this.state.provider.category === "SMS" ? ( @@ -222,7 +222,7 @@ class ProviderEditPage extends React.Component { ) : null } - {this.state.provider.category === "Phone" && this.state.provider.type === "tencent" ? ( + {this.state.provider.category === "SMS" && this.state.provider.type === "tencent" ? ( {i18next.t("provider:App ID")}: diff --git a/web/src/ProviderListPage.js b/web/src/ProviderListPage.js index 09b09d04..4488aa52 100644 --- a/web/src/ProviderListPage.js +++ b/web/src/ProviderListPage.js @@ -148,8 +148,11 @@ class ProviderListPage extends React.Component { title: i18next.t("provider:Client ID"), dataIndex: 'clientId', key: 'clientId', - width: '150px', + width: '100px', sorter: (a, b) => a.clientId.localeCompare(b.clientId), + render: (text, record, index) => { + return Setting.getShortText(text); + } }, // { // title: 'Client secret',