small refactor

Author: k0dep

BaseCommand.cs

@@ -1,5 +1,5 @@
 using CliFx.Attributes;
-using IO.Swagger.Client;
+using System.Net.Http.Headers;
 
 public abstract class BaseCommand
 {
@@ -9,12 +9,12 @@ public abstract class BaseCommand
     [CommandOption("api-url", Description = "set the url to api", EnvironmentVariable = "API_URL")]
     public string ApiUrl { get; set; } = "https://staging.v2.d-f.pw";
 
-    protected T GetApi<T>()
+    public HttpRequestMessage CreateRequest(HttpMethod method, string query)
     {
-        Configuration.DefaultApiClient.RestClient.BaseUrl = ApiUrl;
-        Configuration.ApiKey["Authorization"] = Token;
-        Configuration.ApiKeyPrefix["Authorization"] = "Bearer";
-
-        return (T)typeof(T).GetConstructor(new [] { typeof(ApiClient) }).Invoke(new object[] { null });
+        var request = new HttpRequestMessage();
+        request.Method = method;
+        request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", Token);
+        request.RequestUri = new Uri(new Uri(ApiUrl), query);
+        return request;
     }
 }

ExecCommand.cs

@@ -1,8 +1,6 @@
 using CliFx;
 using CliFx.Attributes;
 using CliFx.Infrastructure;
-using System.Net;
-using System.Net.Http.Headers;
 
 [Command("exec", Description = "exec command in the app container")]
 public class ExecCommand : ApplicationBaseCommand, ICommand
@@ -12,13 +10,11 @@ public class ExecCommand : ApplicationBaseCommand, ICommand
 
     public async ValueTask ExecuteAsync(IConsole console)
     {
-        var request = new HttpRequestMessage();
-        request.Method = HttpMethod.Put;
-        request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", Token);
-        request.RequestUri = new Uri(new Uri(ApiUrl), $"api/application/{AppId}/exec");
+        var request = CreateRequest(HttpMethod.Put, $"api/application/{AppId}/exec");
         var content = new MultipartFormDataContent();
+        request.Content = content;
 
-        foreach(var command in ParseCmd(Command))
+        foreach (var command in ParseCmd(Command))
         {
             content.Add(new StringContent(command), "command");
         }
@@ -28,8 +24,6 @@ public async ValueTask ExecuteAsync(IConsole console)
             content.Add(new StreamContent(console.Input.BaseStream), "file", "stdin");
         }
 
-        request.Content = content;
-
         var response = await new HttpClient().SendAsync(request);
 
         response.EnsureSuccessStatusCode();

Program.cs

@@ -6,6 +6,7 @@
 await new CliApplicationBuilder()
     .AddCommandsFromThisAssembly()
     .SetExecutableName("df")
+    .SetTitle("Deploy-f cli")
     .Build()
     .RunAsync();
 

UploadFileCommand.cs

@@ -16,15 +16,12 @@ public async ValueTask ExecuteAsync(IConsole console)
     {
         using Stream file = console.IsInputRedirected ? console.Input.BaseStream : File.OpenRead(SourceFile);
 
-        var request = new HttpRequestMessage();
-        request.Method = HttpMethod.Put;
-        request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", Token);
-        request.RequestUri = new Uri(new Uri(ApiUrl), $"api/application/{AppId}/exec");
+        var request = CreateRequest(HttpMethod.Put, $"api/application/{AppId}/exec");
         var content = new MultipartFormDataContent();
+        request.Content = content;
         content.Add(new StringContent("tee"), "command");
         content.Add(new StringContent(ContainerPath), "command");
         content.Add(new StreamContent(file), "file", "stdin");
-        request.Content = content;
 
         var response = await new HttpClient().SendAsync(request);