llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-08 00:50:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Provider API responses

Browse Source
This commit is contained in:
Yang Luo
2023-06-02 11:49:38 +08:00
parent b1b3184e75
commit 70c372c3f7
5 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
controllers/provider.go
View File

@ -49,8 +49,7 @@ func (c *ApiController) GetProviders() {
panic(err) panic(err)
} }
c.Data["json"] = object.GetMaskedProviders(providers, isMaskEnabled) c.ResponseOk(object.GetMaskedProviders(providers, isMaskEnabled))
c.ServeJSON()
} else { } else {
limit := util.ParseInt(limit) limit := util.ParseInt(limit)
count, err := object.GetProviderCount(owner, field, value) count, err := object.GetProviderCount(owner, field, value)
@ -96,8 +95,7 @@ func (c *ApiController) GetGlobalProviders() {
panic(err) panic(err)
} }
c.Data["json"] = object.GetMaskedProviders(globalProviders, isMaskEnabled) c.ResponseOk(object.GetMaskedProviders(globalProviders, isMaskEnabled))
c.ServeJSON()
} else { } else {
limit := util.ParseInt(limit) limit := util.ParseInt(limit)
count, err := object.GetGlobalProviderCount(field, value) count, err := object.GetGlobalProviderCount(field, value)
@ -138,8 +136,7 @@ func (c *ApiController) GetProvider() {
return return
} }
c.Data["json"] = object.GetMaskedProvider(provider, isMaskEnabled) c.ResponseOk(object.GetMaskedProvider(provider, isMaskEnabled))
c.ServeJSON()
} }
// UpdateProvider // UpdateProvider

13
web/src/ApplicationEditPage.js
View File

@ -155,11 +155,16 @@ class ApplicationEditPage extends React.Component {
} }
getProviders() { getProviders() {
ProviderBackend.getProviders(this.state.owner).then((res => { ProviderBackend.getProviders(this.state.owner)
this.setState({ .then((res) => {
providers: res, if (res.status === "ok") {
this.setState({
providers: res.data,
});
} else {
Setting.showMessage("error", res.msg);
}
}); });
}));
} }
getSamlMetadata() { getSamlMetadata() {

10
web/src/ProductEditPage.js
View File

@ -54,9 +54,13 @@ class ProductEditPage extends React.Component {
getPaymentProviders() { getPaymentProviders() {
ProviderBackend.getProviders(this.props.account.owner) ProviderBackend.getProviders(this.props.account.owner)
.then((res) => { .then((res) => {
this.setState({ if (res.status === "ok") {
providers: res.filter(provider => provider.category === "Payment"), this.setState({
}); providers: res.data.filter(provider => provider.category === "Payment"),
});
} else {
Setting.showMessage("error", res.msg);
}
}); });
} }

12
web/src/ProviderEditPage.js
View File

@ -49,10 +49,14 @@ class ProviderEditPage extends React.Component {
getProvider() { getProvider() {
ProviderBackend.getProvider(this.state.owner, this.state.providerName) ProviderBackend.getProvider(this.state.owner, this.state.providerName)
.then((provider) => { .then((res) => {
this.setState({ if (res.status === "ok") {
provider: provider, this.setState({
}); provider: res.data,
});
} else {
Setting.showMessage("error", res.msg);
}
}); });
} }

3
web/src/common/CaptchaPreview.js
View File

@ -29,9 +29,6 @@ export const CaptchaPreview = (props) => {
provider.providerUrl = providerUrl; provider.providerUrl = providerUrl;
if (clientSecret !== "***") { if (clientSecret !== "***") {
provider.clientSecret = clientSecret; provider.clientSecret = clientSecret;
// ProviderBackend.updateProvider(owner, providerName, provider).then(() => {
// setOpen(true);
// });
setVisible(true); setVisible(true);
} else { } else {
setVisible(true); setVisible(true);