Skip to content

Commit 390abcd

Browse files
authored
Merge pull request #11925 from owncloud/feat/users-instances
feat(graph): [OCISDEV-458] [OCISDEV-459] add users instances
2 parents 12e5629 + 9b85603 commit 390abcd

File tree

14 files changed

+1179
-267
lines changed

14 files changed

+1179
-267
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Enhancement: Add users instances
2+
3+
The user endpoint now returns the instances that the user is either a member or a guest of and the cross instance reference.
4+
5+
https://github.com/owncloud/ocis/pull/11925

deployments/examples/ocis_multi/docker-compose.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ services:
115115
OCIS_MULTI_INSTANCE_MEMBER_CLAIM: "memberOf"
116116
OCIS_MULTI_INSTANCE_GUEST_CLAIM: "guestOf"
117117
OCIS_MULTI_INSTANCE_GUEST_ROLE: "user-light"
118+
OCIS_LDAP_CROSS_INSTANCE_REFERENCE_TEMPLATE: "{{.Username}}@{{.Instancename}}.owncloud.test"
119+
OCIS_LDAP_INSTANCE_URL_TEMPLATE: "https://{{.Instancename}}.owncloud.test"
118120
# Workaround needed to show external users - can be removed once fixed
119121
OCIS_SHOW_USER_EMAIL_IN_RESULTS: true
120122
PROXY_ROLE_ASSIGNMENT_OIDC_CLAIM: ownCloudRole
@@ -209,6 +211,8 @@ services:
209211
OCIS_MULTI_INSTANCE_MEMBER_CLAIM: "memberOf"
210212
OCIS_MULTI_INSTANCE_GUEST_CLAIM: "guestOf"
211213
OCIS_MULTI_INSTANCE_GUEST_ROLE: "user-light"
214+
OCIS_LDAP_CROSS_INSTANCE_REFERENCE_TEMPLATE: "{{.Username}}@{{.Instancename}}.owncloud.test"
215+
OCIS_LDAP_INSTANCE_URL_TEMPLATE: "https://{{.Instancename}}.owncloud.test"
212216
# user filter required for multi-instance ocis
213217
# Workaround needed to show external users - can be removed once fixed
214218
OCIS_SHOW_USER_EMAIL_IN_RESULTS: true

0 commit comments

Comments
 (0)