hide account.id in ocs api, use username

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
owncloud · Nov 6, 2020 · 1456715 · 1456715
1 parent 1719862
commit 1456715
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/changelog/unreleased/ocs-map-userid-to-username.md b/changelog/unreleased/ocs-map-userid-to-username.md
@@ -7,3 +7,4 @@ service. The userid in OCS requests is in fact the username, not our internal ac
 as our internal account id though, because the account id is part of various `path` formats.
 
 https://github.com/owncloud/ocis/pull/709
+https://github.com/owncloud/ocis/pull/816
diff --git a/ocs/pkg/service/v0/users.go b/ocs/pkg/service/v0/users.go
@@ -56,7 +56,7 @@ func (o Ocs) GetSelf(w http.ResponseWriter, r *http.Request) {
 	o.logger.Debug().Interface("account", account).Msg("got user")
 
 	d := &data.User{
-		UserID:            account.Id,
+		UserID:            account.OnPremisesSamAccountName,
 		DisplayName:       account.DisplayName,
 		LegacyDisplayName: account.DisplayName,
 		Email:             account.Mail,
@@ -104,7 +104,7 @@ func (o Ocs) GetUser(w http.ResponseWriter, r *http.Request) {
 	}
 
 	d := &data.User{
-		UserID:            account.Id,
+		UserID:            account.OnPremisesSamAccountName,
 		DisplayName:       account.DisplayName,
 		LegacyDisplayName: account.DisplayName,
 		Email:             account.Mail,
@@ -218,7 +218,7 @@ func (o Ocs) AddUser(w http.ResponseWriter, r *http.Request) {
 		enabled = "false"
 	}
 	render.Render(w, r, response.DataRender(&data.User{
-		UserID:            account.Id,
+		UserID:            account.OnPremisesSamAccountName,
 		DisplayName:       account.DisplayName,
 		LegacyDisplayName: account.DisplayName,
 		Email:             account.Mail,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,4 @@ service. The userid in OCS requests is in fact the username, not our internal ac
		as our internal account id though, because the account id is part of various `path` formats.

		https://github.com/owncloud/ocis/pull/709
		https://github.com/owncloud/ocis/pull/816