diff --git a/CHANGELOG.md b/CHANGELOG.md index c5c15cad4..f2f1c9440 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## Unreleased +### Fixed +- Fix privacy format [#755](https://github.com/rokwire/core-building-block/issues/755) + ## [1.48.0] - 2025-18-02 ### Changed - Default privacy for new accounts [#752](https://github.com/rokwire/core-building-block/issues/752) diff --git a/driver/web/conversions_user.go b/driver/web/conversions_user.go index 2f64502df..773f00fda 100644 --- a/driver/web/conversions_user.go +++ b/driver/web/conversions_user.go @@ -379,7 +379,7 @@ func privacyToDef(item *model.Privacy) *Def.Privacy { func privacyFromDef(item *Def.Privacy) model.Privacy { if item == nil { - return model.Privacy{} + return defaultPrivacy() } var public bool @@ -396,14 +396,7 @@ func privacyFromDef(item *Def.Privacy) model.Privacy { func privacyFromDefNullable(item *Def.PrivacyNullable) model.Privacy { if item == nil { //default privacy - public := true - fieldVisibility := map[string]interface{}{ - "first_name": "public", - "last_name": "public", - "middle_name": "public", - "email": "public", - } - return model.Privacy{Public: public, FieldVisibility: fieldVisibility} + return defaultPrivacy() } var public bool @@ -418,6 +411,20 @@ func privacyFromDefNullable(item *Def.PrivacyNullable) model.Privacy { return model.Privacy{Public: public, FieldVisibility: fieldVisibility} } +func defaultPrivacy() model.Privacy { + return model.Privacy{ + Public: true, + FieldVisibility: map[string]interface{}{ + "profile": map[string]interface{}{ + "first_name": "public", + "last_name": "public", + "middle_name": "public", + "email": "public", + }, + }, + } +} + // MFA func mfaDataListToDef(items []model.MFAType) []Def.SharedResMfa { out := make([]Def.SharedResMfa, len(items))