melon/tokidoki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

storage/filesystem: simplify UserPrincipalBackend

Browse Source 
Use composition to expose UserPrincipalBackend in filesystemBackend.
That way, no need to re-define the CurrentUserPrincipal method.
This commit is contained in:
Simon Ser 2022-05-24 10:39:27 +00:00 committed by Conrad Hoffmann
parent e443b02acf
commit 5edd0f5a0e
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
storage/filesystem.go
View File

@ -26,10 +26,10 @@ import (
) )
type filesystemBackend struct { type filesystemBackend struct {
webdav.UserPrincipalBackend
path string path string
caldavPrefix string caldavPrefix string
carddavPrefix string carddavPrefix string
userPrincipalBackend webdav.UserPrincipalBackend
} }
var ( var (
@ -45,20 +45,16 @@ func NewFilesystem(fsPath, caldavPrefix, carddavPrefix string, userPrincipalBack
return nil, nil, fmt.Errorf("base path for filesystem backend must be a directory") return nil, nil, fmt.Errorf("base path for filesystem backend must be a directory")
} }
backend := &filesystemBackend{ backend := &filesystemBackend{
UserPrincipalBackend: userPrincipalBackend,
path: fsPath, path: fsPath,
caldavPrefix: caldavPrefix, caldavPrefix: caldavPrefix,
carddavPrefix: carddavPrefix, carddavPrefix: carddavPrefix,
userPrincipalBackend: userPrincipalBackend,
} }
return backend, backend, nil return backend, backend, nil
} }
func (b *filesystemBackend) CurrentUserPrincipal(ctx context.Context) (string, error) {
return b.userPrincipalBackend.CurrentUserPrincipal(ctx)
}
func (b *filesystemBackend) AddressbookHomeSetPath(ctx context.Context) (string, error) { func (b *filesystemBackend) AddressbookHomeSetPath(ctx context.Context) (string, error) {
upPath, err := b.userPrincipalBackend.CurrentUserPrincipal(ctx) upPath, err := b.CurrentUserPrincipal(ctx)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -67,7 +63,7 @@ func (b *filesystemBackend) AddressbookHomeSetPath(ctx context.Context) (string,
} }
func (b *filesystemBackend) CalendarHomeSetPath(ctx context.Context) (string, error) { func (b *filesystemBackend) CalendarHomeSetPath(ctx context.Context) (string, error) {
upPath, err := b.userPrincipalBackend.CurrentUserPrincipal(ctx) upPath, err := b.CurrentUserPrincipal(ctx)
if err != nil { if err != nil {
return "", err return "", err
} }