#172 - Escape document IDs

Author: matteobortolazzo

src/CouchDB.Driver/CouchDatabase.cs

@@ -81,7 +81,7 @@ internal CouchDatabase(IFlurlClient flurlClient, CouchOptions options, QueryCont
         public async Task<TSource?> FindAsync(string docId, FindOptions options, CancellationToken cancellationToken = default)
         {
             IFlurlRequest request = NewRequest()
-                    .AppendPathSegment(docId);
+                    .AppendPathSegment(Uri.EscapeDataString(docId));
 
             if (options.Conflicts)
                 request = request.SetQueryParam("conflicts", "true");
@@ -240,7 +240,7 @@ public async Task<TSource> AddOrUpdateAsync(TSource document, AddOrUpdateOptions
             }
 
             IFlurlRequest request = NewRequest()
-                .AppendPathSegment(document.Id);
+                .AppendPathSegment(Uri.EscapeDataString(document.Id));
 
             if (options.Batch)
                 request = request.SetQueryParam("batch", "ok");
@@ -268,7 +268,7 @@ public async Task RemoveAsync(TSource document, bool batch = false, Cancellation
             Check.NotNull(document, nameof(document));
 
             IFlurlRequest request = NewRequest()
-                .AppendPathSegment(document.Id);
+                .AppendPathSegment(Uri.EscapeDataString(document.Id));
 
             if (batch)
             {
@@ -377,7 +377,7 @@ private async Task UpdateAttachments(TSource document, CancellationToken cancell
                     new FileStream(attachment.FileInfo.FullName, FileMode.Open));
 
                 AttachmentResult response = await NewRequest()
-                    .AppendPathSegment(document.Id)
+                    .AppendPathSegment(Uri.EscapeDataString(document.Id))
                     .AppendPathSegment(Uri.EscapeUriString(attachment.Name))
                     .WithHeader("Content-Type", attachment.ContentType)
                     .WithHeader("If-Match", document.Rev)
@@ -395,8 +395,8 @@ private async Task UpdateAttachments(TSource document, CancellationToken cancell
             foreach (CouchAttachment attachment in document.Attachments.GetDeletedAttachments())
             {
                 AttachmentResult response = await NewRequest()
-                    .AppendPathSegment(document.Id)
-                    .AppendPathSegment(attachment.Name)
+                    .AppendPathSegment(Uri.EscapeDataString(document.Id))
+                    .AppendPathSegment(Uri.EscapeDataString(attachment.Name))
                     .WithHeader("If-Match", document.Rev)
                     .DeleteAsync(cancellationToken)
                     .ReceiveJson<AttachmentResult>()
@@ -664,7 +664,7 @@ public async Task<Stream> DownloadAttachmentAsStreamAsync(CouchAttachment attach
             }
 
             return await NewRequest()
-                .AppendPathSegment(attachment.DocumentId)
+                .AppendPathSegment(Uri.EscapeDataString(attachment.DocumentId))
                 .AppendPathSegment(Uri.EscapeUriString(attachment.Name))
                 .WithHeader("If-Match", attachment.DocumentRev)
                 .GetStreamAsync(cancellationToken)

src/CouchDB.Driver/Local/LocalDocuments.cs

@@ -67,7 +67,7 @@ public Task<TSource> GetAsync<TSource>(string id, CancellationToken cancellation
         {
             Check.NotNull(id, nameof(id));
             return NewRequest()
-                .AppendPathSegments(GetLocalId(id))
+                .AppendPathSegments(GetLocalId(Uri.EscapeDataString(id)))
                 .GetJsonAsync<TSource>(cancellationToken)
                 .SendRequestAsync();
         }
@@ -78,7 +78,7 @@ public Task CreateOrUpdateAsync<TSource>(TSource document, CancellationToken can
         {
             Check.NotNull(document, nameof(document));
             return NewRequest()
-                .AppendPathSegments(GetLocalId(document.Id))
+                .AppendPathSegments(GetLocalId(Uri.EscapeDataString(document.Id)))
                 .PutJsonAsync(document, cancellationToken)
                 .SendRequestAsync();
         }
@@ -89,7 +89,7 @@ public Task DeleteAsync<TSource>(TSource document, CancellationToken cancellatio
         {
             Check.NotNull(document, nameof(document));
             return NewRequest()
-                .AppendPathSegments(GetLocalId(document.Id))
+                .AppendPathSegments(GetLocalId(Uri.EscapeDataString(document.Id)))
                 .DeleteAsync(cancellationToken)
                 .SendRequestAsync();
         }