llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-05-23 10:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Support empty application in page

Browse Source
This commit is contained in:
Yang Luo 2023-05-16 22:17:39 +08:00
parent 3d9b305bbb
commit 0b5ecca5c8
6 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
object/application.go
View File

@ -326,6 +326,12 @@ func UpdateApplication(id string, application *Application) bool {
} }
func AddApplication(application *Application) bool { func AddApplication(application *Application) bool {
if application.Owner == "" {
application.Owner = "admin"
}
if application.Organization == "" {
application.Organization = "built-in"
}
if application.ClientId == "" { if application.ClientId == "" {
application.ClientId = util.GenerateClientId() application.ClientId = util.GenerateClientId()
} }

2
web/src/ApplicationEditPage.js
View File

@ -790,7 +790,7 @@ class ApplicationEditPage extends React.Component {
let signUpUrl = `/signup/${this.state.application.name}`; let signUpUrl = `/signup/${this.state.application.name}`;
let redirectUri; let redirectUri;
if (this.state.application.redirectUris.length !== 0) { if (this.state.application.redirectUris?.length > 0) {
redirectUri = this.state.application.redirectUris[0]; redirectUri = this.state.application.redirectUris[0];
} else { } else {
redirectUri = "\"ERROR: You must specify at least one Redirect URL in 'Redirect URLs'\""; redirectUri = "\"ERROR: You must specify at least one Redirect URL in 'Redirect URLs'\"";

2
web/src/ApplicationListPage.js
View File

@ -175,7 +175,7 @@ class ApplicationListPage extends BaseListPage {
// width: '600px', // width: '600px',
render: (text, record, index) => { render: (text, record, index) => {
const providers = text; const providers = text;
if (providers.length === 0) { if (providers === null || providers.length === 0) {
return `(${i18next.t("general:empty")})`; return `(${i18next.t("general:empty")})`;
} }

14
web/src/Setting.js
View File

@ -325,19 +325,19 @@ export function isSignupItemPrompted(signupItem) {
} }
export function getAllPromptedProviderItems(application) { export function getAllPromptedProviderItems(application) {
return application.providers.filter(providerItem => isProviderPrompted(providerItem)); return application.providers?.filter(providerItem => isProviderPrompted(providerItem));
} }
export function getAllPromptedSignupItems(application) { export function getAllPromptedSignupItems(application) {
return application.signupItems.filter(signupItem => isSignupItemPrompted(signupItem)); return application.signupItems?.filter(signupItem => isSignupItemPrompted(signupItem));
} }
export function getSignupItem(application, itemName) { export function getSignupItem(application, itemName) {
const signupItems = application.signupItems?.filter(signupItem => signupItem.name === itemName); const signupItems = application.signupItems?.filter(signupItem => signupItem.name === itemName);
if (signupItems.length === 0) { if (signupItems?.length > 0) {
return null; return signupItems[0];
} }
return signupItems[0]; return null;
} }
export function isValidPersonName(personName) { export function isValidPersonName(personName) {
@ -409,12 +409,12 @@ export function isAffiliationPrompted(application) {
export function hasPromptPage(application) { export function hasPromptPage(application) {
const providerItems = getAllPromptedProviderItems(application); const providerItems = getAllPromptedProviderItems(application);
if (providerItems.length !== 0) { if (providerItems?.length > 0) {
return true; return true;
} }
const signupItems = getAllPromptedSignupItems(application); const signupItems = getAllPromptedSignupItems(application);
if (signupItems.length !== 0) { if (signupItems?.length > 0) {
return true; return true;
} }

4
web/src/auth/LoginPage.js
View File

@ -559,7 +559,7 @@ class LoginPage extends React.Component {
</div> </div>
<br /> <br />
{ {
application.providers.filter(providerItem => this.isProviderVisible(providerItem)).map(providerItem => { application.providers?.filter(providerItem => this.isProviderVisible(providerItem)).map(providerItem => {
return ProviderButton.renderProviderLogo(providerItem.provider, application, 40, 10, "big", this.props.location); return ProviderButton.renderProviderLogo(providerItem.provider, application, 40, 10, "big", this.props.location);
}) })
} }
@ -818,7 +818,7 @@ class LoginPage extends React.Component {
); );
} }
const visibleOAuthProviderItems = application.providers.filter(providerItem => this.isProviderVisible(providerItem)); const visibleOAuthProviderItems = (application.providers === null) ? [] : application.providers.filter(providerItem => this.isProviderVisible(providerItem));
if (this.props.preview !== "auto" && !application.enablePassword && visibleOAuthProviderItems.length === 1) { if (this.props.preview !== "auto" && !application.enablePassword && visibleOAuthProviderItems.length === 1) {
Setting.goToLink(Provider.getAuthUrl(application, visibleOAuthProviderItems[0].provider, "signup")); Setting.goToLink(Provider.getAuthUrl(application, visibleOAuthProviderItems[0].provider, "signup"));
return ( return (

4
web/src/table/UrlTable.js
View File

@ -60,6 +60,10 @@ class UrlTable extends React.Component {
} }
renderTable(table) { renderTable(table) {
if (table === null) {
return null;
}
const columns = [ const columns = [
{ {
title: i18next.t("application:Redirect URL"), title: i18next.t("application:Redirect URL"),