mirror of
https://github.com/cloudreve/cloudreve.git
synced 2026-03-13 09:24:07 +08:00
fix(eventhub): nil pointer trying get owner
This commit is contained in:
2
assets
2
assets
Submodule assets updated: c0f3e50207...b900a868aa
@@ -108,6 +108,10 @@ func (s *subscriber) Owner() (*ent.User, error) {
|
||||
s.mu.Lock()
|
||||
defer s.mu.Unlock()
|
||||
|
||||
return s.ownerLocked()
|
||||
}
|
||||
|
||||
func (s *subscriber) ownerLocked() (*ent.User, error) {
|
||||
if time.Since(s.cachedAt) > userCacheTTL || s.ownerCached == nil {
|
||||
user, err := s.userClient.GetLoginUserByID(context.Background(), s.uid)
|
||||
if err != nil {
|
||||
@@ -165,7 +169,11 @@ func (s *subscriber) flushLocked(ctx context.Context) {
|
||||
}
|
||||
|
||||
if !s.online {
|
||||
_ = s.fsEventClient.Create(ctx, s.ownerCached.ID, uuid.FromStringOrNil(s.id), lo.Map(s.buffer, func(item *Event, index int) string {
|
||||
owner, err := s.ownerLocked()
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
_ = s.fsEventClient.Create(ctx, owner.ID, uuid.FromStringOrNil(s.id), lo.Map(s.buffer, func(item *Event, index int) string {
|
||||
res, _ := json.Marshal(item)
|
||||
return string(res)
|
||||
})...)
|
||||
|
||||
@@ -246,13 +246,6 @@ func (s *DeleteOAuthGrantService) Delete(c *gin.Context) error {
|
||||
return serializer.NewError(serializer.CodeNotFound, "OAuth grant not found", nil)
|
||||
}
|
||||
|
||||
dep.AuditRecorder().Record(c, &types.LogEntry{
|
||||
Category: types.AuditLogTypeOAuthGrantRevoke,
|
||||
Exts: map[string]string{
|
||||
"client_id": s.AppID,
|
||||
},
|
||||
})
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user