Use remaining path segment

ronaldbarendse · ronaldbarendse · commit 989691b404e5 · 2022-05-12T14:26:56.000+02:00
diff --git a/src/Umbraco.StorageProviders.AzureBlob/AzureBlobFileSystemMiddleware.cs b/src/Umbraco.StorageProviders.AzureBlob/AzureBlobFileSystemMiddleware.cs
@@ -83,13 +83,13 @@ private async Task HandleRequestAsync(HttpContext context, RequestDelegate next)
             var request = context.Request;
             var response = context.Response;
 
-            if (!context.Request.Path.StartsWithSegments(_rootPath, StringComparison.InvariantCultureIgnoreCase))
+            if (!context.Request.Path.StartsWithSegments(_rootPath, StringComparison.InvariantCultureIgnoreCase, out PathString path))
             {
                 await next(context).ConfigureAwait(false);
                 return;
             }
 
-            string containerPath = $"{_containerRootPath.TrimEnd('/')}/{(request.Path.Value.Remove(0, _rootPath.Length)).TrimStart('/')}";
+            string containerPath = $"{_containerRootPath.TrimEnd('/')}/{path.Value?.TrimStart('/')}";
             var blob = _fileSystemProvider.GetFileSystem(_name).GetBlobClient(containerPath);
 
             var blobRequestConditions = GetAccessCondition(context.Request);

Original file line number	Diff line number	Diff line change
`@@ -83,13 +83,13 @@ private async Task HandleRequestAsync(HttpContext context, RequestDelegate next)`
`83`	`83`	`var request = context.Request;`
`84`	`84`	`var response = context.Response;`
`85`	`85`
`86`		`- if (!context.Request.Path.StartsWithSegments(_rootPath, StringComparison.InvariantCultureIgnoreCase))`
	`86`	`+ if (!context.Request.Path.StartsWithSegments(_rootPath, StringComparison.InvariantCultureIgnoreCase, out PathString path))`
`87`	`87`	`{`
`88`	`88`	`await next(context).ConfigureAwait(false);`
`89`	`89`	`return;`
`90`	`90`	`}`
`91`	`91`
`92`		`- string containerPath = $"{_containerRootPath.TrimEnd('/')}/{(request.Path.Value.Remove(0, _rootPath.Length)).TrimStart('/')}";`
	`92`	`+ string containerPath = $"{_containerRootPath.TrimEnd('/')}/{path.Value?.TrimStart('/')}";`
`93`	`93`	`var blob = _fileSystemProvider.GetFileSystem(_name).GetBlobClient(containerPath);`
`94`	`94`
`95`	`95`	`var blobRequestConditions = GetAccessCondition(context.Request);`