Use email as displayname for external users opening WOPI apps

cs3org · Jun 17, 2022 · cafe46f · cafe46f
1 parent 1ace372
commit cafe46f
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/pkg/app/provider/wopi/wopi.go b/pkg/app/provider/wopi/wopi.go
@@ -147,20 +147,24 @@ func (p *wopiProvider) GetAppURL(ctx context.Context, resource *provider.Resourc
 
 	u, ok := ctxpkg.ContextGetUser(ctx)
 	if ok { // else defaults to "Guest xyz"
-		if u.Id.Type == userpb.UserType_USER_TYPE_LIGHTWEIGHT || u.Id.Type == userpb.UserType_USER_TYPE_FEDERATED {
-			q.Add("userid", resource.Owner.OpaqueId+"@"+resource.Owner.Idp)
-		} else {
-			q.Add("userid", u.Id.OpaqueId+"@"+u.Id.Idp)
-		}
 		var isPublicShare bool
 		if u.Opaque != nil {
 			if _, ok := u.Opaque.Map["public-share-role"]; ok {
 				isPublicShare = true
 			}
 		}
 
-		if !isPublicShare {
-			q.Add("username", u.Username)
+		if u.Id.Type == userpb.UserType_USER_TYPE_LIGHTWEIGHT || u.Id.Type == userpb.UserType_USER_TYPE_FEDERATED {
+			q.Add("userid", resource.Owner.OpaqueId+"@"+resource.Owner.Idp)
+			if !isPublicShare {
+				// for visual display, federated/external accounts are shown with their email but act on behalf of the owner
+				q.Add("username", u.Mail)
+			}
+		} else {
+			q.Add("userid", u.Id.OpaqueId+"@"+u.Id.Idp)
+			if !isPublicShare {
+				q.Add("username", u.Username)
+			}
 		}
 	}