lewis.moe / tangled-core
forked from tangled.org/core
Monorepo for Tangled
fork atom

appview: harden spindle deletion again

Signed-off-by: oppiliappan <me@oppi.li>

oppi.li 73d41fcd 83937565

verified
+14 -8
unified split
+6 -3
appview/ingester.go
··· 492 492 if err != nil || len(spindles) != 1 { 493 493 return fmt.Errorf("failed to get spindles: %w, len(spindles) = %d", err, len(spindles)) 494 494 } 495 + spindle := spindles[0] 495 496 496 497 tx, err := ddb.Begin() 497 498 if err != nil { ··· 511 512 return err 512 513 } 513 514 514 - err = i.Enforcer.RemoveSpindle(instance) 515 - if err != nil { 516 - return err 515 + if spindle.Verified != nil { 516 + err = i.Enforcer.RemoveSpindle(instance) 517 + if err != nil { 518 + return err 519 + } 517 520 } 518 521 519 522 err = tx.Commit()
+8 -5
appview/spindles/spindles.go
··· 316 316 return 317 317 } 318 318 319 - err = s.Enforcer.RemoveSpindle(instance) 320 - if err != nil { 321 - l.Error("failed to update ACL", "err", err) 322 - fail() 323 - return 319 + // delete from enforcer 320 + if spindles[0].Verified != nil { 321 + err = s.Enforcer.RemoveSpindle(instance) 322 + if err != nil { 323 + l.Error("failed to update ACL", "err", err) 324 + fail() 325 + return 326 + } 324 327 } 325 328 326 329 client, err := s.OAuth.AuthorizedClient(r)