ocdav: Use GetUserByClaim to lookup user by name

GetUser() is for getting users by ID only. Also try to handle the "User does not
exist" case with a more helpful error message.

internal/http/services/owncloud/ocdav/ocdav.go

@@ -244,25 +244,47 @@ func (s *svc) ApplyLayout(ctx context.Context, ns string, useLoggedInUserNS bool
 	// namespace template.
 	u, ok := ctxpkg.ContextGetUser(ctx)
 	if !ok || !useLoggedInUserNS {
-		var requestUserID string
-		requestUserID, requestPath = router.ShiftPath(requestPath)
+		var requestUsernameOrId string
+		requestUsernameOrId, requestPath = router.ShiftPath(requestPath)
 
 		gatewayClient, err := s.getClient()
 		if err != nil {
 			return "", "", err
 		}
+
+		// Check if this is a Userid
 		userRes, err := gatewayClient.GetUser(ctx, &userpb.GetUserRequest{
-			UserId: &userpb.UserId{OpaqueId: requestUserID},
+			UserId: &userpb.UserId{OpaqueId: requestUsernameOrId},
 		})
 		if err != nil {
 			return "", "", err
 		}
-		if userRes.Status.Code != rpc.Code_CODE_OK {
-			return "", "", errors.New(userRes.Status.Message)
+
+		// If it's not a userid try if it is a user name
+		if userRes.Status.Code == rpc.Code_CODE_NOT_FOUND {
+			res, err := gatewayClient.GetUserByClaim(ctx, &userpb.GetUserByClaimRequest{
+				Claim: "username",
+				Value: requestUsernameOrId,
+			})
+			if err != nil {
+				return "", "", err
+			} else {
+				userRes.Status = res.Status
+				userRes.User = res.User
+			}
+		}
+
+		// If still didn't find a user, fallback
+		if userRes.Status.Code == rpc.Code_CODE_NOT_FOUND {
+			userRes.User = &userpb.User{
+				Username: requestUsernameOrId,
+				Id:       &userpb.UserId{OpaqueId: requestUsernameOrId},
+			}
 		}
 
 		u = userRes.User
 	}
+
 	return templates.WithUser(u, ns), requestPath, nil
 }
 

internal/http/services/owncloud/ocdav/webdav.go

@@ -96,7 +96,7 @@ func (h *WebDavHandler) Handler(s *svc) http.Handler {
 			w.WriteHeader(http.StatusNotFound)
 			b, err := Marshal(exception{
 				code:    SabredavNotFound,
-				message: fmt.Sprintf("could not get storage for %s", r.RemoteAddr),
+				message: fmt.Sprintf("could not get storage for %s", r.URL.Path),
 			})
 			HandleWebdavError(appctx.GetLogger(r.Context()), w, b, err)
 		}