fix(eventhub): nil pointer trying get owner

master
Aaron Liu 5 days ago
parent 2241a9e2c8
commit 5d9cfaa973

@ -1 +1 @@
Subproject commit c0f3e50207b5783220fafc26a0c9885aadd38af1
Subproject commit b900a868aa9ab09df7876feb6ac2de40b3be23ae

@ -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
}

Loading…
Cancel
Save