From 7393b90155bb9a11408337b9129f8362f02e960f Mon Sep 17 00:00:00 2001 From: Gucheng Wang Date: Tue, 27 Sep 2022 20:06:46 +0800 Subject: [PATCH] Add enableAutoSignin to application --- object/application.go | 1 + web/src/ApplicationEditPage.js | 10 ++++++++++ web/src/auth/LoginPage.js | 6 ++++++ 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 ++ 10 files changed, 31 insertions(+) diff --git a/object/application.go b/object/application.go index 96b0ef18..05aa2e1f 100644 --- a/object/application.go +++ b/object/application.go @@ -46,6 +46,7 @@ type Application struct { EnablePassword bool `json:"enablePassword"` EnableSignUp bool `json:"enableSignUp"` EnableSigninSession bool `json:"enableSigninSession"` + EnableAutoSignin bool `json:"enableAutoSignin"` EnableCodeSignin bool `json:"enableCodeSignin"` EnableSamlCompress bool `json:"enableSamlCompress"` EnableWebAuthn bool `json:"enableWebAuthn"` diff --git a/web/src/ApplicationEditPage.js b/web/src/ApplicationEditPage.js index a5408a48..1ce6f8ee 100644 --- a/web/src/ApplicationEditPage.js +++ b/web/src/ApplicationEditPage.js @@ -353,6 +353,16 @@ class ApplicationEditPage extends React.Component { }} /> + + + {Setting.getLabel(i18next.t("application:Auto signin"), i18next.t("application:Auto signin - Tooltip"))} : + + + { + this.updateApplicationField("enableAutoSignin", checked); + }} /> + + {Setting.getLabel(i18next.t("application:Enable code signin"), i18next.t("application:Enable code signin - Tooltip"))} : diff --git a/web/src/auth/LoginPage.js b/web/src/auth/LoginPage.js index f1f9adbc..fd007d79 100644 --- a/web/src/auth/LoginPage.js +++ b/web/src/auth/LoginPage.js @@ -555,6 +555,12 @@ class LoginPage extends React.Component { this.onFinish(values); } + if (application.enableAutoSignin) { + const values = {}; + values["application"] = this.state.application.name; + this.onFinish(values); + } + return (
{/* {*/} diff --git a/web/src/locales/de/data.json b/web/src/locales/de/data.json index 2ecca2e7..57a5d060 100644 --- a/web/src/locales/de/data.json +++ b/web/src/locales/de/data.json @@ -13,6 +13,8 @@ "Sync": "Sync" }, "application": { + "Auto signin": "Auto signin", + "Auto signin - Tooltip": "Auto signin - Tooltip", "Background URL": "Background URL", "Background URL - Tooltip": "Background URL - Tooltip", "Copy SAML metadata URL": "Copy SAML metadata URL", diff --git a/web/src/locales/en/data.json b/web/src/locales/en/data.json index 07886cae..fd42752f 100644 --- a/web/src/locales/en/data.json +++ b/web/src/locales/en/data.json @@ -13,6 +13,8 @@ "Sync": "Sync" }, "application": { + "Auto signin": "Auto signin", + "Auto signin - Tooltip": "Auto signin - Tooltip", "Background URL": "Background URL", "Background URL - Tooltip": "Background URL - Tooltip", "Copy SAML metadata URL": "Copy SAML metadata URL", diff --git a/web/src/locales/fr/data.json b/web/src/locales/fr/data.json index 2d8fbfc1..3c7c7a2c 100644 --- a/web/src/locales/fr/data.json +++ b/web/src/locales/fr/data.json @@ -13,6 +13,8 @@ "Sync": "Sync" }, "application": { + "Auto signin": "Auto signin", + "Auto signin - Tooltip": "Auto signin - Tooltip", "Background URL": "Background URL", "Background URL - Tooltip": "Background URL - Tooltip", "Copy SAML metadata URL": "Copy SAML metadata URL", diff --git a/web/src/locales/ja/data.json b/web/src/locales/ja/data.json index cecebdef..60ca9637 100644 --- a/web/src/locales/ja/data.json +++ b/web/src/locales/ja/data.json @@ -13,6 +13,8 @@ "Sync": "Sync" }, "application": { + "Auto signin": "Auto signin", + "Auto signin - Tooltip": "Auto signin - Tooltip", "Background URL": "Background URL", "Background URL - Tooltip": "Background URL - Tooltip", "Copy SAML metadata URL": "Copy SAML metadata URL", diff --git a/web/src/locales/ko/data.json b/web/src/locales/ko/data.json index e7a6d6c3..1d03875f 100644 --- a/web/src/locales/ko/data.json +++ b/web/src/locales/ko/data.json @@ -13,6 +13,8 @@ "Sync": "Sync" }, "application": { + "Auto signin": "Auto signin", + "Auto signin - Tooltip": "Auto signin - Tooltip", "Background URL": "Background URL", "Background URL - Tooltip": "Background URL - Tooltip", "Copy SAML metadata URL": "Copy SAML metadata URL", diff --git a/web/src/locales/ru/data.json b/web/src/locales/ru/data.json index cf28f25d..5fff91c7 100644 --- a/web/src/locales/ru/data.json +++ b/web/src/locales/ru/data.json @@ -13,6 +13,8 @@ "Sync": "Sync" }, "application": { + "Auto signin": "Auto signin", + "Auto signin - Tooltip": "Auto signin - Tooltip", "Background URL": "Background URL", "Background URL - Tooltip": "Background URL - Tooltip", "Copy SAML metadata URL": "Копировать адрес метаданных SAML", diff --git a/web/src/locales/zh/data.json b/web/src/locales/zh/data.json index 0451af3f..9790c9ac 100644 --- a/web/src/locales/zh/data.json +++ b/web/src/locales/zh/data.json @@ -13,6 +13,8 @@ "Sync": "同步" }, "application": { + "Auto signin": "启用自动登录", + "Auto signin - Tooltip": "当Casdoor存在已登录会话时，自动采用该会话进行应用端的登录", "Background URL": "背景图URL", "Background URL - Tooltip": "登录页背景图的链接", "Copy SAML metadata URL": "复制SAML元数据URL",