beenull/photoprism
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Share: Ensure that shares are always loaded in the user entity model

Browse source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2023-10-10 14:32:04 +02:00
parent e6b1a28bcf
commit 3c0f1f37ad
2 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
internal/entity/auth_user.go
View file

@ -312,8 +312,9 @@ func (m *User) Deleted() bool {
// LoadRelated loads related settings and details.
func (m *User) LoadRelated() *User {
m.Settings()
m.Details()
m.Settings()
m.RefreshShares()
return m
}
@ -948,7 +949,7 @@ func (m *User) RefreshShares() *User {
// NoShares checks if the user has no shares yet.
func (m *User) NoShares() bool {
if !m.IsRegistered() {
if m.NotRegistered() {
return true
}
@ -962,23 +963,17 @@ func (m *User) HasShares() bool {
// HasShare if a uid was shared with the user.
func (m *User) HasShare(uid string) bool {
if !m.IsRegistered() {
if m.NotRegistered() || m.NoShares() {
return false
}
// Check cashed list of user shares.
if m.UserShares.Contains(uid) {
return true
}
// Refresh cache and try again if not found.
m.RefreshShares()
// Check if the share list contains the specified UID.
return m.UserShares.Contains(uid)
}
// SharedUIDs returns shared entity UIDs.
func (m *User) SharedUIDs() UIDs {
if m.IsRegistered() && m.UserShares.Empty() {
if m.IsRegistered() && m.NoShares() {
m.RefreshShares()
}

2
internal/entity/auth_user_test.go
View file

@ -1773,8 +1773,6 @@ func TestUser_HasShares(t *testing.T) {
})
t.Run("Alice", func(t *testing.T) {
m := FindLocalUser("alice")
assert.False(t, m.HasShares())
m.RefreshShares()
assert.True(t, m.HasShares())
})
}