From 902685c7cf46133d98bc72b51cc56dfdaa49c831 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 22 Feb 2023 10:25:52 +0100 Subject: [PATCH] commit --- VERAG_REST_SERVER/App_Start/SwaggerConfig.vb | 13 +++++++++---- .../V1/AvisoController/AVISOController.vb | 4 ++-- .../CustomsDeclarationController.vb | 2 +- .../Controllers/V1/NCTS/NCTSController.vb | 4 ++-- .../V1/NEWTESTController/NEWTESTController.vb | 2 +- .../CustomDeclarationController.vb | 2 +- .../V2/NEWTESTController/NEWTESTController.vb | 2 +- 7 files changed, 17 insertions(+), 12 deletions(-) diff --git a/VERAG_REST_SERVER/App_Start/SwaggerConfig.vb b/VERAG_REST_SERVER/App_Start/SwaggerConfig.vb index 2a86f71..58ddc36 100644 --- a/VERAG_REST_SERVER/App_Start/SwaggerConfig.vb +++ b/VERAG_REST_SERVER/App_Start/SwaggerConfig.vb @@ -23,9 +23,11 @@ Public Class SwaggerConfig c.PrettyPrint() c.MultipleApiVersions(Function(apiDesc, targetApiVersion) ResolveVersionSupportByRouteConstraint(apiDesc, targetApiVersion), Function(vc) - vc.Version("1", descr & " V1") - vc.Version("2", descr & " V2") + vc.Version("v1", descr & " V1") + vc.Version("v2", descr & " V2") + vc.Version("v3", descr & " V3") End Function) + c.ApiKey("apiKey").Description("API Key Authentication").Name("apiKey").In("header") 'c.OAuth2("oauth2").Description("OAuth2 Implicit Grant").Flow("implicit").AuthorizationUrl("http://petstore.swagger.wordnik.com/api/oauth/dialog").Scopes(Function(scopes) ' scopes.Add("read", "Read access to protected resources") @@ -36,16 +38,19 @@ Public Class SwaggerConfig c.DocumentTitle(descr) c.EnableDiscoveryUrlSelector() c.DocExpansion(DocExpansion.List) + c.EnableApiKeySupport("apiKey", "header") 'c.EnableOAuth2Support(clientId:="test-client-id", clientSecret:=Nothing, realm:="test-realm", appName:="Swagger UI", additionalQueryStringParams:=New Dictionary(Of String, String)() From { ' {"foo", "bar"} '}) + + End Function) End Sub Public Shared Function ResolveVersionSupportByRouteConstraint(ByVal apiDesc As ApiDescription, ByVal targetApiVersion As String) As Boolean - 'Return apiDesc.ID.Contains($"/{targetApiVersion}/") - Return apiDesc.ActionDescriptor.ControllerDescriptor.ControllerType.FullName.Contains($"{targetApiVersion}") + Return apiDesc.ID.Contains($"/{targetApiVersion}/") + 'Return apiDesc.ActionDescriptor.ControllerDescriptor.ControllerType.FullName.Contains($"{targetApiVersion}") End Function diff --git a/VERAG_REST_SERVER/Controllers/V1/AvisoController/AVISOController.vb b/VERAG_REST_SERVER/Controllers/V1/AvisoController/AVISOController.vb index b6f8c0d..1e7c6e1 100644 --- a/VERAG_REST_SERVER/Controllers/V1/AvisoController/AVISOController.vb +++ b/VERAG_REST_SERVER/Controllers/V1/AvisoController/AVISOController.vb @@ -7,7 +7,7 @@ Namespace ApiController.Controllers - Public Class AVISOV1Controller + Public Class AVISOController Inherits System.Web.Http.ApiController Public Function GetValue() As String @@ -195,7 +195,7 @@ Namespace ApiController.Controllers - Public Class AVISOV1TESTController + Public Class AVISO1TESTController Inherits System.Web.Http.ApiController Public Function GetValue() As String diff --git a/VERAG_REST_SERVER/Controllers/V1/CustomsDeclaration/CustomsDeclarationController.vb b/VERAG_REST_SERVER/Controllers/V1/CustomsDeclaration/CustomsDeclarationController.vb index 131c2bb..706b88e 100644 --- a/VERAG_REST_SERVER/Controllers/V1/CustomsDeclaration/CustomsDeclarationController.vb +++ b/VERAG_REST_SERVER/Controllers/V1/CustomsDeclaration/CustomsDeclarationController.vb @@ -8,7 +8,7 @@ Namespace api_CustomsDeclaration.Controllers - Public Class CustomsDeclarationV1Controller + Public Class CustomsDeclaration1Controller Inherits System.Web.Http.ApiController Public Function GetValues() As VERAG_PROG_ALLGEMEIN.cVERAG_in_eza diff --git a/VERAG_REST_SERVER/Controllers/V1/NCTS/NCTSController.vb b/VERAG_REST_SERVER/Controllers/V1/NCTS/NCTSController.vb index 0dfb4b0..c37fa0c 100644 --- a/VERAG_REST_SERVER/Controllers/V1/NCTS/NCTSController.vb +++ b/VERAG_REST_SERVER/Controllers/V1/NCTS/NCTSController.vb @@ -9,7 +9,7 @@ Namespace ApiController.Controllers - Public Class TR_NCTSV001Controller + Public Class TR_NCTS1Controller Inherits System.Web.Http.ApiController 'Public Function GetValues() As VERAG_PROG_ALLGEMEIN.cVERAG_out_ncts @@ -171,7 +171,7 @@ Namespace ApiController.Controllers For Each PAC In ITEM.PACGS2 Dim PACK As New VERAG_PROG_ALLGEMEIN.cNCTS_TR_WarenpositionPackstuecke PACK.nctsWpPk_PackstueckeAnzahl = PAC.NumOfPacGS24 - PACK.nctsWpPk_Verpackungsart = PAC.KinOfPacGS23 + PACK.nctsWpPk_Verpackungsart = PAC.KinOfPacGS23 POS.nctsWP_PACKSTUECKE.Add(PACK) If PACK.nctsWpPk_PackstueckeAnzahl Is Nothing Then Return NCTS_Exceptions.ERR_05_Missing_Colli Next diff --git a/VERAG_REST_SERVER/Controllers/V1/NEWTESTController/NEWTESTController.vb b/VERAG_REST_SERVER/Controllers/V1/NEWTESTController/NEWTESTController.vb index d956bcf..ad57986 100644 --- a/VERAG_REST_SERVER/Controllers/V1/NEWTESTController/NEWTESTController.vb +++ b/VERAG_REST_SERVER/Controllers/V1/NEWTESTController/NEWTESTController.vb @@ -10,7 +10,7 @@ Namespace NEWTESTController.Controllers - Public Class NEWTESTV1Controller + Public Class NEWTEST1Controller Inherits System.Web.Http.ApiController Public Function GetValues() As String diff --git a/VERAG_REST_SERVER/Controllers/V2/CustomsDeclarationController/CustomDeclarationController.vb b/VERAG_REST_SERVER/Controllers/V2/CustomsDeclarationController/CustomDeclarationController.vb index 3a006b1..f5968de 100644 --- a/VERAG_REST_SERVER/Controllers/V2/CustomsDeclarationController/CustomDeclarationController.vb +++ b/VERAG_REST_SERVER/Controllers/V2/CustomsDeclarationController/CustomDeclarationController.vb @@ -6,7 +6,7 @@ Namespace api_CustomsDeclaration.Controllers - Public Class CustomsDeclarationV2Controller + Public Class CustomsDeclaration2Controller Inherits System.Web.Http.ApiController Public Function GetValues() As VERAG_PROG_ALLGEMEIN.cVERAG_in_eza diff --git a/VERAG_REST_SERVER/Controllers/V2/NEWTESTController/NEWTESTController.vb b/VERAG_REST_SERVER/Controllers/V2/NEWTESTController/NEWTESTController.vb index f9a0a7b..39acb3a 100644 --- a/VERAG_REST_SERVER/Controllers/V2/NEWTESTController/NEWTESTController.vb +++ b/VERAG_REST_SERVER/Controllers/V2/NEWTESTController/NEWTESTController.vb @@ -9,7 +9,7 @@ Namespace NEWTESTController.Controllers - Public Class NEWTESTV2Controller + Public Class NEWTEST2Controller Inherits System.Web.Http.ApiController Public Function GetValues() As String