b0esche/b0esche_cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix avatar URL to full URL and increase WebDAV timeout to 60s with ensureParent enabled

Browse Source
This commit is contained in:
Leon Bösche
2026-01-29 21:04:13 +01:00
parent 38c4d071c9
commit def7626b37
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
go_cloud/internal/http/routes.go
View File

@@ -3848,7 +3848,7 @@ func getUserProfileHandler(w http.ResponseWriter, r *http.Request, db *database.
// If avatar exists, return the backend URL instead of the internal WebDAV URL // If avatar exists, return the backend URL instead of the internal WebDAV URL
if user.AvatarURL != nil && *user.AvatarURL != "" { if user.AvatarURL != nil && *user.AvatarURL != "" {
user.AvatarURL = &[]string{fmt.Sprintf("/user/avatar?v=%d", time.Now().Unix())}[0] user.AvatarURL = &[]string{fmt.Sprintf("https://go.b0esche.cloud/user/avatar?v=%d", time.Now().Unix())}[0]
} }
w.Header().Set("Content-Type", "application/json") w.Header().Set("Content-Type", "application/json")
@@ -4048,7 +4048,7 @@ func uploadUserAvatarHandler(w http.ResponseWriter, r *http.Request, db *databas
// Get public URL - for now, construct it manually since Nextcloud doesn't provide direct public URLs // Get public URL - for now, construct it manually since Nextcloud doesn't provide direct public URLs
// In a real setup, you'd configure Nextcloud to serve public URLs or use a CDN // In a real setup, you'd configure Nextcloud to serve public URLs or use a CDN
publicURL := fmt.Sprintf("/user/avatar?v=%d", time.Now().Unix()) publicURL := fmt.Sprintf("https://go.b0esche.cloud/user/avatar?v=%d", time.Now().Unix())
webdavURL := fmt.Sprintf("%s/%s", client.BaseURL, avatarPath) webdavURL := fmt.Sprintf("%s/%s", client.BaseURL, avatarPath)
// Update user profile with avatar URL // Update user profile with avatar URL

10
go_cloud/internal/storage/webdav.go
View File

@@ -42,7 +42,7 @@ func NewWebDAVClient(cfg *config.Config) *WebDAVClient {
user: cfg.NextcloudUser, user: cfg.NextcloudUser,
pass: cfg.NextcloudPass, pass: cfg.NextcloudPass,
basePrefix: strings.TrimRight(base, "/"), basePrefix: strings.TrimRight(base, "/"),
httpClient: &http.Client{Timeout: 30 * time.Second}, httpClient: &http.Client{Timeout: 60 * time.Second},
} }
} }
@@ -91,11 +91,9 @@ func (c *WebDAVClient) Upload(ctx context.Context, remotePath string, r io.Reade
if c == nil { if c == nil {
return fmt.Errorf("no webdav client configured") return fmt.Errorf("no webdav client configured")
} }
// Ensure parent collections (skip for hidden avatar folders to avoid MKCOL timeouts) // Ensure parent collections
if !strings.HasPrefix(remotePath, ".avatars") { if err := c.ensureParent(ctx, remotePath); err != nil {
if err := c.ensureParent(ctx, remotePath); err != nil { return err
return err
}
} }
// Construct URL // Construct URL
// remotePath might be like /orgs/<id>/file.txt; ensure it joins to basePrefix // remotePath might be like /orgs/<id>/file.txt; ensure it joins to basePrefix