feat: support shared application across organizations (#3108)

* feat: support share application

* revert: revert i18n

* fix: improve code format

* fix: improve code format and move GetSharedOrgFromApp to string.go
This commit is contained in:
DacongDA
2024-08-09 15:43:25 +08:00
committed by GitHub
parent e7230700e0
commit 4c0fff66ff
9 changed files with 75 additions and 16 deletions

View File

@ -116,7 +116,6 @@ class ApplicationEditPage extends React.Component {
UNSAFE_componentWillMount() {
this.getApplication();
this.getOrganizations();
this.getProviders();
}
getApplication() {
@ -145,7 +144,9 @@ class ApplicationEditPage extends React.Component {
application: application,
});
this.getCerts(application.organization);
this.getProviders(application);
this.getCerts(application);
this.getSamlMetadata(application.enableSamlPostBinding);
});
@ -166,7 +167,11 @@ class ApplicationEditPage extends React.Component {
});
}
getCerts(owner) {
getCerts(application) {
let owner = application.organization;
if (application.isShared) {
owner = this.props.owner;
}
CertBackend.getCerts(owner)
.then((res) => {
this.setState({
@ -175,8 +180,12 @@ class ApplicationEditPage extends React.Component {
});
}
getProviders() {
ProviderBackend.getProviders(this.state.owner)
getProviders(application) {
let owner = application.organization;
if (application.isShared) {
owner = this.props.account.owner;
}
ProviderBackend.getProviders(owner)
.then((res) => {
if (res.status === "ok") {
this.setState({
@ -263,6 +272,16 @@ class ApplicationEditPage extends React.Component {
}} />
</Col>
</Row>
<Row style={{marginTop: "20px"}} >
<Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
{Setting.getLabel(i18next.t("general:Is shared"), i18next.t("general:Is shared - Tooltip"))} :
</Col>
<Col span={22} >
<Switch disabled={Setting.isAdminUser()} checked={this.state.application.isShared} onChange={checked => {
this.updateApplicationField("isShared", checked);
}} />
</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"))} :
@ -989,7 +1008,11 @@ class ApplicationEditPage extends React.Component {
redirectUri = "\"ERROR: You must specify at least one Redirect URL in 'Redirect URLs'\"";
}
const signInUrl = `/login/oauth/authorize?client_id=${this.state.application.clientId}&response_type=code&redirect_uri=${redirectUri}&scope=read&state=casdoor`;
let clientId = this.state.application.clientId;
if (this.state.application.isShared && this.props.account.owner !== "built-in") {
clientId += `-org-${this.props.account.owner}`;
}
const signInUrl = `/login/oauth/authorize?client_id=${clientId}&response_type=code&redirect_uri=${redirectUri}&scope=read&state=casdoor`;
const maskStyle = {position: "absolute", top: "0px", left: "0px", zIndex: 10, height: "97%", width: "100%", background: "rgba(0,0,0,0.4)"};
if (!Setting.isPasswordEnabled(this.state.application)) {
signUpUrl = signInUrl.replace("/login/oauth/authorize", "/signup/oauth/authorize");

View File

@ -123,7 +123,7 @@ class ApplicationListPage extends BaseListPage {
render: (text, record, index) => {
return (
<Link to={`/applications/${record.organization}/${text}`}>
{text}
{Setting.getApplicationDisplayName(record)}
</Link>
);
},

View File

@ -360,7 +360,7 @@ class OrganizationEditPage extends React.Component {
</Col>
<Col span={22} >
<Select virtual={false} style={{width: "100%"}} value={this.state.organization.defaultApplication} onChange={(value => {this.updateOrganizationField("defaultApplication", value);})}
options={this.state.applications?.map((item) => Setting.getOption(item.name, item.name))
options={this.state.applications?.map((item) => Setting.getOption(Setting.getApplicationDisplayName(item.name), item.name))
} />
</Col>
</Row>

View File

@ -1371,6 +1371,13 @@ export function getApplicationName(application) {
return `${application?.owner}/${application?.name}`;
}
export function getApplicationDisplayName(application) {
if (application.isShared) {
return `${application.name}(Shared)`;
}
return application.name;
}
export function getRandomName() {
return Math.random().toString(36).slice(-6);
}

View File

@ -125,7 +125,7 @@ class TransactionEditPage extends React.Component {
application: application,
});
this.getCerts(application.organization);
this.getCerts(application);
this.getSamlMetadata(application.enableSamlPostBinding);
});