diff --git a/controllers/application.go b/controllers/application.go index 27e378c2..c7f0c239 100644 --- a/controllers/application.go +++ b/controllers/application.go @@ -48,14 +48,11 @@ func (c *ApiController) GetApplications() { } else { applications, err = object.GetOrganizationApplications(owner, organization) } - if err != nil { c.ResponseError(err.Error()) return } - - c.Data["json"] = object.GetMaskedApplications(applications, userId) - c.ServeJSON() + c.ResponseOk(object.GetMaskedApplications(applications, userId)) } else { limit := util.ParseInt(limit) count, err := object.GetApplicationCount(owner, field, value) @@ -86,14 +83,14 @@ func (c *ApiController) GetApplications() { func (c *ApiController) GetApplication() { userId := c.GetSessionUsername() id := c.Input().Get("id") + app, err := object.GetApplication(id) if err != nil { c.ResponseError(err.Error()) return } - c.Data["json"] = object.GetMaskedApplication(app, userId) - c.ServeJSON() + c.ResponseOk(object.GetMaskedApplication(app, userId)) } // GetUserApplication @@ -106,25 +103,24 @@ func (c *ApiController) GetApplication() { func (c *ApiController) GetUserApplication() { userId := c.GetSessionUsername() id := c.Input().Get("id") + user, err := object.GetUser(id) if err != nil { c.ResponseError(err.Error()) return } - if user == nil { c.ResponseError(fmt.Sprintf(c.T("general:The user: %s doesn't exist"), id)) return } - app, err := object.GetApplicationByUser(user) + application, err := object.GetApplicationByUser(user) if err != nil { c.ResponseError(err.Error()) return } - c.Data["json"] = object.GetMaskedApplication(app, userId) - c.ServeJSON() + c.ResponseOk(object.GetMaskedApplication(application, userId)) } // GetOrganizationApplications @@ -157,8 +153,7 @@ func (c *ApiController) GetOrganizationApplications() { return } - c.Data["json"] = object.GetMaskedApplications(applications, userId) - c.ServeJSON() + c.ResponseOk(object.GetMaskedApplications(applications, userId)) } else { limit := util.ParseInt(limit) diff --git a/controllers/cert.go b/controllers/cert.go index 44934d4e..d89b8c92 100644 --- a/controllers/cert.go +++ b/controllers/cert.go @@ -45,8 +45,7 @@ func (c *ApiController) GetCerts() { return } - c.Data["json"] = maskedCerts - c.ServeJSON() + c.ResponseOk(maskedCerts) } else { limit := util.ParseInt(limit) count, err := object.GetCertCount(owner, field, value) @@ -87,8 +86,7 @@ func (c *ApiController) GetGlobleCerts() { return } - c.Data["json"] = maskedCerts - c.ServeJSON() + c.ResponseOk(maskedCerts) } else { limit := util.ParseInt(limit) count, err := object.GetGlobalCertsCount(field, value) @@ -123,8 +121,7 @@ func (c *ApiController) GetCert() { return } - c.Data["json"] = object.GetMaskedCert(cert) - c.ServeJSON() + c.ResponseOk(object.GetMaskedCert(cert)) } // UpdateCert diff --git a/controllers/chat.go b/controllers/chat.go index 2a497048..c0911386 100644 --- a/controllers/chat.go +++ b/controllers/chat.go @@ -45,8 +45,7 @@ func (c *ApiController) GetChats() { return } - c.Data["json"] = maskedChats - c.ServeJSON() + c.ResponseOk(maskedChats) } else { limit := util.ParseInt(limit) count, err := object.GetChatCount(owner, field, value) @@ -82,8 +81,7 @@ func (c *ApiController) GetChat() { return } - c.Data["json"] = maskedChat - c.ServeJSON() + c.ResponseOk(maskedChat) } // UpdateChat diff --git a/controllers/group.go b/controllers/group.go index d89d6360..b863055f 100644 --- a/controllers/group.go +++ b/controllers/group.go @@ -82,9 +82,9 @@ func (c *ApiController) GetGroup() { group, err := object.GetGroup(id) if err != nil { c.ResponseError(err.Error()) - } else { - c.ResponseOk(group) + return } + c.ResponseOk(group) } // UpdateGroup diff --git a/controllers/ldap.go b/controllers/ldap.go index 307a16ba..b2ae5a74 100644 --- a/controllers/ldap.go +++ b/controllers/ldap.go @@ -125,7 +125,12 @@ func (c *ApiController) GetLdap() { } _, name := util.GetOwnerAndNameFromId(id) - c.ResponseOk(object.GetMaskedLdap(object.GetLdap(name))) + ldap, err := object.GetLdap(name) + if err != nil { + c.ResponseError(err.Error()) + return + } + c.ResponseOk(object.GetMaskedLdap(ldap)) } // AddLdap diff --git a/controllers/message.go b/controllers/message.go index 04fb4880..79a5b367 100644 --- a/controllers/message.go +++ b/controllers/message.go @@ -57,8 +57,7 @@ func (c *ApiController) GetMessages() { return } - c.Data["json"] = object.GetMaskedMessages(messages) - c.ServeJSON() + c.ResponseOk(object.GetMaskedMessages(messages)) } else { limit := util.ParseInt(limit) count, err := object.GetMessageCount(owner, organization, field, value) @@ -94,8 +93,7 @@ func (c *ApiController) GetMessage() { return } - c.Data["json"] = object.GetMaskedMessage(message) - c.ServeJSON() + c.ResponseOk(message) } func (c *ApiController) ResponseErrorStream(errorText string) { diff --git a/controllers/model.go b/controllers/model.go index 916ff7bb..c45b122d 100644 --- a/controllers/model.go +++ b/controllers/model.go @@ -45,8 +45,7 @@ func (c *ApiController) GetModels() { return } - c.Data["json"] = models - c.ServeJSON() + c.ResponseOk(models) } else { limit := util.ParseInt(limit) count, err := object.GetModelCount(owner, field, value) @@ -82,8 +81,7 @@ func (c *ApiController) GetModel() { return } - c.Data["json"] = model - c.ServeJSON() + c.ResponseOk(model) } // UpdateModel diff --git a/controllers/organization.go b/controllers/organization.go index eb0c4f23..f3fc69a7 100644 --- a/controllers/organization.go +++ b/controllers/organization.go @@ -55,8 +55,7 @@ func (c *ApiController) GetOrganizations() { return } - c.Data["json"] = maskedOrganizations - c.ServeJSON() + c.ResponseOk(maskedOrganizations) } else { if !isGlobalAdmin { maskedOrganizations, err := object.GetMaskedOrganizations(object.GetOrganizations(owner, c.getCurrentUser().Owner)) diff --git a/controllers/payment.go b/controllers/payment.go index 16548810..45d1431c 100644 --- a/controllers/payment.go +++ b/controllers/payment.go @@ -46,8 +46,7 @@ func (c *ApiController) GetPayments() { return } - c.Data["json"] = payments - c.ServeJSON() + c.ResponseOk(payments) } else { limit := util.ParseInt(limit) count, err := object.GetPaymentCount(owner, organization, field, value) @@ -106,8 +105,7 @@ func (c *ApiController) GetPayment() { return } - c.Data["json"] = payment - c.ServeJSON() + c.ResponseOk(payment) } // UpdatePayment diff --git a/controllers/permission.go b/controllers/permission.go index 82215aba..21240248 100644 --- a/controllers/permission.go +++ b/controllers/permission.go @@ -45,8 +45,7 @@ func (c *ApiController) GetPermissions() { return } - c.Data["json"] = permissions - c.ServeJSON() + c.ResponseOk(permissions) } else { limit := util.ParseInt(limit) count, err := object.GetPermissionCount(owner, field, value) @@ -85,7 +84,6 @@ func (c *ApiController) GetPermissionsBySubmitter() { } c.ResponseOk(permissions, len(permissions)) - return } // GetPermissionsByRole @@ -104,7 +102,6 @@ func (c *ApiController) GetPermissionsByRole() { } c.ResponseOk(permissions, len(permissions)) - return } // GetPermission @@ -123,8 +120,7 @@ func (c *ApiController) GetPermission() { return } - c.Data["json"] = permission - c.ServeJSON() + c.ResponseOk(permission) } // UpdatePermission diff --git a/controllers/plan.go b/controllers/plan.go index 09ab18cc..a8e8f387 100644 --- a/controllers/plan.go +++ b/controllers/plan.go @@ -45,8 +45,7 @@ func (c *ApiController) GetPlans() { return } - c.Data["json"] = plans - c.ServeJSON() + c.ResponseOk(plans) } else { limit := util.ParseInt(limit) count, err := object.GetPlanCount(owner, field, value) diff --git a/controllers/pricing.go b/controllers/pricing.go index 81729380..e683e19a 100644 --- a/controllers/pricing.go +++ b/controllers/pricing.go @@ -45,8 +45,7 @@ func (c *ApiController) GetPricings() { return } - c.Data["json"] = pricings - c.ServeJSON() + c.ResponseOk(pricings) } else { limit := util.ParseInt(limit) count, err := object.GetPricingCount(owner, field, value) @@ -82,8 +81,7 @@ func (c *ApiController) GetPricing() { return } - c.Data["json"] = pricing - c.ServeJSON() + c.ResponseOk(pricing) } // UpdatePricing diff --git a/controllers/product.go b/controllers/product.go index c7575120..488f1f7a 100644 --- a/controllers/product.go +++ b/controllers/product.go @@ -46,8 +46,7 @@ func (c *ApiController) GetProducts() { return } - c.Data["json"] = products - c.ServeJSON() + c.ResponseOk(products) } else { limit := util.ParseInt(limit) count, err := object.GetProductCount(owner, field, value) diff --git a/controllers/record.go b/controllers/record.go index 2a338291..05b535bb 100644 --- a/controllers/record.go +++ b/controllers/record.go @@ -51,8 +51,7 @@ func (c *ApiController) GetRecords() { return } - c.Data["json"] = records - c.ServeJSON() + c.ResponseOk(records) } else { limit := util.ParseInt(limit) if c.IsGlobalAdmin() && organizationName != "" { @@ -99,8 +98,7 @@ func (c *ApiController) GetRecordsByFilter() { return } - c.Data["json"] = records - c.ServeJSON() + c.ResponseOk(records) } // AddRecord diff --git a/controllers/resource.go b/controllers/resource.go index d1cd809c..320c547e 100644 --- a/controllers/resource.go +++ b/controllers/resource.go @@ -67,8 +67,7 @@ func (c *ApiController) GetResources() { return } - c.Data["json"] = resources - c.ServeJSON() + c.ResponseOk(resources) } else { limit := util.ParseInt(limit) count, err := object.GetResourceCount(owner, user, field, value) @@ -104,8 +103,7 @@ func (c *ApiController) GetResource() { return } - c.Data["json"] = resource - c.ServeJSON() + c.ResponseOk(resource) } // UpdateResource diff --git a/controllers/role.go b/controllers/role.go index 2ac62095..6d1361a7 100644 --- a/controllers/role.go +++ b/controllers/role.go @@ -45,8 +45,7 @@ func (c *ApiController) GetRoles() { return } - c.Data["json"] = roles - c.ServeJSON() + c.ResponseOk(roles) } else { limit := util.ParseInt(limit) count, err := object.GetRoleCount(owner, field, value) @@ -82,8 +81,7 @@ func (c *ApiController) GetRole() { return } - c.Data["json"] = role - c.ServeJSON() + c.ResponseOk(role) } // UpdateRole diff --git a/controllers/session.go b/controllers/session.go index ebab79b6..01dd9eb7 100644 --- a/controllers/session.go +++ b/controllers/session.go @@ -45,8 +45,7 @@ func (c *ApiController) GetSessions() { return } - c.Data["json"] = sessions - c.ServeJSON() + c.ResponseOk(sessions) } else { limit := util.ParseInt(limit) count, err := object.GetSessionCount(owner, field, value) @@ -81,8 +80,7 @@ func (c *ApiController) GetSingleSession() { return } - c.Data["json"] = session - c.ServeJSON() + c.ResponseOk(session) } // UpdateSession @@ -161,7 +159,5 @@ func (c *ApiController) IsSessionDuplicated() { return } - c.Data["json"] = &Response{Status: "ok", Msg: "", Data: isUserSessionDuplicated} - - c.ServeJSON() + c.ResponseOk(isUserSessionDuplicated) } diff --git a/controllers/subscription.go b/controllers/subscription.go index 747d88a1..0b6c4621 100644 --- a/controllers/subscription.go +++ b/controllers/subscription.go @@ -45,8 +45,7 @@ func (c *ApiController) GetSubscriptions() { return } - c.Data["json"] = subscriptions - c.ServeJSON() + c.ResponseOk(subscriptions) } else { limit := util.ParseInt(limit) count, err := object.GetSubscriptionCount(owner, field, value) @@ -82,8 +81,7 @@ func (c *ApiController) GetSubscription() { return } - c.Data["json"] = subscription - c.ServeJSON() + c.ResponseOk(subscription) } // UpdateSubscription diff --git a/controllers/syncer.go b/controllers/syncer.go index c8f7d3c3..baa03753 100644 --- a/controllers/syncer.go +++ b/controllers/syncer.go @@ -46,8 +46,7 @@ func (c *ApiController) GetSyncers() { return } - c.Data["json"] = organizationSyncers - c.ServeJSON() + c.ResponseOk(organizationSyncers) } else { limit := util.ParseInt(limit) count, err := object.GetSyncerCount(owner, organization, field, value) @@ -83,8 +82,7 @@ func (c *ApiController) GetSyncer() { return } - c.Data["json"] = syncer - c.ServeJSON() + c.ResponseOk(syncer) } // UpdateSyncer diff --git a/controllers/token.go b/controllers/token.go index 41de9a05..454c1378 100644 --- a/controllers/token.go +++ b/controllers/token.go @@ -47,8 +47,7 @@ func (c *ApiController) GetTokens() { return } - c.Data["json"] = token - c.ServeJSON() + c.ResponseOk(token) } else { limit := util.ParseInt(limit) count, err := object.GetTokenCount(owner, organization, field, value) @@ -83,8 +82,7 @@ func (c *ApiController) GetToken() { return } - c.Data["json"] = token - c.ServeJSON() + c.ResponseOk(token) } // UpdateToken diff --git a/controllers/user.go b/controllers/user.go index 37587775..ead1e02c 100644 --- a/controllers/user.go +++ b/controllers/user.go @@ -45,8 +45,7 @@ func (c *ApiController) GetGlobalUsers() { return } - c.Data["json"] = maskedUsers - c.ServeJSON() + c.ResponseOk(maskedUsers) } else { limit := util.ParseInt(limit) count, err := object.GetGlobalUserCount(field, value) @@ -106,8 +105,7 @@ func (c *ApiController) GetUsers() { return } - c.Data["json"] = maskedUsers - c.ServeJSON() + c.ResponseOk(maskedUsers) } else { limit := util.ParseInt(limit) count, err := object.GetUserCount(owner, field, value, groupName) @@ -215,8 +213,7 @@ func (c *ApiController) GetUser() { return } - c.Data["json"] = maskedUser - c.ServeJSON() + c.ResponseOk(maskedUser) } // UpdateUser diff --git a/controllers/webhook.go b/controllers/webhook.go index 64091ce1..85b1aa0f 100644 --- a/controllers/webhook.go +++ b/controllers/webhook.go @@ -46,8 +46,7 @@ func (c *ApiController) GetWebhooks() { return } - c.Data["json"] = webhooks - c.ServeJSON() + c.ResponseOk(webhooks) } else { limit := util.ParseInt(limit) count, err := object.GetWebhookCount(owner, organization, field, value) @@ -84,8 +83,7 @@ func (c *ApiController) GetWebhook() { return } - c.Data["json"] = webhook - c.ServeJSON() + c.ResponseOk(webhook) } // UpdateWebhook diff --git a/web/src/AdapterEditPage.js b/web/src/AdapterEditPage.js index bd0c2367..ab01429b 100644 --- a/web/src/AdapterEditPage.js +++ b/web/src/AdapterEditPage.js @@ -68,7 +68,7 @@ class AdapterEditPage extends React.Component { OrganizationBackend.getOrganizations("admin") .then((res) => { this.setState({ - organizations: (res.msg === undefined) ? res : [], + organizations: res.data || [], }); }); } @@ -80,8 +80,9 @@ class AdapterEditPage extends React.Component { Setting.showMessage("error", res.msg); return; } + this.setState({ - models: res, + models: res.data, }); }); } diff --git a/web/src/ApplicationEditPage.js b/web/src/ApplicationEditPage.js index 5281148b..cf1664f7 100644 --- a/web/src/ApplicationEditPage.js +++ b/web/src/ApplicationEditPage.js @@ -119,7 +119,7 @@ class ApplicationEditPage extends React.Component { getApplication() { ApplicationBackend.getApplication("admin", this.state.applicationName) .then((res) => { - if (res === null) { + if (res.data === null) { this.props.history.push("/404"); return; } @@ -138,7 +138,7 @@ class ApplicationEditPage extends React.Component { } this.setState({ - application: res, + application: res.data, }); this.getCerts(res.organization); @@ -184,9 +184,9 @@ class ApplicationEditPage extends React.Component { getSamlMetadata() { ApplicationBackend.getSamlMetadata("admin", this.state.applicationName) - .then((res) => { + .then((data) => { this.setState({ - samlMetadata: res, + samlMetadata: data, }); }); } diff --git a/web/src/CertEditPage.js b/web/src/CertEditPage.js index f81d87b1..08be9d95 100644 --- a/web/src/CertEditPage.js +++ b/web/src/CertEditPage.js @@ -45,7 +45,7 @@ class CertEditPage extends React.Component { getCert() { CertBackend.getCert(this.state.owner, this.state.certName) .then((res) => { - if (res === null) { + if (res.data === null) { this.props.history.push("/404"); return; } @@ -56,7 +56,7 @@ class CertEditPage extends React.Component { } this.setState({ - cert: res, + cert: res.data, }); }); } @@ -65,7 +65,7 @@ class CertEditPage extends React.Component { OrganizationBackend.getOrganizations("admin") .then((res) => { this.setState({ - organizations: (res.msg === undefined) ? res : [], + organizations: res.data || [], }); }); } diff --git a/web/src/ChatEditPage.js b/web/src/ChatEditPage.js index fc31c5a5..e3db4886 100644 --- a/web/src/ChatEditPage.js +++ b/web/src/ChatEditPage.js @@ -41,7 +41,7 @@ class ChatEditPage extends React.Component { getChat() { ChatBackend.getChat("admin", this.state.chatName) .then((res) => { - if (res === null) { + if (res.data === null) { this.props.history.push("/404"); return; } @@ -51,7 +51,7 @@ class ChatEditPage extends React.Component { return; } this.setState({ - chat: res, + chat: res.data, }); this.getUsers(res.organization); @@ -62,7 +62,7 @@ class ChatEditPage extends React.Component { OrganizationBackend.getOrganizations("admin") .then((res) => { this.setState({ - organizations: (res.msg === undefined) ? res : [], + organizations: res.data || [], }); }); } @@ -76,7 +76,7 @@ class ChatEditPage extends React.Component { } this.setState({ - users: res, + users: res.data, }); }); } diff --git a/web/src/ChatPage.js b/web/src/ChatPage.js index 3812f94f..3c709924 100644 --- a/web/src/ChatPage.js +++ b/web/src/ChatPage.js @@ -79,7 +79,8 @@ class ChatPage extends BaseListPage { getMessages(chatName) { MessageBackend.getChatMessages(chatName) - .then((messages) => { + .then((res) => { + const messages = res.data; this.setState({ messages: messages, }); @@ -229,7 +230,7 @@ class ChatPage extends BaseListPage { ) } - {this.sendMessage(text);}} account={this.props.account} /> + {this.sendMessage(text);}} account={this.props.account} /> ); diff --git a/web/src/EntryPage.js b/web/src/EntryPage.js index d8ef57fa..dc75880b 100644 --- a/web/src/EntryPage.js +++ b/web/src/EntryPage.js @@ -79,7 +79,9 @@ class EntryPage extends React.Component { Setting.showMessage("error", res.msg); return; } - const themeData = res !== null ? Setting.getThemeData(res.organizationObj, res) : Conf.ThemeDefault; + + const application = res.data; + const themeData = application !== null ? Setting.getThemeData(application.organizationObj, application) : Conf.ThemeDefault; this.props.updataThemeData(themeData); }); }; diff --git a/web/src/GroupEdit.js b/web/src/GroupEdit.js index 03b98728..da2e182e 100644 --- a/web/src/GroupEdit.js +++ b/web/src/GroupEdit.js @@ -67,7 +67,7 @@ class GroupEditPage extends React.Component { .then((res) => { if (res.status === "ok") { this.setState({ - organizations: res.data, + organizations: res.data || [], }); } }); diff --git a/web/src/LdapEditPage.js b/web/src/LdapEditPage.js index 26291163..23ed9494 100644 --- a/web/src/LdapEditPage.js +++ b/web/src/LdapEditPage.js @@ -55,7 +55,7 @@ class LdapEditPage extends React.Component { OrganizationBackend.getOrganizations("admin") .then((res) => { this.setState({ - organizations: (res.msg === undefined) ? res : [], + organizations: res.data || [], }); }); } diff --git a/web/src/MessageEditPage.js b/web/src/MessageEditPage.js index 6a92827d..73c5c6ee 100644 --- a/web/src/MessageEditPage.js +++ b/web/src/MessageEditPage.js @@ -46,7 +46,7 @@ class MessageEditPage extends React.Component { getMessage() { MessageBackend.getMessage("admin", this.state.messageName) .then((res) => { - if (res === null) { + if (res.data === null) { this.props.history.push("/404"); return; } @@ -54,10 +54,10 @@ class MessageEditPage extends React.Component { Setting.showMessage("error", res.msg); return; } - this.setState({ - message: res, - }); + this.setState({ + message: res.data, + }); this.getUsers(res.organization); }); } @@ -66,7 +66,7 @@ class MessageEditPage extends React.Component { OrganizationBackend.getOrganizations("admin") .then((res) => { this.setState({ - organizations: (res.msg === undefined) ? res : [], + organizations: res.data || [], }); }); } @@ -87,8 +87,9 @@ class MessageEditPage extends React.Component { Setting.showMessage("error", res.msg); return; } + this.setState({ - users: res, + users: res.data, }); }); } diff --git a/web/src/ModelEditPage.js b/web/src/ModelEditPage.js index 0548e6e8..f103c91c 100644 --- a/web/src/ModelEditPage.js +++ b/web/src/ModelEditPage.js @@ -48,7 +48,7 @@ class ModelEditPage extends React.Component { getModel() { ModelBackend.getModel(this.state.organizationName, this.state.modelName) .then((res) => { - if (res === null) { + if (res.data === null) { this.props.history.push("/404"); return; } @@ -59,7 +59,7 @@ class ModelEditPage extends React.Component { } this.setState({ - model: res, + model: res.data, }); }); } @@ -68,7 +68,7 @@ class ModelEditPage extends React.Component { OrganizationBackend.getOrganizations("admin") .then((res) => { this.setState({ - organizations: (res.msg === undefined) ? res : [], + organizations: res.data || [], }); }); } diff --git a/web/src/OrganizationEditPage.js b/web/src/OrganizationEditPage.js index 996ac312..116d43f1 100644 --- a/web/src/OrganizationEditPage.js +++ b/web/src/OrganizationEditPage.js @@ -75,7 +75,7 @@ class OrganizationEditPage extends React.Component { } this.setState({ - applications: res, + applications: res.data || [], }); }); } diff --git a/web/src/PaymentEditPage.js b/web/src/PaymentEditPage.js index 9161ea71..c75c3d7d 100644 --- a/web/src/PaymentEditPage.js +++ b/web/src/PaymentEditPage.js @@ -41,14 +41,14 @@ class PaymentEditPage extends React.Component { getPayment() { PaymentBackend.getPayment("admin", this.state.paymentName) - .then((payment) => { - if (payment === null) { + .then((res) => { + if (res.data === null) { this.props.history.push("/404"); return; } this.setState({ - payment: payment, + payment: res.data, }); Setting.scrollToDiv("invoice-area"); diff --git a/web/src/PermissionEditPage.js b/web/src/PermissionEditPage.js index 5f8e5b98..424ee3fb 100644 --- a/web/src/PermissionEditPage.js +++ b/web/src/PermissionEditPage.js @@ -50,7 +50,9 @@ class PermissionEditPage extends React.Component { getPermission() { PermissionBackend.getPermission(this.state.organizationName, this.state.permissionName) .then((res) => { - if (res === null) { + const permission = res.data; + + if (permission === null) { this.props.history.push("/404"); return; } @@ -61,14 +63,14 @@ class PermissionEditPage extends React.Component { } this.setState({ - permission: res, + permission: permission, }); - this.getUsers(res.owner); - this.getRoles(res.owner); - this.getModels(res.owner); - this.getResources(res.owner); - this.getModel(res.owner, res.model); + this.getUsers(permission.owner); + this.getRoles(permission.owner); + this.getModels(permission.owner); + this.getResources(permission.owner); + this.getModel(permission.owner, permission.model); }); } @@ -76,7 +78,7 @@ class PermissionEditPage extends React.Component { OrganizationBackend.getOrganizations("admin") .then((res) => { this.setState({ - organizations: (res.msg === undefined) ? res : [], + organizations: res.data || [], }); }); } @@ -88,8 +90,9 @@ class PermissionEditPage extends React.Component { Setting.showMessage("error", res.msg); return; } + this.setState({ - users: res, + users: res.data, }); }); } @@ -101,8 +104,9 @@ class PermissionEditPage extends React.Component { Setting.showMessage("error", res.msg); return; } + this.setState({ - roles: res, + roles: res.data, }); }); } @@ -114,21 +118,21 @@ class PermissionEditPage extends React.Component { Setting.showMessage("error", res.msg); return; } + this.setState({ - models: res, + models: res.data, }); }); } getModel(organizationName, modelName) { + if (modelName === "") { + return; + } ModelBackend.getModel(organizationName, modelName) .then((res) => { - if (res.status === "error") { - Setting.showMessage("error", res.msg); - return; - } this.setState({ - model: res, + model: res.data, }); }); } @@ -137,7 +141,7 @@ class PermissionEditPage extends React.Component { ApplicationBackend.getApplicationsByOrganization("admin", organizationName) .then((res) => { this.setState({ - resources: (res.msg === undefined) ? res : [], + resources: res.data || [], }); }); } diff --git a/web/src/PlanEditPage.js b/web/src/PlanEditPage.js index b12002f9..49bfafdc 100644 --- a/web/src/PlanEditPage.js +++ b/web/src/PlanEditPage.js @@ -68,8 +68,9 @@ class PlanEditPage extends React.Component { Setting.showMessage("error", res.msg); return; } + this.setState({ - roles: res, + roles: res.data, }); }); } @@ -81,8 +82,9 @@ class PlanEditPage extends React.Component { Setting.showMessage("error", res.msg); return; } + this.setState({ - users: res, + users: res.data, }); }); } @@ -91,7 +93,7 @@ class PlanEditPage extends React.Component { OrganizationBackend.getOrganizations("admin") .then((res) => { this.setState({ - organizations: (res.msg === undefined) ? res : [], + organizations: res.data || [], }); }); } diff --git a/web/src/PricingEditPage.js b/web/src/PricingEditPage.js index 6683ed30..ab70aace 100644 --- a/web/src/PricingEditPage.js +++ b/web/src/PricingEditPage.js @@ -44,13 +44,12 @@ class PricingEditPage extends React.Component { this.getPricing(); this.getOrganizations(); this.getApplicationsByOrganization(this.state.organizationName); - this.getUserApplication(); } getPricing() { PricingBackend.getPricing(this.state.organizationName, this.state.pricingName) .then((res) => { - if (res === null) { + if (res.data === null) { this.props.history.push("/404"); return; } @@ -61,7 +60,7 @@ class PricingEditPage extends React.Component { } this.setState({ - pricing: res, + pricing: res.data, }); this.getPlans(res.owner); }); @@ -74,8 +73,9 @@ class PricingEditPage extends React.Component { Setting.showMessage("error", res.msg); return; } + this.setState({ - plans: res, + plans: res.data, }); }); } @@ -84,7 +84,16 @@ class PricingEditPage extends React.Component { OrganizationBackend.getOrganizations("admin") .then((res) => { this.setState({ - organizations: (res.msg === undefined) ? res : [], + organizations: res.data || [], + }); + }); + } + + getApplicationsByOrganization(organizationName) { + ApplicationBackend.getApplicationsByOrganization("admin", organizationName) + .then((res) => { + this.setState({ + applications: res.data || [], }); }); } @@ -107,28 +116,6 @@ class PricingEditPage extends React.Component { }); } - getApplicationsByOrganization(organizationName) { - ApplicationBackend.getApplicationsByOrganization("admin", organizationName) - .then((res) => { - this.setState({ - applications: (res.msg === undefined) ? res : [], - }); - }); - } - - getUserApplication() { - ApplicationBackend.getUserApplication(this.state.organizationName, this.state.userName) - .then((res) => { - if (res.status === "error") { - Setting.showMessage("error", res.msg); - return; - } - this.setState({ - application: res, - }); - }); - } - renderPricing() { return ( { this.setState({ - organizations: (res.msg === undefined) ? res : [], + organizations: res.data || [], }); }); } diff --git a/web/src/ProviderEditPage.js b/web/src/ProviderEditPage.js index 04f370fb..335cfdf0 100644 --- a/web/src/ProviderEditPage.js +++ b/web/src/ProviderEditPage.js @@ -50,7 +50,7 @@ class ProviderEditPage extends React.Component { getProvider() { ProviderBackend.getProvider(this.state.owner, this.state.providerName) .then((res) => { - if (res === null) { + if (res.data === null) { this.props.history.push("/404"); return; } @@ -72,7 +72,7 @@ class ProviderEditPage extends React.Component { OrganizationBackend.getOrganizations("admin") .then((res) => { this.setState({ - organizations: res.msg === undefined ? res : [], + organizations: res.data || [], }); }); } diff --git a/web/src/RoleEditPage.js b/web/src/RoleEditPage.js index 03543577..1ff66789 100644 --- a/web/src/RoleEditPage.js +++ b/web/src/RoleEditPage.js @@ -43,7 +43,7 @@ class RoleEditPage extends React.Component { getRole() { RoleBackend.getRole(this.state.organizationName, this.state.roleName) .then((res) => { - if (res === null) { + if (res.data === null) { this.props.history.push("/404"); return; } @@ -53,7 +53,7 @@ class RoleEditPage extends React.Component { } this.setState({ - role: res, + role: res.data, }); this.getUsers(res.owner); @@ -65,7 +65,7 @@ class RoleEditPage extends React.Component { OrganizationBackend.getOrganizations("admin") .then((res) => { this.setState({ - organizations: (res.msg === undefined) ? res : [], + organizations: res.data || [], }); }); } @@ -77,8 +77,9 @@ class RoleEditPage extends React.Component { Setting.showMessage("error", res.msg); return; } + this.setState({ - users: res, + users: res.data, }); }); } @@ -90,8 +91,9 @@ class RoleEditPage extends React.Component { Setting.showMessage("error", res.msg); return; } + this.setState({ - roles: res, + roles: res.data, }); }); } diff --git a/web/src/SubscriptionEditPage.js b/web/src/SubscriptionEditPage.js index 6d0bbf4d..0eb0f129 100644 --- a/web/src/SubscriptionEditPage.js +++ b/web/src/SubscriptionEditPage.js @@ -47,7 +47,7 @@ class SubscriptionEditPage extends React.Component { getSubscription() { SubscriptionBackend.getSubscription(this.state.organizationName, this.state.subscriptionName) .then((res) => { - if (res === null) { + if (res.data === null) { this.props.history.push("/404"); return; } @@ -58,7 +58,7 @@ class SubscriptionEditPage extends React.Component { } this.setState({ - subscription: res, + subscription: res.data, }); this.getUsers(res.owner); @@ -70,7 +70,7 @@ class SubscriptionEditPage extends React.Component { PlanBackend.getPlans(organizationName) .then((res) => { this.setState({ - planes: res, + planes: res.data, }); }); } @@ -82,8 +82,9 @@ class SubscriptionEditPage extends React.Component { Setting.showMessage("error", res.msg); return; } + this.setState({ - users: res, + users: res.data, }); }); } @@ -92,7 +93,7 @@ class SubscriptionEditPage extends React.Component { OrganizationBackend.getOrganizations("admin") .then((res) => { this.setState({ - organizations: (res.msg === undefined) ? res : [], + organizations: res.data || [], }); }); } diff --git a/web/src/SyncerEditPage.js b/web/src/SyncerEditPage.js index 4df4b102..8ca8e689 100644 --- a/web/src/SyncerEditPage.js +++ b/web/src/SyncerEditPage.js @@ -48,7 +48,7 @@ class SyncerEditPage extends React.Component { getSyncer() { SyncerBackend.getSyncer("admin", this.state.syncerName) .then((res) => { - if (res === null) { + if (res.data === null) { this.props.history.push("/404"); return; } @@ -59,7 +59,7 @@ class SyncerEditPage extends React.Component { } this.setState({ - syncer: res, + syncer: res.data, }); }); } @@ -68,7 +68,7 @@ class SyncerEditPage extends React.Component { OrganizationBackend.getOrganizations("admin") .then((res) => { this.setState({ - organizations: (res.msg === undefined) ? res : [], + organizations: res.data || [], }); }); } diff --git a/web/src/TokenEditPage.js b/web/src/TokenEditPage.js index 77a876d0..712ba22d 100644 --- a/web/src/TokenEditPage.js +++ b/web/src/TokenEditPage.js @@ -36,7 +36,7 @@ class TokenEditPage extends React.Component { getToken() { TokenBackend.getToken("admin", this.state.tokenName) .then((res) => { - if (res === null) { + if (res.data === null) { this.props.history.push("/404"); return; } @@ -47,7 +47,7 @@ class TokenEditPage extends React.Component { } this.setState({ - token: res, + token: res.data, }); }); } diff --git a/web/src/UserEditPage.js b/web/src/UserEditPage.js index bec01e0c..b3b12e69 100644 --- a/web/src/UserEditPage.js +++ b/web/src/UserEditPage.js @@ -75,19 +75,20 @@ class UserEditPage extends React.Component { getUser() { UserBackend.getUser(this.state.organizationName, this.state.userName) - .then((data) => { - if (data === null) { + .then((res) => { + if (res.data === null) { this.props.history.push("/404"); return; } - if (data.status === null || data.status !== "error") { - this.setState({ - user: data, - multiFactorAuths: data?.multiFactorAuths ?? [], - }); + if (res.status === "error") { + Setting.showMessage("error", res.msg); + return; } + this.setState({ + user: res.data, + multiFactorAuths: res.data?.multiFactorAuths ?? [], loading: false, }); }); @@ -108,7 +109,7 @@ class UserEditPage extends React.Component { OrganizationBackend.getOrganizations("admin") .then((res) => { this.setState({ - organizations: (res.msg === undefined) ? res : [], + organizations: res.data || [], }); }); } @@ -117,7 +118,7 @@ class UserEditPage extends React.Component { ApplicationBackend.getApplicationsByOrganization("admin", organizationName) .then((res) => { this.setState({ - applications: (res.msg === undefined) ? res : [], + applications: res.data || [], }); }); } @@ -129,12 +130,10 @@ class UserEditPage extends React.Component { Setting.showMessage("error", res.msg); return; } - this.setState({ - application: res, - }); this.setState({ - isGroupsVisible: res.organizationObj.accountItems?.some((item) => item.name === "Groups" && item.visible), + application: res.data, + isGroupsVisible: res.data?.organizationObj.accountItems?.some((item) => item.name === "Groups" && item.visible), }); }); } diff --git a/web/src/WebhookEditPage.js b/web/src/WebhookEditPage.js index 4fb5514b..9f5d6990 100644 --- a/web/src/WebhookEditPage.js +++ b/web/src/WebhookEditPage.js @@ -122,14 +122,14 @@ class WebhookEditPage extends React.Component { getWebhook() { WebhookBackend.getWebhook("admin", this.state.webhookName) - .then((webhook) => { - if (webhook === null) { + .then((res) => { + if (res.data === null) { this.props.history.push("/404"); return; } this.setState({ - webhook: webhook, + webhook: res.data, }); }); } @@ -138,7 +138,7 @@ class WebhookEditPage extends React.Component { OrganizationBackend.getOrganizations("admin") .then((res) => { this.setState({ - organizations: (res.msg === undefined) ? res : [], + organizations: res.data || [], }); }); } diff --git a/web/src/auth/ForgetPage.js b/web/src/auth/ForgetPage.js index 9d903565..2ec2344d 100644 --- a/web/src/auth/ForgetPage.js +++ b/web/src/auth/ForgetPage.js @@ -68,7 +68,7 @@ class ForgetPage extends React.Component { Setting.showMessage("error", res.msg); return; } - this.onUpdateApplication(res); + this.onUpdateApplication(res.data); }); } getApplicationObj() { diff --git a/web/src/auth/LoginPage.js b/web/src/auth/LoginPage.js index 92a06d4a..2cd3a6b6 100644 --- a/web/src/auth/LoginPage.js +++ b/web/src/auth/LoginPage.js @@ -170,7 +170,7 @@ class LoginPage extends React.Component { Setting.showMessage("error", res.msg); return; } - this.onUpdateApplication(res); + this.onUpdateApplication(res.data); }); } else { OrganizationBackend.getDefaultApplication("admin", this.state.owner) diff --git a/web/src/auth/MfaSetupPage.js b/web/src/auth/MfaSetupPage.js index 89b2d02a..a8c3e0f8 100644 --- a/web/src/auth/MfaSetupPage.js +++ b/web/src/auth/MfaSetupPage.js @@ -69,7 +69,7 @@ class MfaSetupPage extends React.Component { return; } this.setState({ - application: res, + application: res.data, }); } else { Setting.showMessage("error", i18next.t("mfa:Failed to get application")); diff --git a/web/src/auth/PromptPage.js b/web/src/auth/PromptPage.js index ff9e6800..ca6a084c 100644 --- a/web/src/auth/PromptPage.js +++ b/web/src/auth/PromptPage.js @@ -63,7 +63,7 @@ class PromptPage extends React.Component { } this.setState({ - user: res, + user: res.data, }); }); } @@ -80,9 +80,9 @@ class PromptPage extends React.Component { return; } - this.onUpdateApplication(res); + this.onUpdateApplication(res.data); this.setState({ - application: res, + application: res.data, }); }); } diff --git a/web/src/auth/ResultPage.js b/web/src/auth/ResultPage.js index 58715f57..1f58ee66 100644 --- a/web/src/auth/ResultPage.js +++ b/web/src/auth/ResultPage.js @@ -48,9 +48,10 @@ class ResultPage extends React.Component { Setting.showMessage("error", res.msg); return; } - this.onUpdateApplication(res); + + this.onUpdateApplication(res.data); this.setState({ - application: res, + application: res.data, }); }); } diff --git a/web/src/auth/SignupPage.js b/web/src/auth/SignupPage.js index 91682df4..6815c760 100644 --- a/web/src/auth/SignupPage.js +++ b/web/src/auth/SignupPage.js @@ -114,7 +114,7 @@ class SignupPage extends React.Component { return; } - this.onUpdateApplication(res); + this.onUpdateApplication(res.data); }); } diff --git a/web/src/basic/HomePage.js b/web/src/basic/HomePage.js index a0e41d96..8cb1d8e9 100644 --- a/web/src/basic/HomePage.js +++ b/web/src/basic/HomePage.js @@ -36,7 +36,7 @@ class HomePage extends React.Component { ApplicationBackend.getApplicationsByOrganization("admin", organizationName) .then((res) => { this.setState({ - applications: (res.msg === undefined) ? res : [], + applications: res.data || [], }); }); }