updated shield api routes

jespanag · jespanag · commit 8668d5ebdf7d · 2021-10-05T14:50:22.000+02:00
diff --git a/Client/Extensions/RouteExtensions.cs b/Client/Extensions/RouteExtensions.cs
@@ -0,0 +1,12 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shield.Client.Extensions
+{
+    public static class RouteExtensions
+    {
+
+        public static string ToApiRoute(this string path) => $"api{(!path.StartsWith("/") ? "/" : "")}{path}";
+    }
+}
diff --git a/Client/Extensions/ServerSentEvents.cs b/Client/Extensions/ServerSentEvents.cs
@@ -91,7 +91,7 @@ public void ProtectSingleFile(string projectKey, string fileBlob, ApplicationCon
         {
             BeforeConnect?.Invoke();
 
-            var taskUrl = $"{_baseUrl}protection/protect/single/sse?projectKey={projectKey}&fileBlob={fileBlob}&onlLog={_defaultLoggerId}";
+            var taskUrl = $"{_baseUrl}api/protection/protect/single/sse?projectKey={projectKey}&fileBlob={fileBlob}&onlLog={_defaultLoggerId}";
 
             if (configuration is not null)
             {
@@ -157,7 +157,7 @@ public async Task ProtectSingleFileAsync(string projectKey, string fileBlob, App
 
             BeforeConnect?.Invoke();
 
-            var taskUrl = $"{_baseUrl}protection/protect/single/sse?projectKey={projectKey}&fileBlob={fileBlob}&onlLog={_defaultLoggerId}";
+            var taskUrl = $"{_baseUrl}api/protection/protect/single/sse?projectKey={projectKey}&fileBlob={fileBlob}&onlLog={_defaultLoggerId}";
 
             if (configuration is not null)
             {
diff --git a/Client/ShieldApplication.cs b/Client/ShieldApplication.cs
@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using RestSharp;
+using Shield.Client.Extensions;
 using Shield.Client.Helpers;
 using Shield.Client.Models;
 using Shield.Client.Models.API.Application;
@@ -47,7 +48,7 @@ public async Task<DirectUploadDto> UploadApplicationDirectlyAsync(string project
             {
                 Parent.CustomLogger?.LogDebug("Initiating the request to upload an application to project.");
 
-                var request = new RestRequest("/app/direct")
+                var request = new RestRequest("/app/direct".ToApiRoute())
                     .AddJsonBody(projectKey)
                     .AddFile("file", file.FileContent, file.FileName, MimeTypeMap.GetMimeType(file.FileName))
                     .AddDependencies(dependencies?.Select(x => (x.FileContent, x.FileName)).ToList());
@@ -79,7 +80,7 @@ public DirectUploadDto UploadApplicationDirectly(string projectKey, ShieldFile f
             {
                 Parent.CustomLogger?.LogDebug("Initiating the request to upload an application to project.");
 
-                var request = new RestRequest("/app/direct")
+                var request = new RestRequest("/app/direct".ToApiRoute())
                     .AddJsonBody(projectKey)
                     .AddFile("file", file.FileContent, file.FileName, MimeTypeMap.GetMimeType(file.FileName))
                     .AddDependencies(dependencies?.Select(x => (x.FileContent, x.FileName)).ToList());
@@ -111,7 +112,7 @@ public async Task<DirectUploadDto> UploadApplicationDirectlyAsync(string project
             {
                 Parent.CustomLogger?.LogDebug("Initiating the request to upload an application to project.");
 
-                var request = new RestRequest("/app/direct")
+                var request = new RestRequest("/app/direct".ToApiRoute())
                     .AddQueryParameter("projectKey", projectKey)
                     .AddFileFromPath(filePath)
                     .AddDependencies(dependenciesPaths);
@@ -144,7 +145,7 @@ public DirectUploadDto UploadApplicationDirectly(string projectKey, string fileP
             {
                 Parent.CustomLogger?.LogDebug("Initiating the request to upload an application to project.");
 
-                var request = new RestRequest("/app/direct")
+                var request = new RestRequest("/app/direct".ToApiRoute())
                     .AddQueryParameter("projectKey", projectKey)
                     .AddFileFromPath(filePath)
                     .AddDependencies(dependenciesPaths);
@@ -227,7 +228,7 @@ internal async Task<MemoryStream> DownloadApplicationAsync(string downloadKey, D
 
                 Parent.CustomLogger?.LogDebug("Initiating the request to download an application.");
                 using var stream = new MemoryStream();
-                var request = new RestRequest("/app/download")
+                var request = new RestRequest("/app/download".ToApiRoute())
                     {
                         ResponseWriter = async responseStream =>
                         {
@@ -271,7 +272,7 @@ internal MemoryStream DownloadApplication(string downloadKey, DownloadFormat for
 
                 Parent.CustomLogger?.LogDebug("Initiating the request to download an application.");
                 using var stream = new MemoryStream();
-                var request = new RestRequest("/app/download")
+                var request = new RestRequest("/app/download".ToApiRoute())
                     {
                         ResponseWriter = responseStream =>
                         {
diff --git a/Client/ShieldConnector.cs b/Client/ShieldConnector.cs
@@ -23,8 +23,8 @@ public ShieldConnector(IRestClient client, ShieldClient parent, string bearerTok
             _client = new RestClient(client.BaseUrl ?? throw new InvalidOperationException()) {Authenticator = client.Authenticator, Timeout = 1000 * 60 * 10};
             _originalBaseUrl = client.BaseUrl.AbsoluteUri;
             //Not required version for logger (Only in dev).
-            if (!client.BaseUrl.ToString().ToLower().StartsWith("https://api.dotnetsafer.com"))
-                _client.BaseUrl = new Uri(_client.BaseUrl?.AbsoluteUri.Replace(_client.BaseUrl.PathAndQuery,null) ?? throw new InvalidOperationException());
+            //if (!client.BaseUrl.ToString().ToLower().StartsWith("https://api.dotnetsafer.com"))
+            //    _client.BaseUrl = new Uri(_client.BaseUrl?.AbsoluteUri.Replace(_client.BaseUrl.PathAndQuery,null) ?? throw new InvalidOperationException());
             Parent = parent;
             _bearerToken = bearerToken;
             _apiVersion = apiVersion;
diff --git a/Client/ShieldProject.cs b/Client/ShieldProject.cs
@@ -2,13 +2,15 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using RestSharp;
+using Shield.Client.Extensions;
 using Shield.Client.Models.API.Project;
 
 namespace Shield.Client
 {
     public class ShieldProject
     {
         private readonly RestClient _client;
+
         public ShieldClient Parent { get; set; }
 
         public ShieldProject(RestClient client, ShieldClient parent)
@@ -36,7 +38,7 @@ public async Task<ProjectDto> FindOrCreateExternalProjectAsync(string projectNam
                 Parent.CustomLogger?.LogDebug("Initiating the request to find or create external project.");
 
                 var request =
-                    new RestRequest("/project/externalProject/{projectName}")
+                    new RestRequest("project/externalProject/{projectName}".ToApiRoute())
                         .AddUrlSegment("projectName", projectName);
 
                 var result = await _client.GetAsync<ProjectDto>(request);
@@ -63,7 +65,7 @@ public ProjectDto FindOrCreateExternalProject(string projectName)
                 Parent.CustomLogger?.LogDebug("Initiating the request to find or create external project.");
 
                 var request =
-                    new RestRequest("/project/externalProject/{projectName}")
+                    new RestRequest("/project/externalProject/{projectName}".ToApiRoute())
                         .AddUrlSegment("projectName", projectName);
 
                 var result = _client.Get<ProjectDto>(request);
@@ -94,7 +96,7 @@ public async Task<ProjectDto> FindByIdOrCreateExternalProjectAsync(string projec
                 Parent.CustomLogger?.LogDebug("Initiating the request to find or create external project.");
 
                 var request =
-                    new RestRequest("/project/externalProject/{projectName}")
+                    new RestRequest("/project/externalProject/{projectName}".ToApiRoute())
                         .AddUrlSegment("projectName", projectName)
                         .AddQueryParameter("projectKey", projectKey);
 
@@ -123,7 +125,7 @@ public ProjectDto FindByIdOrCreateExternalProject(string projectName, string pro
                 Parent.CustomLogger?.LogDebug("Initiating the request to find or create external project.");
 
                 var request =
-                    new RestRequest("/project/externalProject/{projectName}")
+                    new RestRequest("/project/externalProject/{projectName}".ToApiRoute())
                         .AddUrlSegment("projectName", projectName)
                         .AddQueryParameter("projectKey", projectKey);
 
diff --git a/Client/ShieldProtections.cs b/Client/ShieldProtections.cs
@@ -3,6 +3,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using RestSharp;
+using Shield.Client.Extensions;
 using Shield.Client.Models.API.Protections;
 
 namespace Shield.Client
@@ -39,7 +40,7 @@ public List<ProtectionDto> GetProtections(string projectKey)
                 Parent.CustomLogger?.LogDebug("Initiating the request to get project available protections.");
 
                 var request =
-                    new RestRequest("project/{projectKey}/protections/available/")
+                    new RestRequest("project/{projectKey}/protections/available/".ToApiRoute())
                         .AddUrlSegment("projectKey", projectKey);
 
                 var result =  _client.Get<List<ProtectionDto>>(request);
@@ -66,7 +67,7 @@ public async Task<List<ProtectionDto>> GetProtectionsAsync(string projectKey)
                 Parent.CustomLogger?.LogDebug("Initiating the request to get project available protections.");
 
                 var request =
-                    new RestRequest("project/{projectKey}/protections/available/")
+                    new RestRequest("project/{projectKey}/protections/available/".ToApiRoute())
                         .AddUrlSegment("projectKey", projectKey);
 
                 var result = await _client.GetAsync<List<ProtectionDto>>(request);
diff --git a/Client/ShieldTasks.cs b/Client/ShieldTasks.cs
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using RestSharp;
+using Shield.Client.Extensions;
 using Shield.Client.Models;
 using Shield.Client.Models.API.Application;
 
@@ -52,7 +53,7 @@ public async Task<ProtectionResult> ProtectSingleFileAsync(string projectKey, st
                 Parent.CustomLogger?.LogDebug("Initiating the request to protect a single file.");
 
                 var request =
-                    new RestRequest("/protection/protect/single")
+                    new RestRequest("/protection/protect/single".ToApiRoute())
                         .AddQueryParameter("projectKey", projectKey)
                         .AddQueryParameter("fileBlob", fileBlob)
                         .AddQueryParameter("runKey", runKey)
@@ -113,7 +114,7 @@ public ProtectionResult ProtectSingleFile(string projectKey, string fileBlob, st
                 Parent.CustomLogger?.LogDebug("Initiating the request to protect a single file.");
 
                 var request =
-                    new RestRequest("/protection/protect/single")
+                    new RestRequest("/protection/protect/single".ToApiRoute())
                         .AddQueryParameter("projectKey", projectKey)
                         .AddQueryParameter("fileBlob", fileBlob)
                         .AddQueryParameter("runKey", runKey)
diff --git a/Examples/NetCore.Console.Example/Consumer.cs b/Examples/NetCore.Console.Example/Consumer.cs
@@ -31,7 +31,7 @@ internal async Task Run()
             var dependencies = Directory.GetFiles($"{directory}").ToList();
 
             var client = ShieldClient.CreateInstance(
-                "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJodHRwOi8vc2NoZW1hcy54bWxzb2FwLm9yZy93cy8yMDA1LzA1L2lkZW50aXR5L2NsYWltcy9uYW1laWRlbnRpZmllciI6IjE4ODgzMmEyLTUxODktNDMwZS05NGFmLTc3MTJkZTBiM2FmZCIsInVuaXF1ZV9uYW1lIjoiOTE4ZDgxNmYtZDI4Zi00YThjLWE3MWItMzZiM2VkYTdlNjY4IiwidmVyc2lvbiI6IjEuMC4wIiwic2VydmljZSI6ImRvdG5ldHNhZmVyIiwiZWRpdGlvbiI6ImNvbW11bml0eSIsImp0aSI6ImFjOGRjMzA1LTNhNTEtNGQ0OC1iYTM2LTQ3NTVjYTYzYWEzMSIsImV4cCI6MTYyNTAwNzAxOH0.14XV2lcAoByRESSwC5D_DixJldKeRcE2d0pOigEHINo"
+                "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJhdWQiOiI5NDNmMGMwMS0yOTBiLTQ4NjYtYTAyZi1lN2Q4NTU2OWE5OTQiLCJqdGkiOiIxMGU5MzU5NDBhOGFjOGI4MDQyMzVkYzI0ZmY2NmJkMmEwODZmMmNhNmI0NWFhNDkwMzQ5YTNiZDcyMzQzZmRiM2RiZmU3Zjk0ODFkMGJlMCIsImlhdCI6MTYzMzQzMzE0My43Mjk3NTUsIm5iZiI6MTYzMzQzMzE0My43Mjk3NTksImV4cCI6MTY2NDk2OTE0My42ODg1MSwic3ViIjoiOTQ1OTc5NTgtY2JjYi00OThhLTllNTAtYzQ0NmUzYTIyZDkyIiwic2NvcGVzIjpbXX0.a7MTfyKDV6TrLg9r-fpn0qTazcWGzBM1uzZiOjB2YT-ex_fEIZlWs0gO7TbTVQbs3E9LuLO-HNQz5Q0VQeN9gW1tfW-aB5mIN0T2FNMeECcqT2UQeVD5W1AGU3K4oadOMUMif9Hqujgyi3mXU4zt_EubHZ-A8eLhUDcbP5UdLJE7FeYnyCHLXM4RbWgzugqRMmwzt6qctQ_uPXLfdiSL6Br0Cb5mA45tBwU2hcWfN3wLeCIeIncN1HxOpBBphMjOLP27N39OMf0uFJ4eqvnWC7AM_aEsWGCuse9svxRYSeznFVoU9KaPu_X9geRbBBat35QnDjnzJyHOa30EiK-qnuRlrAX-Qhrm1LTGx0hQY461Yx7hv2tnlT-s2_s41w02DSAlxQsNKrxAH5U1OKUujgLEJNsEONRnD7oYBuu2NisRFg8RWfJi3S6kZS8UjrXR646J7AkBB8R2EUeJULEv1SUoDLTveCl1NyDJQjvhFroQrhKsuT4QTH2Gd8kWcjEfRrm63qjzFMLGDo7JcMCh_O4lXNXdJ6Bk8T3eWdCk1vfUoPeiZ9ppuYtR4XncuNk-93sb3FchU-dNZGlcrq4LEcyn1lNMflCSARfqdbvdwn-4QYu7X03nfZqmQ2mzxmr7aUOu1z2idpvACKKaPJ-G9akWOzfVYPKgH0WA0XH81zE"
                 , _logger);
 
             var projectTest = await client.Project.FindOrCreateExternalProjectAsync("arg3");
@@ -145,7 +145,7 @@ internal async Task RunWithSse()
             _logger.LogInformation("Application Started at {dateTime}", DateTime.UtcNow);
 
             var client = ShieldClient.CreateInstance(
-                "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJhdWQiOiI5MWVkZjU4OC1iMmJhLTQ3NDAtOTJkYy1mY2RkMjFmMTI5M2YiLCJqdGkiOiI1ZDJlYTQ4OTk4ZmNmYzM0ZTQ0ODJhMTgwNmNlZTRmNDQ4YjlmN2YzMjUyYTUyY2ZmYmFkZTJkMzc2Yjg4NzM0YThmYWQ4OTVhN2ViYWY0NCIsImlhdCI6MTYyNTI2MDc4NywibmJmIjoxNjI1MjYwNzg3LCJleHAiOjE2NTY3OTY3ODYsInN1YiI6IjkxZWRmMDAzLWVlNjktNDU1Yy1hZWU4LWZlMzQ1ODZhOTdkNiIsInNjb3BlcyI6W119.GKbGITxU_UGSDYC3TA1BMycwgUl08DE2Fcprn-9TxitLIdvlRVsYGFcgE_uM8mLGeYLgwYsuRDahwfSE71u5DueiVpNWDNF49htUOLOTtZ7UjbotDi2UhKUq3NCa4_XwpbFbo9URn7Ld9E9UbU_BCcJBdMpQ4t45xQI3Lwv5dbUW4kQ9RAz2GA_9LPQu-oG4aLNnO--rZdZmlFDmUe5uTJpifeD2KLLGb6_BIbL5FXwScwof2WCTJ2l2h_jas7BjnBM7T9dK5S7LItvJ_1fYVsckZ9-q4ntP2crb45FkWunBg4p1ivq3lfLdyPmDPJqGYuk4B3Oz53vb2UTyiVNimbm2kD2WxeRNqepJQ-WI3A4kLOcrEaQl0xu5Y3c1xn25suc7TigyPP6Lxyac0qfrTFNv1NRnUogo7CJKGjEK09fypX0xn0R-demEVjqkFvUT2ncW5zEDtGhoP76yvf7UyNsioz7NCloaaKHcNT8AloCCLAZTgKWkDAiePmknydQ60ezeyM6E_cTIu8MOvZ95eAi_wUJN_Vk9T_VzakXXZKHjiXipcWyFY-ceE3SJx4yWewp3kOjFkvkGdYaSQ7Nwz0M_rW02wzxEVh90wX83yv228zp6mc24SLVuLJpqg-Wc89CCp7CvK71Fhzu2F3mxunvzW0Z8jyj9Tj4BBCz880A"
+                "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJhdWQiOiI5NDNmMGMwMS0yOTBiLTQ4NjYtYTAyZi1lN2Q4NTU2OWE5OTQiLCJqdGkiOiIxMGU5MzU5NDBhOGFjOGI4MDQyMzVkYzI0ZmY2NmJkMmEwODZmMmNhNmI0NWFhNDkwMzQ5YTNiZDcyMzQzZmRiM2RiZmU3Zjk0ODFkMGJlMCIsImlhdCI6MTYzMzQzMzE0My43Mjk3NTUsIm5iZiI6MTYzMzQzMzE0My43Mjk3NTksImV4cCI6MTY2NDk2OTE0My42ODg1MSwic3ViIjoiOTQ1OTc5NTgtY2JjYi00OThhLTllNTAtYzQ0NmUzYTIyZDkyIiwic2NvcGVzIjpbXX0.a7MTfyKDV6TrLg9r-fpn0qTazcWGzBM1uzZiOjB2YT-ex_fEIZlWs0gO7TbTVQbs3E9LuLO-HNQz5Q0VQeN9gW1tfW-aB5mIN0T2FNMeECcqT2UQeVD5W1AGU3K4oadOMUMif9Hqujgyi3mXU4zt_EubHZ-A8eLhUDcbP5UdLJE7FeYnyCHLXM4RbWgzugqRMmwzt6qctQ_uPXLfdiSL6Br0Cb5mA45tBwU2hcWfN3wLeCIeIncN1HxOpBBphMjOLP27N39OMf0uFJ4eqvnWC7AM_aEsWGCuse9svxRYSeznFVoU9KaPu_X9geRbBBat35QnDjnzJyHOa30EiK-qnuRlrAX-Qhrm1LTGx0hQY461Yx7hv2tnlT-s2_s41w02DSAlxQsNKrxAH5U1OKUujgLEJNsEONRnD7oYBuu2NisRFg8RWfJi3S6kZS8UjrXR646J7AkBB8R2EUeJULEv1SUoDLTveCl1NyDJQjvhFroQrhKsuT4QTH2Gd8kWcjEfRrm63qjzFMLGDo7JcMCh_O4lXNXdJ6Bk8T3eWdCk1vfUoPeiZ9ppuYtR4XncuNk-93sb3FchU-dNZGlcrq4LEcyn1lNMflCSARfqdbvdwn-4QYu7X03nfZqmQ2mzxmr7aUOu1z2idpvACKKaPJ-G9akWOzfVYPKgH0WA0XH81zE"
                 , _logger);
 
 
diff --git a/Examples/NetCore.Console.Example/Program.cs b/Examples/NetCore.Console.Example/Program.cs
@@ -22,7 +22,7 @@ private static async Task Main(string[] args)
             await using var serviceProvider = services.BuildServiceProvider();
             var app = serviceProvider.GetService<Consumer>();
             // ReSharper disable once PossibleNullReferenceException
-            await app?.RunWithSse();
+            await app.Run();
         }
         private static void ConfigureServices(IServiceCollection services)
         {

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public void ProtectSingleFile(string projectKey, string fileBlob, ApplicationCon`
`91`	`91`	`{`
`92`	`92`	`BeforeConnect?.Invoke();`
`93`	`93`
`94`		`- var taskUrl = $"{_baseUrl}protection/protect/single/sse?projectKey={projectKey}&fileBlob={fileBlob}&onlLog={_defaultLoggerId}";`
	`94`	`+ var taskUrl = $"{_baseUrl}api/protection/protect/single/sse?projectKey={projectKey}&fileBlob={fileBlob}&onlLog={_defaultLoggerId}";`
`95`	`95`
`96`	`96`	`if (configuration is not null)`
`97`	`97`	`{`
`@@ -157,7 +157,7 @@ public async Task ProtectSingleFileAsync(string projectKey, string fileBlob, App`
`157`	`157`
`158`	`158`	`BeforeConnect?.Invoke();`
`159`	`159`
`160`		`- var taskUrl = $"{_baseUrl}protection/protect/single/sse?projectKey={projectKey}&fileBlob={fileBlob}&onlLog={_defaultLoggerId}";`
	`160`	`+ var taskUrl = $"{_baseUrl}api/protection/protect/single/sse?projectKey={projectKey}&fileBlob={fileBlob}&onlLog={_defaultLoggerId}";`
`161`	`161`
`162`	`162`	`if (configuration is not null)`
`163`	`163`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ private static async Task Main(string[] args)`
`22`	`22`	`await using var serviceProvider = services.BuildServiceProvider();`
`23`	`23`	`var app = serviceProvider.GetService<Consumer>();`
`24`	`24`	`// ReSharper disable once PossibleNullReferenceException`
`25`		`- await app?.RunWithSse();`
	`25`	`+ await app.Run();`
`26`	`26`	`}`
`27`	`27`	`private static void ConfigureServices(IServiceCollection services)`
`28`	`28`	`{`