Skip to content
Snippets Groups Projects
Commit bfe6ec3a authored by Petar Hristov's avatar Petar Hristov :speech_balloon:
Browse files

Fix: Using OpenAPI 6.3.0

parent fcf3989d
No related branches found
No related tags found
1 merge request!8Fix: Using OpenAPI 6.3.0
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Coscine.Configuration" Version="1.6.0" /> <PackageReference Include="Coscine.Configuration" Version="2.1.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
...@@ -6,8 +6,8 @@ using System.Net; ...@@ -6,8 +6,8 @@ using System.Net;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Coscine.CodeGen.CodeGenerator namespace Coscine.CodeGen.CodeGenerator;
{
public abstract class CodeGenerator public abstract class CodeGenerator
{ {
#region Functionality #region Functionality
...@@ -178,4 +178,3 @@ const apis = implementations(instance); ...@@ -178,4 +178,3 @@ const apis = implementations(instance);
internal abstract Task<string> GetCustomCodeForCombinationFile(string combinationFileText); internal abstract Task<string> GetCustomCodeForCombinationFile(string combinationFileText);
#endregion #endregion
} }
}
using Coscine.Configuration; using Coscine.Configuration;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Linq; using System.Linq;
using System.Net; using System.Net.Http;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Coscine.CodeGen.CodeGenerator namespace Coscine.CodeGen.CodeGenerator;
{
public class CoscineCodeGenerator : CodeGenerator public class CoscineCodeGenerator : CodeGenerator
{ {
private readonly IConfiguration _configuration; private readonly IConfiguration _configuration;
...@@ -18,15 +19,19 @@ namespace Coscine.CodeGen.CodeGenerator ...@@ -18,15 +19,19 @@ namespace Coscine.CodeGen.CodeGenerator
public async override Task<string> GetClientGenerator() public async override Task<string> GetClientGenerator()
{ {
var jarDownloadLink = await _configuration.GetStringAsync("coscine/local/codegen/jarlink", var jarDownloadLink = await _configuration.GetStringAsync("coscine/local/codegen/jarlink", "https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/6.3.0/openapi-generator-cli-6.3.0.jar");
"https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/5.2.1/openapi-generator-cli-5.2.1.jar"
); using var httpClient = new HttpClient();
var jarFileName = await _configuration.GetStringAsync("coscine/local/codegen/jarpath", "./codegen.jar");
var webClient = new WebClient(); var response = await httpClient.GetAsync(new Uri(jarDownloadLink));
var jarFileName = await _configuration.GetStringAsync("coscine/local/codegen/jarpath", "codegen.jar"); using (var stream = await response.Content.ReadAsStreamAsync())
using (var fileStream = new FileStream(jarFileName, FileMode.Create))
{
await stream.CopyToAsync(fileStream);
}
await webClient.DownloadFileTaskAsync(new Uri(jarDownloadLink), jarFileName);
return jarFileName; return jarFileName;
} }
...@@ -62,6 +67,7 @@ namespace Coscine.CodeGen.CodeGenerator ...@@ -62,6 +67,7 @@ namespace Coscine.CodeGen.CodeGenerator
{ {
combinationFileText += "let accessToken = '';"; combinationFileText += "let accessToken = '';";
// Keep it like that for formatting
combinationFileText += @" combinationFileText += @"
if (typeof coscine !== 'undefined' && typeof coscine.authorization !== 'undefined') { if (typeof coscine !== 'undefined' && typeof coscine.authorization !== 'undefined') {
accessToken = 'Bearer ' + coscine.authorization.bearer; accessToken = 'Bearer ' + coscine.authorization.bearer;
...@@ -89,4 +95,3 @@ const getHostName = () => { ...@@ -89,4 +95,3 @@ const getHostName = () => {
return Task.FromResult(combinationFileText); return Task.FromResult(combinationFileText);
} }
} }
}
using Coscine.Configuration; using Coscine.CodeGen.CodeGenerator;
using Coscine.CodeGen.CodeGenerator; using Coscine.Configuration;
namespace Coscine.CodeGen;
namespace Coscine.CodeGen
{
public class Program public class Program
{ {
public static void Main(string[] args) public static void Main(string[] args)
...@@ -11,4 +11,3 @@ namespace Coscine.CodeGen ...@@ -11,4 +11,3 @@ namespace Coscine.CodeGen
} }
} }
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment