fix: Ensure /api/get-app-login Returns Captcha Provider for Applications Configured with Captcha (#2800 )

In LoginPage.js, the line 92:const captchaProviderItems = this.getCaptchaProviderItems(this.props.application); captchaProviderItems have no Captcha Provider.
feat: fix GetDashboard() page
2025-08-15 19:15:42 +08:00 · 2024-03-15 19:56:12 +08:00 · 2024-03-15 19:52:19 +08:00 · 2024-03-15 19:36:39 +08:00 · 2024-03-13 23:59:05 +08:00 · 2024-03-13 23:33:43 +08:00
33 changed files with 238 additions and 22 deletions
--- a/object/application.go
+++ b/object/application.go
@@ -505,7 +505,7 @@ func GetMaskedApplication(application *Application, userId string) *Application

 	providerItems := []*ProviderItem{}
 	for _, providerItem := range application.Providers {
-		if providerItem.Provider != nil && (providerItem.Provider.Category == "OAuth" || providerItem.Provider.Category == "Web3") {
+		if providerItem.Provider != nil && (providerItem.Provider.Category == "OAuth" || providerItem.Provider.Category == "Web3" || providerItem.Provider.Category == "Captcha") {
 			providerItems = append(providerItems, providerItem)
 		}
 	}
--- a/object/get-dashboard.go
+++ b/object/get-dashboard.go
@@ -28,6 +28,10 @@ type Dashboard struct {
 }

 func GetDashboard(owner string) (*Dashboard, error) {
+	if owner == "All" {
+		owner = ""
+	}
+
 	dashboard := &Dashboard{
 		OrganizationCounts: make([]int, 31),
 		UserCounts:         make([]int, 31),
@@ -36,14 +40,13 @@ func GetDashboard(owner string) (*Dashboard, error) {
 		SubscriptionCounts: make([]int, 31),
 	}

-	var wg sync.WaitGroup
-
 	organizations := []Organization{}
 	users := []User{}
 	providers := []Provider{}
 	applications := []Application{}
 	subscriptions := []Subscription{}

+	var wg sync.WaitGroup
 	wg.Add(5)
 	go func() {
 		defer wg.Done()
--- a/object/organization.go
+++ b/object/organization.go
@@ -54,6 +54,8 @@ type Organization struct {

 	DisplayName            string     `xorm:"varchar(100)" json:"displayName"`
 	WebsiteUrl             string     `xorm:"varchar(100)" json:"websiteUrl"`
+	Logo                   string     `xorm:"varchar(200)" json:"logo"`
+	LogoDark               string     `xorm:"varchar(200)" json:"logoDark"`
 	Favicon                string     `xorm:"varchar(100)" json:"favicon"`
 	PasswordType           string     `xorm:"varchar(100)" json:"passwordType"`
 	PasswordSalt           string     `xorm:"varchar(100)" json:"passwordSalt"`
--- a/object/saml_idp.go
+++ b/object/saml_idp.go
@@ -179,8 +179,8 @@ type IdpSSODescriptor struct {
 }

 type NameIDFormat struct {
-	XMLName xml.Name
-	Value   string `xml:",innerxml"`
+	// XMLName xml.Name
+	Value string `xml:",innerxml"`
 }

 type SingleSignOnService struct {
@@ -190,7 +190,7 @@ type SingleSignOnService struct {
 }

 type Attribute struct {
-	XMLName      xml.Name
+	// XMLName      xml.Name
 	Name         string   `xml:"Name,attr"`
 	NameFormat   string   `xml:"NameFormat,attr"`
 	FriendlyName string   `xml:"FriendlyName,attr"`
--- a/web/src/App.js
+++ b/web/src/App.js
@@ -153,11 +153,7 @@ class App extends Component {
  }

  getLogo(themes) {
-    if (themes.includes("dark")) {
-      return `${Setting.StaticBaseUrl}/img/casdoor-logo_1185x256_dark.png`;
-    } else {
-      return `${Setting.StaticBaseUrl}/img/casdoor-logo_1185x256.png`;
-    }
+    return Setting.getLogo(themes);
  }

  setLanguage(account) {
--- a/web/src/ManagementPage.js
+++ b/web/src/ManagementPage.js
@@ -220,9 +220,29 @@ function ManagementPage(props) {
      return [];
    }

-    const textColor = props.themeAlgorithm.includes("dark") ? "white" : "black";
+    let textColor = "black";
    const twoToneColor = props.themeData.colorPrimary;

+    let logo = props.account.organization.logo ? props.account.organization.logo : Setting.getLogo(props.themeAlgorithm);
+    if (props.themeAlgorithm.includes("dark")) {
+      if (props.account.organization.logoDark) {
+        logo = props.account.organization.logoDark;
+      }
+      textColor = "white";
+    }
+
+    !Setting.isMobile() ? res.push({
+      label:
+            <Link to="/">
+              <img className="logo" src={logo ?? props.logo} alt="logo" />
+            </Link>,
+      disabled: true,
+      style: {
+        padding: 0,
+        height: "auto",
+      },
+    }) : null;
+
    res.push(Setting.getItem(<Link style={{color: textColor}} to="/">{i18next.t("general:Home")}</Link>, "/home", <HomeTwoTone twoToneColor={twoToneColor} />, [
      Setting.getItem(<Link to="/">{i18next.t("general:Dashboard")}</Link>, "/"),
      Setting.getItem(<Link to="/shortcuts">{i18next.t("general:Shortcuts")}</Link>, "/shortcuts"),
@@ -400,11 +420,6 @@ function ManagementPage(props) {
    <React.Fragment>
      <EnableMfaNotification account={props.account} />
      <Header style={{padding: "0", marginBottom: "3px", backgroundColor: props.themeAlgorithm.includes("dark") ? "black" : "white"}} >
-        {Setting.isMobile() ? null : (
-          <Link to={"/"}>
-            <div className="logo" style={{background: `url(${props.logo})`}} />
-          </Link>
-        )}
        {props.requiredEnableMfa || (Setting.isMobile() ?
          <React.Fragment>
            <Drawer title={i18next.t("general:Close")} placement="left" visible={menuVisible} onClose={onClose}>
@@ -426,7 +441,7 @@ function ManagementPage(props) {
            items={getMenuItems()}
            mode={"horizontal"}
            selectedKeys={[props.selectedMenuKey]}
-            style={{position: "absolute", left: "145px", right: menuStyleRight, backgroundColor: props.themeAlgorithm.includes("dark") ? "black" : "white"}}
+            style={{position: "absolute", left: 0, right: menuStyleRight, backgroundColor: props.themeAlgorithm.includes("dark") ? "black" : "white"}}
          />
        )}
        {
--- a/web/src/OrganizationEditPage.js
+++ b/web/src/OrganizationEditPage.js
@@ -56,6 +56,7 @@ class OrganizationEditPage extends React.Component {
            this.props.history.push("/404");
            return;
          }
+          organization["enableDarkLogo"] = !!organization["logoDark"];

          this.setState({
            organization: organization,
@@ -141,6 +142,78 @@ class OrganizationEditPage extends React.Component {
            }} />
          </Col>
        </Row>
+        <Row style={{marginTop: "20px"}} >
+          <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
+            {Setting.getLabel(i18next.t("general:Enable dark logo"), i18next.t("general:Enable dark logo - Tooltip"))} :
+          </Col>
+          <Col span={22} >
+            <Switch checked={this.state.organization.enableDarkLogo} onChange={e => {
+              this.updateOrganizationField("enableDarkLogo", e);
+              if (!e) {
+                this.updateOrganizationField("logoDark", "");
+              }
+            }} />
+          </Col>
+        </Row>
+        <Row style={{marginTop: "20px"}} >
+          <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
+            {Setting.getLabel(i18next.t("general:Logo"), i18next.t("general:Logo - Tooltip"))} :
+          </Col>
+          <Col span={22} >
+            <Row style={{marginTop: "20px"}} >
+              <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 1}>
+                {Setting.getLabel(i18next.t("general:URL"), i18next.t("general:URL - Tooltip"))} :
+              </Col>
+              <Col span={23} >
+                <Input prefix={<LinkOutlined />} value={this.state.organization.logo} onChange={e => {
+                  this.updateOrganizationField("logo", e.target.value);
+                }} />
+              </Col>
+            </Row>
+            <Row style={{marginTop: "20px"}} >
+              <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 1}>
+                {i18next.t("general:Preview")}:
+              </Col>
+              <Col span={23}>
+                <a target="_blank" rel="noreferrer" href={this.state.organization.logo}>
+                  <img src={this.state.organization.logo ? this.state.organization.logo : Setting.getLogo([""])} alt={this.state.organization.logo} height={90} style={{background: "white", marginBottom: "20px"}} />
+                </a>
+              </Col>
+            </Row>
+          </Col>
+        </Row>
+        {
+          !this.state.organization.enableDarkLogo ? null : (<Row style={{marginTop: "20px"}}>
+            <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
+              {Setting.getLabel(i18next.t("general:Logo dark"), i18next.t("general:Logo dark - Tooltip"))} :
+            </Col>
+            <Col span={22}>
+              <Row style={{marginTop: "20px"}}>
+                <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 1}>
+                  {Setting.getLabel(i18next.t("general:URL"), i18next.t("general:URL - Tooltip"))} :
+                </Col>
+                <Col span={23}>
+                  <Input prefix={<LinkOutlined />} value={this.state.organization.logoDark} onChange={e => {
+                    this.updateOrganizationField("logoDark", e.target.value);
+                  }} />
+                </Col>
+              </Row>
+              <Row style={{marginTop: "20px"}}>
+                <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 1}>
+                  {i18next.t("general:Preview")}:
+                </Col>
+                <Col span={23}>
+                  <a target="_blank" rel="noreferrer" href={this.state.organization.logoDark}>
+                    <img
+                      src={this.state.organization.logoDark ? this.state.organization.logoDark : Setting.getLogo(["dark"])}
+                      alt={this.state.organization.logoDark} height={90}
+                      style={{background: "#141414", marginBottom: "20px"}} />
+                  </a>
+                </Col>
+              </Row>
+            </Col>
+          </Row>)
+        }
        <Row style={{marginTop: "20px"}} >
          <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
            {Setting.getLabel(i18next.t("general:Favicon"), i18next.t("general:Favicon - Tooltip"))} :
--- a/web/src/Setting.js
+++ b/web/src/Setting.js
@@ -89,6 +89,14 @@ export function getAlgorithmNames(themeData) {
  return algorithms;
 }

+export function getLogo(themes) {
+  if (themes.includes("dark")) {
+    return `${StaticBaseUrl}/img/casdoor-logo_1185x256_dark.png`;
+  } else {
+    return `${StaticBaseUrl}/img/casdoor-logo_1185x256.png`;
+  }
+}
+
 export const OtherProviderInfo = {
  SMS: {
    "Aliyun SMS": {
--- a/web/src/basic/Dashboard.js
+++ b/web/src/basic/Dashboard.js
@@ -31,17 +31,32 @@ const Dashboard = (props) => {
    return () => window.removeEventListener("storageTourChanged", handleTourChange);
  }, []);

+  React.useEffect(() => {
+    window.addEventListener("storageOrganizationChanged", handleOrganizationChange);
+    return () => window.removeEventListener("storageOrganizationChanged", handleOrganizationChange);
+  }, [props.owner]);
+
  React.useEffect(() => {
    if (!Setting.isLocalAdminUser(props.account)) {
      props.history.push("/apps");
    }
  }, [props.account]);

+  const getOrganizationName = () => {
+    let organization = localStorage.getItem("organization") === "All" ? "" : localStorage.getItem("organization");
+    if (!Setting.isAdminUser(props.account) && Setting.isLocalAdminUser(props.account)) {
+      organization = props.account.owner;
+    }
+    return organization;
+  };
+
  React.useEffect(() => {
    if (!Setting.isLocalAdminUser(props.account)) {
      return;
    }
-    DashboardBackend.getDashboard(props.account.owner).then((res) => {
+
+    const organization = getOrganizationName();
+    DashboardBackend.getDashboard(organization).then((res) => {
      if (res.status === "ok") {
        setDashboardData(res.data);
      } else {
@@ -54,6 +69,21 @@ const Dashboard = (props) => {
    setIsTourVisible(TourConfig.getTourVisible());
  };

+  const handleOrganizationChange = () => {
+    if (!Setting.isLocalAdminUser(props.account)) {
+      return;
+    }
+
+    const organization = getOrganizationName();
+    DashboardBackend.getDashboard(organization).then((res) => {
+      if (res.status === "ok") {
+        setDashboardData(res.data);
+      } else {
+        Setting.showMessage("error", res.msg);
+      }
+    });
+  };
+
  const setIsTourToLocal = () => {
    TourConfig.setIsTourVisible(false);
    setIsTourVisible(false);
--- a/web/src/index.css
+++ b/web/src/index.css
@@ -27,9 +27,6 @@ code {
 }

 .logo {
-  background: url("https://cdn.casbin.org/img/casdoor-logo_1185x256.png");
-  background-size: 130px, 27px !important;
-  width: 130px;
  height: 27px;
  margin: 17px 0 16px 15px;
  float: left;
--- a/web/src/locales/ar/data.json
+++ b/web/src/locales/ar/data.json
@@ -229,6 +229,8 @@
    "Email - Tooltip": "Valid email address",
    "Email only": "Email only",
    "Enable": "Enable",
+    "Enable dark logo": "Enable dark logo",
+    "Enable dark logo - Tooltip": "Enable dark logo",
    "Enabled": "Enabled",
    "Enabled successfully": "Enabled successfully",
    "Enforcers": "Enforcers",
@@ -268,6 +270,8 @@
    "Logging & Auditing": "Logging & Auditing",
    "Logo": "Logo",
    "Logo - Tooltip": "Icons that the application presents to the outside world",
+    "Logo dark": "Logo dark",
+    "Logo dark - Tooltip": "The logo used in dark theme",
    "MFA items": "MFA items",
    "MFA items - Tooltip": "MFA items - Tooltip",
    "Master password": "Master password",
--- a/web/src/locales/de/data.json
+++ b/web/src/locales/de/data.json
@@ -229,6 +229,8 @@
    "Email - Tooltip": "Gültige E-Mail-Adresse",
    "Email only": "Email only",
    "Enable": "Enable",
+    "Enable dark logo": "Enable dark logo",
+    "Enable dark logo - Tooltip": "Enable dark logo",
    "Enabled": "Enabled",
    "Enabled successfully": "Enabled successfully",
    "Enforcers": "Enforcers",
@@ -268,6 +270,8 @@
    "Logging & Auditing": "Logging & Auditing",
    "Logo": "Logo",
    "Logo - Tooltip": "Symbole, die die Anwendung der Außenwelt präsentiert",
+    "Logo dark": "Logo dark",
+    "Logo dark - Tooltip": "The logo used in dark theme",
    "MFA items": "MFA items",
    "MFA items - Tooltip": "MFA items - Tooltip",
    "Master password": "Hauptpasswort",
--- a/web/src/locales/en/data.json
+++ b/web/src/locales/en/data.json
@@ -229,6 +229,8 @@
    "Email - Tooltip": "Valid email address",
    "Email only": "Email only",
    "Enable": "Enable",
+    "Enable dark logo": "Enable dark logo",
+    "Enable dark logo - Tooltip": "Enable dark logo",
    "Enabled": "Enabled",
    "Enabled successfully": "Enabled successfully",
    "Enforcers": "Enforcers",
@@ -268,6 +270,8 @@
    "Logging & Auditing": "Logging & Auditing",
    "Logo": "Logo",
    "Logo - Tooltip": "Icons that the application presents to the outside world",
+    "Logo dark": "Logo dark",
+    "Logo dark - Tooltip": "The logo used in dark theme",
    "MFA items": "MFA items",
    "MFA items - Tooltip": "MFA items - Tooltip",
    "Master password": "Master password",
--- a/web/src/locales/es/data.json
+++ b/web/src/locales/es/data.json
@@ -229,6 +229,8 @@
    "Email - Tooltip": "Dirección de correo electrónico válida",
    "Email only": "Email only",
    "Enable": "Enable",
+    "Enable dark logo": "Enable dark logo",
+    "Enable dark logo - Tooltip": "Enable dark logo",
    "Enabled": "Enabled",
    "Enabled successfully": "Enabled successfully",
    "Enforcers": "Enforcers",
@@ -268,6 +270,8 @@
    "Logging & Auditing": "Logging & Auditing",
    "Logo": "Logotipo",
    "Logo - Tooltip": "Iconos que la aplicación presenta al mundo exterior",
+    "Logo dark": "Logo dark",
+    "Logo dark - Tooltip": "The logo used in dark theme",
    "MFA items": "MFA items",
    "MFA items - Tooltip": "MFA items - Tooltip",
    "Master password": "Contraseña maestra",
--- a/web/src/locales/fa/data.json
+++ b/web/src/locales/fa/data.json
@@ -229,6 +229,8 @@
    "Email - Tooltip": "Valid email address",
    "Email only": "Email only",
    "Enable": "Enable",
+    "Enable dark logo": "Enable dark logo",
+    "Enable dark logo - Tooltip": "Enable dark logo",
    "Enabled": "Enabled",
    "Enabled successfully": "Enabled successfully",
    "Enforcers": "Enforcers",
@@ -268,6 +270,8 @@
    "Logging & Auditing": "Logging & Auditing",
    "Logo": "Logo",
    "Logo - Tooltip": "Icons that the application presents to the outside world",
+    "Logo dark": "Logo dark",
+    "Logo dark - Tooltip": "The logo used in dark theme",
    "MFA items": "MFA items",
    "MFA items - Tooltip": "MFA items - Tooltip",
    "Master password": "Master password",
--- a/web/src/locales/fi/data.json
+++ b/web/src/locales/fi/data.json
@@ -229,6 +229,8 @@
    "Email - Tooltip": "Valid email address",
    "Email only": "Email only",
    "Enable": "Enable",
+    "Enable dark logo": "Enable dark logo",
+    "Enable dark logo - Tooltip": "Enable dark logo",
    "Enabled": "Enabled",
    "Enabled successfully": "Enabled successfully",
    "Enforcers": "Enforcers",
@@ -268,6 +270,8 @@
    "Logging & Auditing": "Logging & Auditing",
    "Logo": "Logo",
    "Logo - Tooltip": "Icons that the application presents to the outside world",
+    "Logo dark": "Logo dark",
+    "Logo dark - Tooltip": "The logo used in dark theme",
    "MFA items": "MFA items",
    "MFA items - Tooltip": "MFA items - Tooltip",
    "Master password": "Master password",
--- a/web/src/locales/fr/data.json
+++ b/web/src/locales/fr/data.json
@@ -229,6 +229,8 @@
    "Email - Tooltip": "Adresse e-mail valide",
    "Email only": "Email only",
    "Enable": "Activer",
+    "Enable dark logo": "Enable dark logo",
+    "Enable dark logo - Tooltip": "Enable dark logo",
    "Enabled": "Activé",
    "Enabled successfully": "Activé avec succès",
    "Enforcers": "Exécuteurs",
@@ -268,6 +270,8 @@
    "Logging & Auditing": "Journalisation et Audit",
    "Logo": "Logo",
    "Logo - Tooltip": "Icônes que l'application présente au monde extérieur",
+    "Logo dark": "Logo dark",
+    "Logo dark - Tooltip": "The logo used in dark theme",
    "MFA items": "Type d'authentification multifacteur",
    "MFA items - Tooltip": "Types d'authentification multifacteur - Infobulle",
    "Master password": "Mot de passe passe-partout",
--- a/web/src/locales/he/data.json
+++ b/web/src/locales/he/data.json
@@ -229,6 +229,8 @@
    "Email - Tooltip": "Valid email address",
    "Email only": "Email only",
    "Enable": "Enable",
+    "Enable dark logo": "Enable dark logo",
+    "Enable dark logo - Tooltip": "Enable dark logo",
    "Enabled": "Enabled",
    "Enabled successfully": "Enabled successfully",
    "Enforcers": "Enforcers",
@@ -268,6 +270,8 @@
    "Logging & Auditing": "Logging & Auditing",
    "Logo": "Logo",
    "Logo - Tooltip": "Icons that the application presents to the outside world",
+    "Logo dark": "Logo dark",
+    "Logo dark - Tooltip": "The logo used in dark theme",
    "MFA items": "MFA items",
    "MFA items - Tooltip": "MFA items - Tooltip",
    "Master password": "Master password",
--- a/web/src/locales/id/data.json
+++ b/web/src/locales/id/data.json
@@ -229,6 +229,8 @@
    "Email - Tooltip": "Alamat email yang valid",
    "Email only": "Email only",
    "Enable": "Enable",
+    "Enable dark logo": "Enable dark logo",
+    "Enable dark logo - Tooltip": "Enable dark logo",
    "Enabled": "Enabled",
    "Enabled successfully": "Enabled successfully",
    "Enforcers": "Enforcers",
@@ -268,6 +270,8 @@
    "Logging & Auditing": "Logging & Auditing",
    "Logo": "Logo",
    "Logo - Tooltip": "Ikon-ikon yang disajikan aplikasi ke dunia luar",
+    "Logo dark": "Logo dark",
+    "Logo dark - Tooltip": "The logo used in dark theme",
    "MFA items": "MFA items",
    "MFA items - Tooltip": "MFA items - Tooltip",
    "Master password": "Kata sandi utama",
--- a/web/src/locales/it/data.json
+++ b/web/src/locales/it/data.json
@@ -229,6 +229,8 @@
    "Email - Tooltip": "Valid email address",
    "Email only": "Email only",
    "Enable": "Enable",
+    "Enable dark logo": "Enable dark logo",
+    "Enable dark logo - Tooltip": "Enable dark logo",
    "Enabled": "Enabled",
    "Enabled successfully": "Enabled successfully",
    "Enforcers": "Enforcers",
@@ -268,6 +270,8 @@
    "Logging & Auditing": "Logging & Auditing",
    "Logo": "Logo",
    "Logo - Tooltip": "Icons that the application presents to the outside world",
+    "Logo dark": "Logo dark",
+    "Logo dark - Tooltip": "The logo used in dark theme",
    "MFA items": "MFA items",
    "MFA items - Tooltip": "MFA items - Tooltip",
    "Master password": "Master password",
--- a/web/src/locales/ja/data.json
+++ b/web/src/locales/ja/data.json
@@ -229,6 +229,8 @@
    "Email - Tooltip": "有効な電子メールアドレス",
    "Email only": "Email only",
    "Enable": "Enable",
+    "Enable dark logo": "Enable dark logo",
+    "Enable dark logo - Tooltip": "Enable dark logo",
    "Enabled": "Enabled",
    "Enabled successfully": "Enabled successfully",
    "Enforcers": "Enforcers",
@@ -268,6 +270,8 @@
    "Logging & Auditing": "Logging & Auditing",
    "Logo": "ロゴ",
    "Logo - Tooltip": "アプリケーションが外部世界に示すアイコン",
+    "Logo dark": "Logo dark",
+    "Logo dark - Tooltip": "The logo used in dark theme",
    "MFA items": "MFA items",
    "MFA items - Tooltip": "MFA items - Tooltip",
    "Master password": "マスターパスワード",
--- a/web/src/locales/kk/data.json
+++ b/web/src/locales/kk/data.json
@@ -229,6 +229,8 @@
    "Email - Tooltip": "Valid email address",
    "Email only": "Email only",
    "Enable": "Enable",
+    "Enable dark logo": "Enable dark logo",
+    "Enable dark logo - Tooltip": "Enable dark logo",
    "Enabled": "Enabled",
    "Enabled successfully": "Enabled successfully",
    "Enforcers": "Enforcers",
@@ -268,6 +270,8 @@
    "Logging & Auditing": "Logging & Auditing",
    "Logo": "Logo",
    "Logo - Tooltip": "Icons that the application presents to the outside world",
+    "Logo dark": "Logo dark",
+    "Logo dark - Tooltip": "The logo used in dark theme",
    "MFA items": "MFA items",
    "MFA items - Tooltip": "MFA items - Tooltip",
    "Master password": "Master password",
--- a/web/src/locales/ko/data.json
+++ b/web/src/locales/ko/data.json
@@ -229,6 +229,8 @@
    "Email - Tooltip": "유효한 이메일 주소",
    "Email only": "Email only",
    "Enable": "Enable",
+    "Enable dark logo": "Enable dark logo",
+    "Enable dark logo - Tooltip": "Enable dark logo",
    "Enabled": "Enabled",
    "Enabled successfully": "Enabled successfully",
    "Enforcers": "Enforcers",
@@ -268,6 +270,8 @@
    "Logging & Auditing": "Logging & Auditing",
    "Logo": "로고",
    "Logo - Tooltip": "애플리케이션이 외부 세계에 제시하는 아이콘들",
+    "Logo dark": "Logo dark",
+    "Logo dark - Tooltip": "The logo used in dark theme",
    "MFA items": "MFA items",
    "MFA items - Tooltip": "MFA items - Tooltip",
    "Master password": "마스터 비밀번호",
--- a/web/src/locales/ms/data.json
+++ b/web/src/locales/ms/data.json
@@ -229,6 +229,8 @@
    "Email - Tooltip": "Valid email address",
    "Email only": "Email only",
    "Enable": "Enable",
+    "Enable dark logo": "Enable dark logo",
+    "Enable dark logo - Tooltip": "Enable dark logo",
    "Enabled": "Enabled",
    "Enabled successfully": "Enabled successfully",
    "Enforcers": "Enforcers",
@@ -268,6 +270,8 @@
    "Logging & Auditing": "Logging & Auditing",
    "Logo": "Logo",
    "Logo - Tooltip": "Icons that the application presents to the outside world",
+    "Logo dark": "Logo dark",
+    "Logo dark - Tooltip": "The logo used in dark theme",
    "MFA items": "MFA items",
    "MFA items - Tooltip": "MFA items - Tooltip",
    "Master password": "Master password",
--- a/web/src/locales/nl/data.json
+++ b/web/src/locales/nl/data.json
@@ -229,6 +229,8 @@
    "Email - Tooltip": "Valid email address",
    "Email only": "Email only",
    "Enable": "Enable",
+    "Enable dark logo": "Enable dark logo",
+    "Enable dark logo - Tooltip": "Enable dark logo",
    "Enabled": "Enabled",
    "Enabled successfully": "Enabled successfully",
    "Enforcers": "Enforcers",
@@ -268,6 +270,8 @@
    "Logging & Auditing": "Logging & Auditing",
    "Logo": "Logo",
    "Logo - Tooltip": "Icons that the application presents to the outside world",
+    "Logo dark": "Logo dark",
+    "Logo dark - Tooltip": "The logo used in dark theme",
    "MFA items": "MFA items",
    "MFA items - Tooltip": "MFA items - Tooltip",
    "Master password": "Master password",
--- a/web/src/locales/pl/data.json
+++ b/web/src/locales/pl/data.json
@@ -229,6 +229,8 @@
    "Email - Tooltip": "Valid email address",
    "Email only": "Email only",
    "Enable": "Enable",
+    "Enable dark logo": "Enable dark logo",
+    "Enable dark logo - Tooltip": "Enable dark logo",
    "Enabled": "Enabled",
    "Enabled successfully": "Enabled successfully",
    "Enforcers": "Enforcers",
@@ -268,6 +270,8 @@
    "Logging & Auditing": "Logging & Auditing",
    "Logo": "Logo",
    "Logo - Tooltip": "Icons that the application presents to the outside world",
+    "Logo dark": "Logo dark",
+    "Logo dark - Tooltip": "The logo used in dark theme",
    "MFA items": "MFA items",
    "MFA items - Tooltip": "MFA items - Tooltip",
    "Master password": "Master password",
--- a/web/src/locales/pt/data.json
+++ b/web/src/locales/pt/data.json
@@ -229,6 +229,8 @@
    "Email - Tooltip": "Endereço de e-mail válido",
    "Email only": "Email only",
    "Enable": "Habilitar",
+    "Enable dark logo": "Enable dark logo",
+    "Enable dark logo - Tooltip": "Enable dark logo",
    "Enabled": "Habilitado",
    "Enabled successfully": "Habilitado com sucesso",
    "Enforcers": "Enforcers",
@@ -268,6 +270,8 @@
    "Logging & Auditing": "Logging & Auditing",
    "Logo": "Logo",
    "Logo - Tooltip": "Ícones que o aplicativo apresenta para o mundo externo",
+    "Logo dark": "Logo dark",
+    "Logo dark - Tooltip": "The logo used in dark theme",
    "MFA items": "MFA items",
    "MFA items - Tooltip": "MFA items - Tooltip",
    "Master password": "Senha mestra",
--- a/web/src/locales/ru/data.json
+++ b/web/src/locales/ru/data.json
@@ -229,6 +229,8 @@
    "Email - Tooltip": "Действительный адрес электронной почты",
    "Email only": "Email only",
    "Enable": "Включить",
+    "Enable dark logo": "Enable dark logo",
+    "Enable dark logo - Tooltip": "Enable dark logo",
    "Enabled": "Включено",
    "Enabled successfully": "Успешно включено",
    "Enforcers": "Контролёры доступа",
@@ -268,6 +270,8 @@
    "Logging & Auditing": "Logging & Auditing",
    "Logo": "Логотип",
    "Logo - Tooltip": "Иконки, которые приложение представляет во внешний мир",
+    "Logo dark": "Logo dark",
+    "Logo dark - Tooltip": "The logo used in dark theme",
    "MFA items": "MFA items",
    "MFA items - Tooltip": "MFA items - Tooltip",
    "Master password": "Главный пароль",
--- a/web/src/locales/sv/data.json
+++ b/web/src/locales/sv/data.json
@@ -229,6 +229,8 @@
    "Email - Tooltip": "Valid email address",
    "Email only": "Email only",
    "Enable": "Enable",
+    "Enable dark logo": "Enable dark logo",
+    "Enable dark logo - Tooltip": "Enable dark logo",
    "Enabled": "Enabled",
    "Enabled successfully": "Enabled successfully",
    "Enforcers": "Enforcers",
@@ -268,6 +270,8 @@
    "Logging & Auditing": "Logging & Auditing",
    "Logo": "Logo",
    "Logo - Tooltip": "Icons that the application presents to the outside world",
+    "Logo dark": "Logo dark",
+    "Logo dark - Tooltip": "The logo used in dark theme",
    "MFA items": "MFA items",
    "MFA items - Tooltip": "MFA items - Tooltip",
    "Master password": "Master password",
--- a/web/src/locales/tr/data.json
+++ b/web/src/locales/tr/data.json
@@ -229,6 +229,8 @@
    "Email - Tooltip": "Geçerli e-posta adresi",
    "Email only": "Sadece eposta",
    "Enable": "Etkinleştir",
+    "Enable dark logo": "Enable dark logo",
+    "Enable dark logo - Tooltip": "Enable dark logo",
    "Enabled": "Etkin",
    "Enabled successfully": "Başarıyla etkinleştirildi",
    "Enforcers": "Enforcers",
@@ -268,6 +270,8 @@
    "Logging & Auditing": "Logging & Auditing",
    "Logo": "Logo",
    "Logo - Tooltip": "Icons that the application presents to the outside world",
+    "Logo dark": "Logo dark",
+    "Logo dark - Tooltip": "The logo used in dark theme",
    "MFA items": "MFA items",
    "MFA items - Tooltip": "MFA items - Tooltip",
    "Master password": "Master password",
--- a/web/src/locales/uk/data.json
+++ b/web/src/locales/uk/data.json
@@ -229,6 +229,8 @@
    "Email - Tooltip": "Valid email address",
    "Email only": "Email only",
    "Enable": "Enable",
+    "Enable dark logo": "Enable dark logo",
+    "Enable dark logo - Tooltip": "Enable dark logo",
    "Enabled": "Enabled",
    "Enabled successfully": "Enabled successfully",
    "Enforcers": "Enforcers",
@@ -268,6 +270,8 @@
    "Logging & Auditing": "Logging & Auditing",
    "Logo": "Logo",
    "Logo - Tooltip": "Icons that the application presents to the outside world",
+    "Logo dark": "Logo dark",
+    "Logo dark - Tooltip": "The logo used in dark theme",
    "MFA items": "MFA items",
    "MFA items - Tooltip": "MFA items - Tooltip",
    "Master password": "Master password",
--- a/web/src/locales/vi/data.json
+++ b/web/src/locales/vi/data.json
@@ -229,6 +229,8 @@
    "Email - Tooltip": "Địa chỉ email hợp lệ",
    "Email only": "Email only",
    "Enable": "Enable",
+    "Enable dark logo": "Enable dark logo",
+    "Enable dark logo - Tooltip": "Enable dark logo",
    "Enabled": "Enabled",
    "Enabled successfully": "Enabled successfully",
    "Enforcers": "Enforcers",
@@ -268,6 +270,8 @@
    "Logging & Auditing": "Logging & Auditing",
    "Logo": "Biểu tượng",
    "Logo - Tooltip": "Biểu tượng mà ứng dụng hiển thị ra ngoài thế giới",
+    "Logo dark": "Logo dark",
+    "Logo dark - Tooltip": "The logo used in dark theme",
    "MFA items": "MFA items",
    "MFA items - Tooltip": "MFA items - Tooltip",
    "Master password": "Mật khẩu chính",
--- a/web/src/locales/zh/data.json
+++ b/web/src/locales/zh/data.json
@@ -229,6 +229,8 @@
    "Email - Tooltip": "合法的电子邮件地址",
    "Email only": "仅支持邮件",
    "Enable": "启用",
+    "Enable dark logo": "开启暗黑Logo",
+    "Enable dark logo - Tooltip": "开启暗黑Logo",
    "Enabled": "已开启",
    "Enabled successfully": "启用成功",
    "Enforcers": "Casbin执行器",
@@ -268,6 +270,8 @@
    "Logging & Auditing": "日志 & 审计",
    "Logo": "Logo",
    "Logo - Tooltip": "应用程序向外展示的图标",
+    "Logo dark": "暗黑logo",
+    "Logo dark - Tooltip": "暗黑主题下使用的logo",
    "MFA items": "MFA 项",
    "MFA items - Tooltip": "MFA 项 - Tooltip",
    "Master password": "万能密码",
Author	SHA1	Message	Date
Will.Feng	57431a59ad	fix: Ensure /api/get-app-login Returns Captcha Provider for Applications Configured with Captcha (#2800 ) In LoginPage.js, the line 92:const captchaProviderItems = this.getCaptchaProviderItems(this.props.application); captchaProviderItems have no Captcha Provider.	2024-03-15 19:56:12 +08:00
Yang Luo	88a4736520	feat: fix GetDashboard() page	2024-03-15 19:52:19 +08:00
xiao-kong-long	2cb6ff69ae	fix: show selected organizations' statistics in dashboard page (#2805 ) * fix: show selected organizations' statistics in dashboard page * Update get-dashboard.go * Update saml_idp.go --------- Co-authored-by: Eric Luo <hsluoyz@qq.com>	2024-03-15 19:36:39 +08:00
leon.zhao	e1e5943a3e	fix: fix the issue of adding xmlns="" when generating XML (#2799 ) * fix:solve the problem of adding xmlns="" when generating XML * fix:remove fmt.Println * Update saml_idp.go --------- Co-authored-by: zhaoxianfei <zhaoxianfei@meiqia.cn> Co-authored-by: Eric Luo <hsluoyz@qq.com>	2024-03-13 23:59:05 +08:00
DacongDA	3875896c1e	feat: support custom header logo (#2801 ) * feat: support custom header logo * feat: add i18n * feat: preview default logo when field is empty * feat: improve logo setting and display logic * feat: change logoLight to logo	2024-03-13 23:33:43 +08:00