starred/pocket-id
1
0
Fork 0
mirror of https://github.com/pocket-id/pocket-id.git synced 2025-12-18 17:23:26 +03:00
Code Issues 121 Packages Projects Releases 16 Wiki Activity

Merge branch 'main' into v2

Browse Source
This commit is contained in:
Elias Schneider
2025-11-14 11:08:20 +01:00
parent 98cf1f66c3 12125713a2
commit 2694d79add
7 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
backend/internal/service/ldap_service.go
View File

@@ -440,7 +440,7 @@ func (s *LdapService) SyncUsers(ctx context.Context, tx *gorm.DB, client *ldap.C
}
func (s *LdapService) saveProfilePicture(parentCtx context.Context, userId string, pictureString string) error {
var reader io.Reader
var reader io.ReadSeeker
_, err := url.ParseRequestURI(pictureString)
if err == nil {
@@ -460,7 +460,12 @@ func (s *LdapService) saveProfilePicture(parentCtx context.Context, userId strin
}
defer res.Body.Close()
reader = res.Body
data, err := io.ReadAll(res.Body)
if err != nil {
return fmt.Errorf("failed to read profile picture: %w", err)
}
reader = bytes.NewReader(data)
} else if decodedPhoto, err := base64.StdEncoding.DecodeString(pictureString); err == nil {
// If the photo is a base64 encoded string, decode it
reader = bytes.NewReader(decodedPhoto)