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

fix: fix bug in "new-user" record

Browse Source
This commit is contained in:
Yang Luo 2024-03-27 15:15:40 +08:00
parent d0cce1bf7a
commit b16f1807b3
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
object/record.go
View File

@ -165,6 +165,25 @@ func GetRecordsByField(record *casvisorsdk.Record) ([]*casvisorsdk.Record, error
return records, nil return records, nil
} }
func CopyRecord(record *casvisorsdk.Record) *casvisorsdk.Record {
res := &casvisorsdk.Record{
Owner: record.Owner,
Name: record.Name,
CreatedTime: record.CreatedTime,
Organization: record.Organization,
ClientIp: record.ClientIp,
User: record.User,
Method: record.Method,
RequestUri: record.RequestUri,
Action: record.Action,
Language: record.Language,
Object: record.Object,
Response: record.Response,
IsTriggered: record.IsTriggered,
}
return res
}
func getFilteredWebhooks(webhooks []*Webhook, organization string, action string) []*Webhook { func getFilteredWebhooks(webhooks []*Webhook, organization string, action string) []*Webhook {
res := []*Webhook{} res := []*Webhook{}
for _, webhook := range webhooks { for _, webhook := range webhooks {

12
routers/record.go
View File

@ -20,6 +20,7 @@ import (
"github.com/beego/beego/context" "github.com/beego/beego/context"
"github.com/casdoor/casdoor/object" "github.com/casdoor/casdoor/object"
"github.com/casdoor/casdoor/util" "github.com/casdoor/casdoor/util"
"github.com/casvisor/casvisor-go-sdk/casvisorsdk"
) )
func getUser(ctx *context.Context) (username string) { func getUser(ctx *context.Context) (username string) {
@ -79,9 +80,10 @@ func AfterRecordMessage(ctx *context.Context) {
record.Organization, record.User = util.GetOwnerAndNameFromId(userId) record.Organization, record.User = util.GetOwnerAndNameFromId(userId)
} }
var record2 *casvisorsdk.Record
recordSignup := ctx.Input.Params()["recordSignup"] recordSignup := ctx.Input.Params()["recordSignup"]
if recordSignup == "true" { if recordSignup == "true" {
record2 := *record record2 = object.CopyRecord(record)
record2.Action = "new-user" record2.Action = "new-user"
var user *object.User var user *object.User
@ -96,12 +98,14 @@ func AfterRecordMessage(ctx *context.Context) {
return return
} }
record.Object = util.StructToJson(user) record2.Object = util.StructToJson(user)
util.SafeGoroutine(func() { object.AddRecord(&record2) })
} }
util.SafeGoroutine(func() { util.SafeGoroutine(func() {
object.AddRecord(record) object.AddRecord(record)
if record2 != nil {
object.AddRecord(record2)
}
}) })
} }

2
web/src/RecordListPage.js
View File

@ -187,7 +187,7 @@ class RecordListPage extends BaseListPage {
sorter: true, sorter: true,
fixed: (Setting.isMobile()) ? "false" : "right", fixed: (Setting.isMobile()) ? "false" : "right",
render: (text, record, index) => { render: (text, record, index) => {
if (!["signup", "login", "logout", "update-user"].includes(record.action)) { if (!["signup", "login", "logout", "update-user", "new-user"].includes(record.action)) {
return null; return null;
} }