From 579ea797382459045ed71ffe8903f79161294ca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Thu, 23 Feb 2023 16:09:52 +0100 Subject: [PATCH] feature/Tweak json response field names --- .../code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala | 4 ++-- obp-api/src/main/scala/code/api/util/X509.scala | 4 ++-- obp-api/src/main/scala/code/api/v5_1_0/JSONFactory5.1.0.scala | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala index 0648ae15d..149402a25 100644 --- a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala +++ b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/SwaggerDefinitionsJSON.scala @@ -4157,8 +4157,8 @@ object SwaggerDefinitionsJSON { val oAuth2ServerJwksUrisJson = OAuth2ServerJwksUrisJson(List(oAuth2ServerJWKURIJson)) val certificateInfoJsonV510 = CertificateInfoJsonV510( - subject_dn = "OID.2.5.4.41=VPN, EMAILADDRESS=admin@tesobe.com, CN=TESOBE CA, OU=TESOBE Operations, O=TESOBE, L=Berlin, ST=Berlin, C=DE", - issuer_dn = "CN=localhost, O=TESOBE GmbH, ST=Berlin, C=DE", + subject_domain_name = "OID.2.5.4.41=VPN, EMAILADDRESS=admin@tesobe.com, CN=TESOBE CA, OU=TESOBE Operations, O=TESOBE, L=Berlin, ST=Berlin, C=DE", + issuer_domain_name = "CN=localhost, O=TESOBE GmbH, ST=Berlin, C=DE", not_before = "2022-04-01T10:13:00.000Z", not_after = "2032-04-01T10:13:00.000Z", roles = None, diff --git a/obp-api/src/main/scala/code/api/util/X509.scala b/obp-api/src/main/scala/code/api/util/X509.scala index 42aa7d529..1d2d6d71c 100644 --- a/obp-api/src/main/scala/code/api/util/X509.scala +++ b/obp-api/src/main/scala/code/api/util/X509.scala @@ -229,8 +229,8 @@ object X509 extends MdcLoggable { rolesInfo = Some("PEM Encoded Certificate does not contain PSD2 roles.") } val result = CertificateInfoJsonV510( - subject_dn = subjectDN, - issuer_dn = issuerDN, + subject_domain_name = subjectDN, + issuer_domain_name = issuerDN, not_before = APIUtil.formatDate(notBefore), not_after = APIUtil.formatDate(notAfter), roles = roles, diff --git a/obp-api/src/main/scala/code/api/v5_1_0/JSONFactory5.1.0.scala b/obp-api/src/main/scala/code/api/v5_1_0/JSONFactory5.1.0.scala index efb59036f..430a987b7 100644 --- a/obp-api/src/main/scala/code/api/v5_1_0/JSONFactory5.1.0.scala +++ b/obp-api/src/main/scala/code/api/v5_1_0/JSONFactory5.1.0.scala @@ -48,8 +48,8 @@ case class APIInfoJsonV510( ) case class CertificateInfoJsonV510( - subject_dn: String, - issuer_dn: String, + subject_domain_name: String, + issuer_domain_name: String, not_before: String, not_after: String, roles: Option[List[String]],