feat: add defaultApplication for Orgnization (#1111)

* feat: add defaultApplication for Orgnization Signed-off-by: Yixiang Zhao <seriouszyx@foxmail.com> * fix: remove redundant codes Signed-off-by: Yixiang Zhao <seriouszyx@foxmail.com> * fix: don't use app-built-in Signed-off-by: Yixiang Zhao <seriouszyx@foxmail.com> * fix: add query param Signed-off-by: Yixiang Zhao <seriouszyx@foxmail.com> * Update organization.go * Update organization.go Signed-off-by: Yixiang Zhao <seriouszyx@foxmail.com> Co-authored-by: Yang Luo <hsluoyz@qq.com>
2025-05-23 18:54:03 +08:00 · 2022-09-10 20:41:45 +08:00 · 2022-09-10 20:41:45 +08:00 · b6cdc46023
commit b6cdc46023
parent c661a57cb2
16 changed files with 125 additions and 13 deletions
--- a/authz/authz.go
+++ b/authz/authz.go
@ -110,6 +110,7 @@ p, *, *, GET, /api/saml/metadata, *, *
 p, *, *, *, /cas, *, *
 p, *, *, *, /api/webauthn, *, *
 p, *, *, GET, /api/get-release, *, *
+p, *, *, GET, /api/get-default-application, *, *
 `

 		sa := stringadapter.NewAdapter(ruleText)
--- a/controllers/organization.go
+++ b/controllers/organization.go
@ -121,3 +121,23 @@ func (c *ApiController) DeleteOrganization() {
 	c.Data["json"] = wrapActionResponse(object.DeleteOrganization(&organization))
 	c.ServeJSON()
 }
+
+// GetDefaultApplication ...
+// @Title GetDefaultApplication
+// @Tag Organization API
+// @Description get default application
+// @Param   id     query    string  true        "organization id"
+// @Success 200 {object}  Response The Response object
+// @router /get-default-application [get]
+func (c *ApiController) GetDefaultApplication() {
+	userId := c.GetSessionUsername()
+	id := c.Input().Get("id")
+
+	application := object.GetMaskedApplication(object.GetDefaultApplication(id), userId)
+	if application == nil {
+		c.ResponseError("Please set a default application for this organization")
+		return
+	}
+
+	c.ResponseOk(application)
+}
--- a/object/organization.go
+++ b/object/organization.go
@ -41,6 +41,7 @@ type Organization struct {
 	PasswordSalt       string   `xorm:"varchar(100)" json:"passwordSalt"`
 	PhonePrefix        string   `xorm:"varchar(10)"  json:"phonePrefix"`
 	DefaultAvatar      string   `xorm:"varchar(100)" json:"defaultAvatar"`
+	DefaultApplication string   `xorm:"varchar(100)" json:"defaultApplication"`
 	Tags               []string `xorm:"mediumtext" json:"tags"`
 	MasterPassword     string   `xorm:"varchar(100)" json:"masterPassword"`
 	EnableSoftDeletion bool     `json:"enableSoftDeletion"`
@ -216,3 +217,32 @@ func CheckAccountItemModifyRule(accountItem *AccountItem, user *User) (bool, str
 	}
 	return true, ""
 }
+
+func GetDefaultApplication(id string) *Application {
+	organization := GetOrganization(id)
+	if organization == nil {
+		return nil
+	}
+
+	if organization.DefaultApplication != "" {
+		return getApplication("admin", organization.DefaultApplication)
+	}
+
+	applications := []*Application{}
+	err := adapter.Engine.Asc("created_time").Find(&applications, &Application{Organization: organization.Name})
+	if err != nil {
+		panic(err)
+	}
+
+	if len(applications) == 0 {
+		return nil
+	}
+
+	for _, application := range applications {
+		if application.EnableSignUp {
+			return application
+		}
+	}
+
+	return applications[0]
+}
--- a/routers/router.go
+++ b/routers/router.go
@ -60,6 +60,7 @@ func initAPI() {
 	beego.Router("/api/update-organization", &controllers.ApiController{}, "POST:UpdateOrganization")
 	beego.Router("/api/add-organization", &controllers.ApiController{}, "POST:AddOrganization")
 	beego.Router("/api/delete-organization", &controllers.ApiController{}, "POST:DeleteOrganization")
+	beego.Router("/api/get-default-application", &controllers.ApiController{}, "GET:GetDefaultApplication")

 	beego.Router("/api/get-global-users", &controllers.ApiController{}, "GET:GetGlobalUsers")
 	beego.Router("/api/get-users", &controllers.ApiController{}, "GET:GetUsers")
--- a/web/src/App.js
+++ b/web/src/App.js
@ -388,16 +388,15 @@ class App extends Component {
          </Link>
        </Menu.Item>
      );
+      res.push(
+        <Menu.Item key="/permissions">
+          <Link to="/permissions">
+            {i18next.t("general:Permissions")}
+          </Link>
+        </Menu.Item>
+      );
    }

-    res.push(
-      <Menu.Item key="/permissions">
-        <Link to="/permissions">
-          {i18next.t("general:Permissions")}
-        </Link>
-      </Menu.Item>
-    );
-
    if (Setting.isAdminUser(this.state.account)) {
      res.push(
        <Menu.Item key="/models">
--- a/web/src/OrganizationEditPage.js
+++ b/web/src/OrganizationEditPage.js
@ -15,6 +15,7 @@
 import React from "react";
 import {Button, Card, Col, Input, Row, Select, Switch} from "antd";
 import * as OrganizationBackend from "./backend/OrganizationBackend";
+import * as ApplicationBackend from "./backend/ApplicationBackend";
 import * as LdapBackend from "./backend/LdapBackend";
 import * as Setting from "./Setting";
 import i18next from "i18next";
@ -31,6 +32,7 @@ class OrganizationEditPage extends React.Component {
      classes: props,
      organizationName: props.match.params.organizationName,
      organization: null,
+      applications: [],
      ldaps: null,
      mode: props.location.mode !== undefined ? props.location.mode : "edit",
    };
@ -38,6 +40,7 @@ class OrganizationEditPage extends React.Component {

  UNSAFE_componentWillMount() {
    this.getOrganization();
+    this.getApplications();
    this.getLdaps();
  }

@ -50,6 +53,15 @@ class OrganizationEditPage extends React.Component {
      });
  }

+  getApplications() {
+    ApplicationBackend.getApplicationsByOrganization("admin", this.state.organizationName)
+      .then((applications) => {
+        this.setState({
+          applications: applications,
+        });
+      });
+  }
+
  getLdaps() {
    LdapBackend.getLdaps(this.state.organizationName)
      .then(res => {
@ -209,6 +221,18 @@ class OrganizationEditPage extends React.Component {
            </Row>
          </Col>
        </Row>
+        <Row style={{marginTop: "20px"}} >
+          <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
+            {Setting.getLabel(i18next.t("general:Default application"), i18next.t("general:Default application - Tooltip"))} :
+          </Col>
+          <Col span={22} >
+            <Select virtual={false} style={{width: "100%"}} value={this.state.organization.defaultApplication} onChange={(value => {this.updateOrganizationField("defaultApplication", value);})}>
+              {
+                this.state.applications?.map((item, index) => <Option key={index} value={item.name}>{item.name}</Option>)
+              }
+            </Select>
+          </Col>
+        </Row>
        <Row style={{marginTop: "20px"}} >
          <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
            {Setting.getLabel(i18next.t("organization:Tags"), i18next.t("organization:Tags - Tooltip"))} :
--- a/web/src/OrganizationListPage.js
+++ b/web/src/OrganizationListPage.js
@ -35,6 +35,7 @@ class OrganizationListPage extends BaseListPage {
      PasswordSalt: "",
      phonePrefix: "86",
      defaultAvatar: `${Setting.StaticBaseUrl}/img/casbin.svg`,
+      defaultApplication: "",
      tags: [],
      masterPassword: "",
      enableSoftDeletion: false,
--- a/web/src/auth/LoginPage.js
+++ b/web/src/auth/LoginPage.js
@ -18,6 +18,7 @@ import {Button, Checkbox, Col, Form, Input, Result, Row, Spin, Tabs} from "antd"
 import {LockOutlined, UserOutlined} from "@ant-design/icons";
 import * as UserWebauthnBackend from "../backend/UserWebauthnBackend";
 import * as AuthBackend from "./AuthBackend";
+import * as OrganizationBackend from "../backend/OrganizationBackend";
 import * as ApplicationBackend from "../backend/ApplicationBackend";
 import * as Provider from "./Provider";
 import * as ProviderButton from "./ProviderButton";
@ -90,12 +91,26 @@ class LoginPage extends React.Component {
      return;
    }

-    ApplicationBackend.getApplication("admin", this.state.applicationName)
-      .then((application) => {
-        this.setState({
-          application: application,
+    if (this.state.owner === null || this.state.owner === undefined || this.state.owner === "") {
+      ApplicationBackend.getApplication("admin", this.state.applicationName)
+        .then((application) => {
+          this.setState({
+            application: application,
+          });
        });
-      });
+    } else {
+      OrganizationBackend.getDefaultApplication("admin", this.state.owner)
+        .then((res) => {
+          if (res.status === "ok") {
+            this.setState({
+              application: res.data,
+              applicationName: res.data.name,
+            });
+          } else {
+            Util.showMessage("error", res.msg);
+          }
+        });
+    }
  }

  getSamlApplication() {
--- a/web/src/backend/OrganizationBackend.js
+++ b/web/src/backend/OrganizationBackend.js
@ -54,3 +54,10 @@ export function deleteOrganization(organization) {
    body: JSON.stringify(newOrganization),
  }).then(res => res.json());
 }
+
+export function getDefaultApplication(owner, name) {
+  return fetch(`${Setting.ServerUrl}/api/get-default-application?id=${owner}/${encodeURIComponent(name)}`, {
+    method: "GET",
+    credentials: "include",
+  }).then(res => res.json());
+}
--- a/web/src/locales/de/data.json
+++ b/web/src/locales/de/data.json
@ -124,6 +124,8 @@
    "Click to Upload": "Click to Upload",
    "Client IP": "Client-IP",
    "Created time": "Erstellte Zeit",
+    "Default application": "Default application",
+    "Default application - Tooltip": "Default application - Tooltip",
    "Default avatar": "Standard Avatar",
    "Default avatar - Tooltip": "default avatar",
    "Delete": "Löschen",
--- a/web/src/locales/en/data.json
+++ b/web/src/locales/en/data.json
@ -124,6 +124,8 @@
    "Click to Upload": "Click to Upload",
    "Client IP": "Client IP",
    "Created time": "Created time",
+    "Default application": "Default application",
+    "Default application - Tooltip": "Default application - Tooltip",
    "Default avatar": "Default avatar",
    "Default avatar - Tooltip": "Default avatar - Tooltip",
    "Delete": "Delete",
--- a/web/src/locales/fr/data.json
+++ b/web/src/locales/fr/data.json
@ -124,6 +124,8 @@
    "Click to Upload": "Click to Upload",
    "Client IP": "IP du client",
    "Created time": "Date de création",
+    "Default application": "Default application",
+    "Default application - Tooltip": "Default application - Tooltip",
    "Default avatar": "Avatar par défaut",
    "Default avatar - Tooltip": "default avatar",
    "Delete": "Supprimez",
--- a/web/src/locales/ja/data.json
+++ b/web/src/locales/ja/data.json
@ -124,6 +124,8 @@
    "Click to Upload": "Click to Upload",
    "Client IP": "クライアント IP",
    "Created time": "作成日時",
+    "Default application": "Default application",
+    "Default application - Tooltip": "Default application - Tooltip",
    "Default avatar": "デフォルトのアバター",
    "Default avatar - Tooltip": "default avatar",
    "Delete": "削除",
--- a/web/src/locales/ko/data.json
+++ b/web/src/locales/ko/data.json
@ -124,6 +124,8 @@
    "Click to Upload": "Click to Upload",
    "Client IP": "Client IP",
    "Created time": "Created time",
+    "Default application": "Default application",
+    "Default application - Tooltip": "Default application - Tooltip",
    "Default avatar": "Default avatar",
    "Default avatar - Tooltip": "default avatar",
    "Delete": "Delete",
--- a/web/src/locales/ru/data.json
+++ b/web/src/locales/ru/data.json
@ -124,6 +124,8 @@
    "Click to Upload": "Нажмите здесь, чтобы загрузить",
    "Client IP": "IP клиента",
    "Created time": "Время создания",
+    "Default application": "Default application",
+    "Default application - Tooltip": "Default application - Tooltip",
    "Default avatar": "Аватар по умолчанию",
    "Default avatar - Tooltip": "default avatar",
    "Delete": "Удалить",
--- a/web/src/locales/zh/data.json
+++ b/web/src/locales/zh/data.json
@ -124,6 +124,8 @@
    "Click to Upload": "点击上传",
    "Client IP": "客户端IP",
    "Created time": "创建时间",
+    "Default application": "默认应用",
+    "Default application - Tooltip": "默认应用",
    "Default avatar": "默认头像",
    "Default avatar - Tooltip": "默认头像",
    "Delete": "删除",