mirror of
https://github.com/casdoor/casdoor.git
synced 2025-05-23 18:54:03 +08:00
feat: replace panic with details json error payload. (#1039)
Signed-off-by: 疯魔慕薇 <kfanjian@gmail.com> Signed-off-by: 疯魔慕薇 <kfanjian@gmail.com>
This commit is contained in:
parent
08a1e7ae32
commit
67a5adf585
@ -105,7 +105,8 @@ func (c *ApiController) Signup() {
|
|||||||
var form RequestForm
|
var form RequestForm
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &form)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &form)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
application := object.GetApplication(fmt.Sprintf("admin/%s", form.Application))
|
application := object.GetApplication(fmt.Sprintf("admin/%s", form.Application))
|
||||||
@ -156,6 +157,12 @@ func (c *ApiController) Signup() {
|
|||||||
username = id
|
username = id
|
||||||
}
|
}
|
||||||
|
|
||||||
|
initScore, err := getInitScore()
|
||||||
|
if err != nil {
|
||||||
|
c.ResponseError(fmt.Errorf("get init score failed, error: %w", err).Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
user := &object.User{
|
user := &object.User{
|
||||||
Owner: form.Organization,
|
Owner: form.Organization,
|
||||||
Name: username,
|
Name: username,
|
||||||
@ -171,7 +178,7 @@ func (c *ApiController) Signup() {
|
|||||||
Affiliation: form.Affiliation,
|
Affiliation: form.Affiliation,
|
||||||
IdCard: form.IdCard,
|
IdCard: form.IdCard,
|
||||||
Region: form.Region,
|
Region: form.Region,
|
||||||
Score: getInitScore(),
|
Score: initScore,
|
||||||
IsAdmin: false,
|
IsAdmin: false,
|
||||||
IsGlobalAdmin: false,
|
IsGlobalAdmin: false,
|
||||||
IsForbidden: false,
|
IsForbidden: false,
|
||||||
|
@ -111,8 +111,7 @@ func (c *ApiController) GetOrganizationApplications() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
var applications []*object.Application
|
applications := object.GetApplicationsByOrganizationName(owner, organization)
|
||||||
applications = object.GetApplicationsByOrganizationName(owner, organization)
|
|
||||||
c.Data["json"] = object.GetMaskedApplications(applications, userId)
|
c.Data["json"] = object.GetMaskedApplications(applications, userId)
|
||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
}
|
}
|
||||||
@ -131,7 +130,8 @@ func (c *ApiController) UpdateApplication() {
|
|||||||
var application object.Application
|
var application object.Application
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &application)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &application)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.UpdateApplication(id, &application))
|
c.Data["json"] = wrapActionResponse(object.UpdateApplication(id, &application))
|
||||||
@ -149,7 +149,8 @@ func (c *ApiController) AddApplication() {
|
|||||||
var application object.Application
|
var application object.Application
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &application)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &application)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.AddApplication(&application))
|
c.Data["json"] = wrapActionResponse(object.AddApplication(&application))
|
||||||
@ -167,7 +168,8 @@ func (c *ApiController) DeleteApplication() {
|
|||||||
var application object.Application
|
var application object.Application
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &application)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &application)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.DeleteApplication(&application))
|
c.Data["json"] = wrapActionResponse(object.DeleteApplication(&application))
|
||||||
|
@ -344,7 +344,7 @@ func (c *ApiController) Login() {
|
|||||||
user = object.GetUserByField(application.Organization, provider.Type, userInfo.Id)
|
user = object.GetUserByField(application.Organization, provider.Type, userInfo.Id)
|
||||||
}
|
}
|
||||||
|
|
||||||
if user != nil && user.IsDeleted == false {
|
if user != nil && !user.IsDeleted {
|
||||||
// Sign in via OAuth (want to sign up but already have account)
|
// Sign in via OAuth (want to sign up but already have account)
|
||||||
|
|
||||||
if user.IsForbidden {
|
if user.IsForbidden {
|
||||||
@ -384,6 +384,12 @@ func (c *ApiController) Login() {
|
|||||||
|
|
||||||
properties := map[string]string{}
|
properties := map[string]string{}
|
||||||
properties["no"] = strconv.Itoa(len(object.GetUsers(application.Organization)) + 2)
|
properties["no"] = strconv.Itoa(len(object.GetUsers(application.Organization)) + 2)
|
||||||
|
initScore, err := getInitScore()
|
||||||
|
if err != nil {
|
||||||
|
c.ResponseError(fmt.Errorf("get init score failed, error: %w", err).Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
user = &object.User{
|
user = &object.User{
|
||||||
Owner: application.Organization,
|
Owner: application.Organization,
|
||||||
Name: userInfo.Username,
|
Name: userInfo.Username,
|
||||||
@ -394,7 +400,7 @@ func (c *ApiController) Login() {
|
|||||||
Avatar: userInfo.AvatarUrl,
|
Avatar: userInfo.AvatarUrl,
|
||||||
Address: []string{},
|
Address: []string{},
|
||||||
Email: userInfo.Email,
|
Email: userInfo.Email,
|
||||||
Score: getInitScore(),
|
Score: initScore,
|
||||||
IsAdmin: false,
|
IsAdmin: false,
|
||||||
IsGlobalAdmin: false,
|
IsGlobalAdmin: false,
|
||||||
IsForbidden: false,
|
IsForbidden: false,
|
||||||
|
@ -19,6 +19,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/astaxie/beego"
|
"github.com/astaxie/beego"
|
||||||
|
"github.com/astaxie/beego/logs"
|
||||||
"github.com/casdoor/casdoor/object"
|
"github.com/casdoor/casdoor/object"
|
||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
@ -58,6 +59,7 @@ func (c *ApiController) IsGlobalAdmin() bool {
|
|||||||
func (c *ApiController) GetSessionUsername() string {
|
func (c *ApiController) GetSessionUsername() string {
|
||||||
// check if user session expired
|
// check if user session expired
|
||||||
sessionData := c.GetSessionData()
|
sessionData := c.GetSessionData()
|
||||||
|
|
||||||
if sessionData != nil &&
|
if sessionData != nil &&
|
||||||
sessionData.ExpireTime != 0 &&
|
sessionData.ExpireTime != 0 &&
|
||||||
sessionData.ExpireTime < time.Now().Unix() {
|
sessionData.ExpireTime < time.Now().Unix() {
|
||||||
@ -120,7 +122,8 @@ func (c *ApiController) GetSessionData() *SessionData {
|
|||||||
sessionData := &SessionData{}
|
sessionData := &SessionData{}
|
||||||
err := util.JsonToStruct(session.(string), sessionData)
|
err := util.JsonToStruct(session.(string), sessionData)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
logs.Error("GetSessionData failed, error: %s", err)
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
return sessionData
|
return sessionData
|
||||||
|
@ -76,7 +76,8 @@ func (c *ApiController) UpdateCert() {
|
|||||||
var cert object.Cert
|
var cert object.Cert
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &cert)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &cert)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.UpdateCert(id, &cert))
|
c.Data["json"] = wrapActionResponse(object.UpdateCert(id, &cert))
|
||||||
@ -94,7 +95,8 @@ func (c *ApiController) AddCert() {
|
|||||||
var cert object.Cert
|
var cert object.Cert
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &cert)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &cert)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.AddCert(&cert))
|
c.Data["json"] = wrapActionResponse(object.AddCert(&cert))
|
||||||
@ -112,7 +114,8 @@ func (c *ApiController) DeleteCert() {
|
|||||||
var cert object.Cert
|
var cert object.Cert
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &cert)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &cert)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.DeleteCert(&cert))
|
c.Data["json"] = wrapActionResponse(object.DeleteCert(&cert))
|
||||||
|
@ -30,7 +30,8 @@ func (c *ApiController) Enforce() {
|
|||||||
var permissionRule object.PermissionRule
|
var permissionRule object.PermissionRule
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &permissionRule)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &permissionRule)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = object.Enforce(userId, &permissionRule)
|
c.Data["json"] = object.Enforce(userId, &permissionRule)
|
||||||
@ -47,7 +48,8 @@ func (c *ApiController) BatchEnforce() {
|
|||||||
var permissionRules []object.PermissionRule
|
var permissionRules []object.PermissionRule
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &permissionRules)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &permissionRules)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = object.BatchEnforce(userId, permissionRules)
|
c.Data["json"] = object.BatchEnforce(userId, permissionRules)
|
||||||
|
@ -199,7 +199,8 @@ func (c *ApiController) DeleteLdap() {
|
|||||||
var ldap object.Ldap
|
var ldap object.Ldap
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &ldap)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &ldap)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
object.GetLdapAutoSynchronizer().StopAutoSync(ldap.Id)
|
object.GetLdapAutoSynchronizer().StopAutoSync(ldap.Id)
|
||||||
@ -217,7 +218,8 @@ func (c *ApiController) SyncLdapUsers() {
|
|||||||
var users []object.LdapRespUser
|
var users []object.LdapRespUser
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &users)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &users)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
object.UpdateLdapSyncTime(ldapId)
|
object.UpdateLdapSyncTime(ldapId)
|
||||||
@ -239,7 +241,8 @@ func (c *ApiController) CheckLdapUsersExist() {
|
|||||||
var uuids []string
|
var uuids []string
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &uuids)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &uuids)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
exist := object.CheckLdapUuidExist(owner, uuids)
|
exist := object.CheckLdapUuidExist(owner, uuids)
|
||||||
|
@ -37,7 +37,8 @@ func (c *ApiController) Unlink() {
|
|||||||
var form LinkForm
|
var form LinkForm
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &form)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &form)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
providerType := form.ProviderType
|
providerType := form.ProviderType
|
||||||
|
|
||||||
|
@ -76,7 +76,8 @@ func (c *ApiController) UpdateModel() {
|
|||||||
var model object.Model
|
var model object.Model
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &model)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &model)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.UpdateModel(id, &model))
|
c.Data["json"] = wrapActionResponse(object.UpdateModel(id, &model))
|
||||||
@ -94,7 +95,8 @@ func (c *ApiController) AddModel() {
|
|||||||
var model object.Model
|
var model object.Model
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &model)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &model)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.AddModel(&model))
|
c.Data["json"] = wrapActionResponse(object.AddModel(&model))
|
||||||
@ -112,7 +114,8 @@ func (c *ApiController) DeleteModel() {
|
|||||||
var model object.Model
|
var model object.Model
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &model)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &model)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.DeleteModel(&model))
|
c.Data["json"] = wrapActionResponse(object.DeleteModel(&model))
|
||||||
|
@ -76,7 +76,8 @@ func (c *ApiController) UpdateOrganization() {
|
|||||||
var organization object.Organization
|
var organization object.Organization
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &organization)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &organization)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.UpdateOrganization(id, &organization))
|
c.Data["json"] = wrapActionResponse(object.UpdateOrganization(id, &organization))
|
||||||
@ -94,7 +95,8 @@ func (c *ApiController) AddOrganization() {
|
|||||||
var organization object.Organization
|
var organization object.Organization
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &organization)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &organization)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.AddOrganization(&organization))
|
c.Data["json"] = wrapActionResponse(object.AddOrganization(&organization))
|
||||||
@ -112,7 +114,8 @@ func (c *ApiController) DeleteOrganization() {
|
|||||||
var organization object.Organization
|
var organization object.Organization
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &organization)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &organization)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.DeleteOrganization(&organization))
|
c.Data["json"] = wrapActionResponse(object.DeleteOrganization(&organization))
|
||||||
|
@ -95,7 +95,8 @@ func (c *ApiController) UpdatePayment() {
|
|||||||
var payment object.Payment
|
var payment object.Payment
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &payment)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &payment)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.UpdatePayment(id, &payment))
|
c.Data["json"] = wrapActionResponse(object.UpdatePayment(id, &payment))
|
||||||
@ -113,7 +114,8 @@ func (c *ApiController) AddPayment() {
|
|||||||
var payment object.Payment
|
var payment object.Payment
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &payment)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &payment)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.AddPayment(&payment))
|
c.Data["json"] = wrapActionResponse(object.AddPayment(&payment))
|
||||||
@ -131,7 +133,8 @@ func (c *ApiController) DeletePayment() {
|
|||||||
var payment object.Payment
|
var payment object.Payment
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &payment)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &payment)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.DeletePayment(&payment))
|
c.Data["json"] = wrapActionResponse(object.DeletePayment(&payment))
|
||||||
@ -157,7 +160,8 @@ func (c *ApiController) NotifyPayment() {
|
|||||||
if ok {
|
if ok {
|
||||||
_, err := c.Ctx.ResponseWriter.Write([]byte("success"))
|
_, err := c.Ctx.ResponseWriter.Write([]byte("success"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
panic(fmt.Errorf("NotifyPayment() failed: %v", ok))
|
panic(fmt.Errorf("NotifyPayment() failed: %v", ok))
|
||||||
|
@ -94,7 +94,8 @@ func (c *ApiController) UpdatePermission() {
|
|||||||
var permission object.Permission
|
var permission object.Permission
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &permission)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &permission)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.UpdatePermission(id, &permission))
|
c.Data["json"] = wrapActionResponse(object.UpdatePermission(id, &permission))
|
||||||
@ -112,7 +113,8 @@ func (c *ApiController) AddPermission() {
|
|||||||
var permission object.Permission
|
var permission object.Permission
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &permission)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &permission)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.AddPermission(&permission))
|
c.Data["json"] = wrapActionResponse(object.AddPermission(&permission))
|
||||||
@ -130,7 +132,8 @@ func (c *ApiController) DeletePermission() {
|
|||||||
var permission object.Permission
|
var permission object.Permission
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &permission)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &permission)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.DeletePermission(&permission))
|
c.Data["json"] = wrapActionResponse(object.DeletePermission(&permission))
|
||||||
|
@ -80,7 +80,8 @@ func (c *ApiController) UpdateProduct() {
|
|||||||
var product object.Product
|
var product object.Product
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &product)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &product)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.UpdateProduct(id, &product))
|
c.Data["json"] = wrapActionResponse(object.UpdateProduct(id, &product))
|
||||||
@ -98,7 +99,8 @@ func (c *ApiController) AddProduct() {
|
|||||||
var product object.Product
|
var product object.Product
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &product)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &product)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.AddProduct(&product))
|
c.Data["json"] = wrapActionResponse(object.AddProduct(&product))
|
||||||
@ -116,7 +118,8 @@ func (c *ApiController) DeleteProduct() {
|
|||||||
var product object.Product
|
var product object.Product
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &product)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &product)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.DeleteProduct(&product))
|
c.Data["json"] = wrapActionResponse(object.DeleteProduct(&product))
|
||||||
|
@ -76,7 +76,8 @@ func (c *ApiController) UpdateProvider() {
|
|||||||
var provider object.Provider
|
var provider object.Provider
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &provider)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &provider)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.UpdateProvider(id, &provider))
|
c.Data["json"] = wrapActionResponse(object.UpdateProvider(id, &provider))
|
||||||
@ -94,7 +95,8 @@ func (c *ApiController) AddProvider() {
|
|||||||
var provider object.Provider
|
var provider object.Provider
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &provider)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &provider)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.AddProvider(&provider))
|
c.Data["json"] = wrapActionResponse(object.AddProvider(&provider))
|
||||||
@ -112,7 +114,8 @@ func (c *ApiController) DeleteProvider() {
|
|||||||
var provider object.Provider
|
var provider object.Provider
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &provider)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &provider)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.DeleteProvider(&provider))
|
c.Data["json"] = wrapActionResponse(object.DeleteProvider(&provider))
|
||||||
|
@ -59,7 +59,8 @@ func (c *ApiController) GetRecordsByFilter() {
|
|||||||
record := &object.Record{}
|
record := &object.Record{}
|
||||||
err := util.JsonToStruct(body, record)
|
err := util.JsonToStruct(body, record)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = object.GetRecordsByField(record)
|
c.Data["json"] = object.GetRecordsByField(record)
|
||||||
|
@ -72,7 +72,8 @@ func (c *ApiController) UpdateResource() {
|
|||||||
var resource object.Resource
|
var resource object.Resource
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &resource)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &resource)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.UpdateResource(id, &resource))
|
c.Data["json"] = wrapActionResponse(object.UpdateResource(id, &resource))
|
||||||
@ -87,7 +88,8 @@ func (c *ApiController) AddResource() {
|
|||||||
var resource object.Resource
|
var resource object.Resource
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &resource)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &resource)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.AddResource(&resource))
|
c.Data["json"] = wrapActionResponse(object.AddResource(&resource))
|
||||||
@ -102,7 +104,8 @@ func (c *ApiController) DeleteResource() {
|
|||||||
var resource object.Resource
|
var resource object.Resource
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &resource)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &resource)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
provider, _, ok := c.GetProviderFromContext("Storage")
|
provider, _, ok := c.GetProviderFromContext("Storage")
|
||||||
|
@ -76,7 +76,8 @@ func (c *ApiController) UpdateRole() {
|
|||||||
var role object.Role
|
var role object.Role
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &role)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &role)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.UpdateRole(id, &role))
|
c.Data["json"] = wrapActionResponse(object.UpdateRole(id, &role))
|
||||||
@ -94,7 +95,8 @@ func (c *ApiController) AddRole() {
|
|||||||
var role object.Role
|
var role object.Role
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &role)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &role)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.AddRole(&role))
|
c.Data["json"] = wrapActionResponse(object.AddRole(&role))
|
||||||
@ -112,7 +114,8 @@ func (c *ApiController) DeleteRole() {
|
|||||||
var role object.Role
|
var role object.Role
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &role)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &role)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.DeleteRole(&role))
|
c.Data["json"] = wrapActionResponse(object.DeleteRole(&role))
|
||||||
|
@ -76,7 +76,8 @@ func (c *ApiController) UpdateSyncer() {
|
|||||||
var syncer object.Syncer
|
var syncer object.Syncer
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &syncer)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &syncer)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.UpdateSyncer(id, &syncer))
|
c.Data["json"] = wrapActionResponse(object.UpdateSyncer(id, &syncer))
|
||||||
@ -94,7 +95,8 @@ func (c *ApiController) AddSyncer() {
|
|||||||
var syncer object.Syncer
|
var syncer object.Syncer
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &syncer)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &syncer)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.AddSyncer(&syncer))
|
c.Data["json"] = wrapActionResponse(object.AddSyncer(&syncer))
|
||||||
@ -112,7 +114,8 @@ func (c *ApiController) DeleteSyncer() {
|
|||||||
var syncer object.Syncer
|
var syncer object.Syncer
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &syncer)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &syncer)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.DeleteSyncer(&syncer))
|
c.Data["json"] = wrapActionResponse(object.DeleteSyncer(&syncer))
|
||||||
|
@ -79,7 +79,8 @@ func (c *ApiController) UpdateToken() {
|
|||||||
var token object.Token
|
var token object.Token
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &token)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &token)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.UpdateToken(id, &token))
|
c.Data["json"] = wrapActionResponse(object.UpdateToken(id, &token))
|
||||||
@ -97,7 +98,8 @@ func (c *ApiController) AddToken() {
|
|||||||
var token object.Token
|
var token object.Token
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &token)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &token)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.AddToken(&token))
|
c.Data["json"] = wrapActionResponse(object.AddToken(&token))
|
||||||
@ -115,7 +117,8 @@ func (c *ApiController) DeleteToken() {
|
|||||||
var token object.Token
|
var token object.Token
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &token)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &token)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.DeleteToken(&token))
|
c.Data["json"] = wrapActionResponse(object.DeleteToken(&token))
|
||||||
|
@ -149,7 +149,8 @@ func (c *ApiController) UpdateUser() {
|
|||||||
var user object.User
|
var user object.User
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &user)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &user)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if user.DisplayName == "" {
|
if user.DisplayName == "" {
|
||||||
@ -183,7 +184,8 @@ func (c *ApiController) AddUser() {
|
|||||||
var user object.User
|
var user object.User
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &user)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &user)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.AddUser(&user))
|
c.Data["json"] = wrapActionResponse(object.AddUser(&user))
|
||||||
@ -201,7 +203,8 @@ func (c *ApiController) DeleteUser() {
|
|||||||
var user object.User
|
var user object.User
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &user)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &user)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.DeleteUser(&user))
|
c.Data["json"] = wrapActionResponse(object.DeleteUser(&user))
|
||||||
@ -220,7 +223,8 @@ func (c *ApiController) GetEmailAndPhone() {
|
|||||||
var form RequestForm
|
var form RequestForm
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &form)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &form)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
user := object.GetUserByFields(form.Organization, form.Username)
|
user := object.GetUserByFields(form.Organization, form.Username)
|
||||||
@ -306,7 +310,8 @@ func (c *ApiController) CheckUserPassword() {
|
|||||||
var user object.User
|
var user object.User
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &user)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &user)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
_, msg := object.CheckUserPassword(user.Owner, user.Name, user.Password)
|
_, msg := object.CheckUserPassword(user.Owner, user.Name, user.Password)
|
||||||
|
@ -24,17 +24,18 @@ import (
|
|||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
|
|
||||||
func saveFile(path string, file *multipart.File) {
|
func saveFile(path string, file *multipart.File) (err error) {
|
||||||
f, err := os.Create(path)
|
f, err := os.Create(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
return err
|
||||||
}
|
}
|
||||||
defer f.Close()
|
defer f.Close()
|
||||||
|
|
||||||
_, err = io.Copy(f, *file)
|
_, err = io.Copy(f, *file)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
return err
|
||||||
}
|
}
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *ApiController) UploadUsers() {
|
func (c *ApiController) UploadUsers() {
|
||||||
@ -43,13 +44,18 @@ func (c *ApiController) UploadUsers() {
|
|||||||
|
|
||||||
file, header, err := c.Ctx.Request.FormFile("file")
|
file, header, err := c.Ctx.Request.FormFile("file")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
fileId := fmt.Sprintf("%s_%s_%s", owner, user, util.RemoveExt(header.Filename))
|
fileId := fmt.Sprintf("%s_%s_%s", owner, user, util.RemoveExt(header.Filename))
|
||||||
|
|
||||||
path := util.GetUploadXlsxPath(fileId)
|
path := util.GetUploadXlsxPath(fileId)
|
||||||
util.EnsureFileFolderExists(path)
|
util.EnsureFileFolderExists(path)
|
||||||
saveFile(path, &file)
|
err = saveFile(path, &file)
|
||||||
|
if err != nil {
|
||||||
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
affected := object.UploadUsers(owner, fileId)
|
affected := object.UploadUsers(owner, fileId)
|
||||||
if affected {
|
if affected {
|
||||||
|
@ -23,9 +23,8 @@ import (
|
|||||||
"github.com/casdoor/casdoor/util"
|
"github.com/casdoor/casdoor/util"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ResponseOk ...
|
// ResponseJsonData ...
|
||||||
func (c *ApiController) ResponseOk(data ...interface{}) {
|
func (c *ApiController) ResponseJsonData(resp *Response, data ...interface{}) {
|
||||||
resp := Response{Status: "ok"}
|
|
||||||
switch len(data) {
|
switch len(data) {
|
||||||
case 2:
|
case 2:
|
||||||
resp.Data2 = data[1]
|
resp.Data2 = data[1]
|
||||||
@ -37,18 +36,16 @@ func (c *ApiController) ResponseOk(data ...interface{}) {
|
|||||||
c.ServeJSON()
|
c.ServeJSON()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ResponseOk ...
|
||||||
|
func (c *ApiController) ResponseOk(data ...interface{}) {
|
||||||
|
resp := &Response{Status: "ok"}
|
||||||
|
c.ResponseJsonData(resp, data...)
|
||||||
|
}
|
||||||
|
|
||||||
// ResponseError ...
|
// ResponseError ...
|
||||||
func (c *ApiController) ResponseError(error string, data ...interface{}) {
|
func (c *ApiController) ResponseError(error string, data ...interface{}) {
|
||||||
resp := Response{Status: "error", Msg: error}
|
resp := &Response{Status: "error", Msg: error}
|
||||||
switch len(data) {
|
c.ResponseJsonData(resp, data...)
|
||||||
case 2:
|
|
||||||
resp.Data2 = data[1]
|
|
||||||
fallthrough
|
|
||||||
case 1:
|
|
||||||
resp.Data = data[0]
|
|
||||||
}
|
|
||||||
c.Data["json"] = resp
|
|
||||||
c.ServeJSON()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetTokenErrorHttpStatus ...
|
// SetTokenErrorHttpStatus ...
|
||||||
@ -78,13 +75,8 @@ func (c *ApiController) RequireSignedIn() (string, bool) {
|
|||||||
return userId, true
|
return userId, true
|
||||||
}
|
}
|
||||||
|
|
||||||
func getInitScore() int {
|
func getInitScore() (int, error) {
|
||||||
score, err := strconv.Atoi(conf.GetConfigString("initScore"))
|
return strconv.Atoi(conf.GetConfigString("initScore"))
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return score
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *ApiController) GetProviderFromContext(category string) (*object.Provider, *object.User, bool) {
|
func (c *ApiController) GetProviderFromContext(category string) (*object.Provider, *object.User, bool) {
|
||||||
|
@ -76,7 +76,8 @@ func (c *ApiController) UpdateWebhook() {
|
|||||||
var webhook object.Webhook
|
var webhook object.Webhook
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &webhook)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &webhook)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.UpdateWebhook(id, &webhook))
|
c.Data["json"] = wrapActionResponse(object.UpdateWebhook(id, &webhook))
|
||||||
@ -94,7 +95,8 @@ func (c *ApiController) AddWebhook() {
|
|||||||
var webhook object.Webhook
|
var webhook object.Webhook
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &webhook)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &webhook)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.AddWebhook(&webhook))
|
c.Data["json"] = wrapActionResponse(object.AddWebhook(&webhook))
|
||||||
@ -112,7 +114,8 @@ func (c *ApiController) DeleteWebhook() {
|
|||||||
var webhook object.Webhook
|
var webhook object.Webhook
|
||||||
err := json.Unmarshal(c.Ctx.Input.RequestBody, &webhook)
|
err := json.Unmarshal(c.Ctx.Input.RequestBody, &webhook)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
c.ResponseError(err.Error())
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
c.Data["json"] = wrapActionResponse(object.DeleteWebhook(&webhook))
|
c.Data["json"] = wrapActionResponse(object.DeleteWebhook(&webhook))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user