From f72d59e7ca19a67e00cb300427b3a931461adb4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Fri, 25 Aug 2023 14:40:37 +0200 Subject: [PATCH] fall back to userid if ownclouduuid is empty MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- changelog/unreleased/users-owncloudsql-fallback.md | 5 +++++ pkg/user/manager/owncloudsql/owncloudsql.go | 4 ++++ 2 files changed, 9 insertions(+) create mode 100644 changelog/unreleased/users-owncloudsql-fallback.md diff --git a/changelog/unreleased/users-owncloudsql-fallback.md b/changelog/unreleased/users-owncloudsql-fallback.md new file mode 100644 index 00000000000..aa7c08e2f05 --- /dev/null +++ b/changelog/unreleased/users-owncloudsql-fallback.md @@ -0,0 +1,5 @@ +Bugfix: users owncloudsql now always returns a userid + +When joining the ownclouduuid is disabled we now fall back to the userid. + +https://github.com/cs3org/reva/pull/4135 diff --git a/pkg/user/manager/owncloudsql/owncloudsql.go b/pkg/user/manager/owncloudsql/owncloudsql.go index 166bdc8c7ad..f9c504ac008 100644 --- a/pkg/user/manager/owncloudsql/owncloudsql.go +++ b/pkg/user/manager/owncloudsql/owncloudsql.go @@ -167,6 +167,10 @@ func (m *manager) convertToCS3User(ctx context.Context, a *accounts.Account, ski GidNumber: m.c.Nobody, UidNumber: m.c.Nobody, } + // fall back to userid + if u.Id.OpaqueId == "" { + u.Id.OpaqueId = a.UserID + } if u.Username == "" { u.Username = u.Id.OpaqueId }