From 0d2a3472d0b02f33bcc9788ff2b8ab3997af5d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Thu, 19 May 2022 15:16:14 +0200 Subject: [PATCH 01/80] feature/Add OBP POST and GET Consent Request endpoints WIP --- .../main/scala/bootstrap/liftweb/Boot.scala | 3 +- .../scala/code/api/v4_0_0/APIMethods400.scala | 35 ++++++++++++++- .../code/api/v4_0_0/JSONFactory4.0.0.scala | 2 + .../code/consent/ConsentRequesProvider.scala | 31 +++++++++++++ .../scala/code/consent/ConsentRequest.scala | 45 +++++++++++++++++++ 5 files changed, 114 insertions(+), 2 deletions(-) create mode 100644 obp-api/src/main/scala/code/consent/ConsentRequesProvider.scala create mode 100644 obp-api/src/main/scala/code/consent/ConsentRequest.scala diff --git a/obp-api/src/main/scala/bootstrap/liftweb/Boot.scala b/obp-api/src/main/scala/bootstrap/liftweb/Boot.scala index ceadaa9b0..c2193d935 100644 --- a/obp-api/src/main/scala/bootstrap/liftweb/Boot.scala +++ b/obp-api/src/main/scala/bootstrap/liftweb/Boot.scala @@ -55,7 +55,7 @@ import code.bankconnectors.{Connector, ConnectorEndpoints} import code.branches.MappedBranch import code.cardattribute.MappedCardAttribute import code.cards.{MappedPhysicalCard, PinReset} -import code.consent.MappedConsent +import code.consent.{ConsentRequest, MappedConsent} import code.consumer.Consumers import code.context.{MappedConsentAuthContext, MappedUserAuthContext, MappedUserAuthContextUpdate} import code.crm.MappedCrmEvent @@ -1003,6 +1003,7 @@ object ToSchemify { MappedCustomerIdMapping, MappedProductAttribute, MappedConsent, + ConsentRequest, MigrationScriptLog, MethodRouting, EndpointMapping, diff --git a/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala b/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala index 295809814..2cf4d446a 100644 --- a/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala +++ b/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala @@ -3,6 +3,7 @@ package code.api.v4_0_0 import java.net.URLEncoder import java.text.SimpleDateFormat import java.util.{Calendar, Date} + import code.DynamicData.{DynamicData, DynamicDataProvider} import code.DynamicEndpoint.DynamicEndpointSwagger import code.accountattribute.AccountAttributeX @@ -42,7 +43,7 @@ import code.apicollectionendpoint.MappedApiCollectionEndpointsProvider import code.authtypevalidation.JsonAuthTypeValidation import code.bankconnectors.{Connector, DynamicConnector, InternalConnector} import code.connectormethod.{JsonConnectorMethod, JsonConnectorMethodMethodBody} -import code.consent.{ConsentStatus, Consents} +import code.consent.{ConsentRequests, ConsentStatus, Consents} import code.dynamicEntity.{DynamicEntityCommons, ReferenceType} import code.dynamicMessageDoc.JsonDynamicMessageDoc import code.dynamicResourceDoc.JsonDynamicResourceDoc @@ -8375,6 +8376,38 @@ trait APIMethods400 { } } + staticResourceDocs += ResourceDoc( + createConsentRequest, + implementedInApiVersion, + nameOf(createConsentRequest), + "POST", + "/my/consents/request", + "Create consent request", + s"""""", + emptyObjectJson, + PostConsentRequestResponseJson("9d429899-24f5-42c8-8565-943ffa6a7945"), + List(UnknownError), + apiTagConsent :: apiTagPSD2AIS :: apiTagPsd2 :: apiTagNewStyle :: Nil + ) + + lazy val createConsentRequest : OBPEndpoint = { + case "my" :: "consents" :: "request" :: Nil JsonPost json -> _ => { + cc => + for { + (_, callContext) <- applicationAccess(cc) + _ <- passesPsd2Aisp(callContext) + createdConsentRequest <- Future(ConsentRequests.consentRequestProvider.vend.createConsentRequest( + callContext.flatMap(_.consumer), + Some("") + )) map { + i => connectorEmptyResponse(i, callContext) + } + } yield { + (PostConsentRequestResponseJson(createdConsentRequest.consentRequestId), HttpCode.`201`(callContext)) + } + } + } + staticResourceDocs += ResourceDoc( addConsentUser, implementedInApiVersion, diff --git a/obp-api/src/main/scala/code/api/v4_0_0/JSONFactory4.0.0.scala b/obp-api/src/main/scala/code/api/v4_0_0/JSONFactory4.0.0.scala index 56c49ca16..00d44c99e 100644 --- a/obp-api/src/main/scala/code/api/v4_0_0/JSONFactory4.0.0.scala +++ b/obp-api/src/main/scala/code/api/v4_0_0/JSONFactory4.0.0.scala @@ -69,6 +69,8 @@ import scala.math.BigDecimal import scala.util.Try +case class PostConsentRequestResponseJson(consentId: String) + case class CallLimitPostJsonV400( from_date : Date, to_date : Date, diff --git a/obp-api/src/main/scala/code/consent/ConsentRequesProvider.scala b/obp-api/src/main/scala/code/consent/ConsentRequesProvider.scala new file mode 100644 index 000000000..e93bf03ea --- /dev/null +++ b/obp-api/src/main/scala/code/consent/ConsentRequesProvider.scala @@ -0,0 +1,31 @@ +package code.consent + +import code.model.Consumer +import com.openbankproject.commons.model.User +import net.liftweb.common.Box +import net.liftweb.util.SimpleInjector + +object ConsentRequests extends SimpleInjector { + val consentRequestProvider = new Inject(buildOne _) {} + def buildOne: ConsentRequestProvider = MappedConsentRequestProvider +} + +trait ConsentRequestProvider { + def getConsentByConsentId(consentRequestId: String): Box[ConsentRequest] + def createConsentRequest(consumer: Option[Consumer], payload: Option[String]): Box[ConsentRequest] +} + +trait ConsentRequestTrait { + def consentRequestId: String + def payload: String + def consumerId: String +} + + + + + + + + + diff --git a/obp-api/src/main/scala/code/consent/ConsentRequest.scala b/obp-api/src/main/scala/code/consent/ConsentRequest.scala new file mode 100644 index 000000000..5d493b1f5 --- /dev/null +++ b/obp-api/src/main/scala/code/consent/ConsentRequest.scala @@ -0,0 +1,45 @@ +package code.consent + +import code.model.Consumer +import code.util.MappedUUID +import net.liftweb.common.Box +import net.liftweb.mapper._ +import net.liftweb.util.Helpers.tryo + +object MappedConsentRequestProvider extends ConsentRequestProvider { + override def getConsentByConsentId(consentRequestId: String): Box[ConsentRequest] = { + ConsentRequest.find( + By(ConsentRequest.ConsentRequestId, consentRequestId) + ) + } + override def createConsentRequest(consumer: Option[Consumer], payload: Option[String]): Box[ConsentRequest] ={ + tryo { + ConsentRequest + .create + .ConsumerId(consumer.map(_.consumerId.get).getOrElse(null)) + .Payload(payload.getOrElse("")) + .saveMe() + }} +} + +class ConsentRequest extends ConsentRequestTrait with LongKeyedMapper[ConsentRequest] with IdPK with CreatedUpdated { + + def getSingleton = ConsentRequest + + //the following are the obp consent. + object ConsentRequestId extends MappedUUID(this) + object Payload extends MappedText(this) + object ConsumerId extends MappedUUID(this) { + override def defaultValue = null + } + + + override def consentRequestId: String = ConsentRequestId.get + override def payload: String = Payload.get + override def consumerId: String = ConsumerId.get + +} + +object ConsentRequest extends ConsentRequest with LongKeyedMetaMapper[ConsentRequest] { + override def dbIndexes: List[BaseIndex[ConsentRequest]] = UniqueIndex(ConsentRequestId) :: super.dbIndexes +} From 744ab66f40d1cacb0a2b8b3799dc51908692fe3c Mon Sep 17 00:00:00 2001 From: CristhTejada Date: Mon, 30 May 2022 20:20:30 -0600 Subject: [PATCH 02/80] additional Spanish translations in the footer menu --- .../resources/i18n/lift-core_es_ES.properties | 9 +++++++++ obp-api/src/main/webapp/index.html | 15 +++++++++----- .../main/webapp/templates-hidden/default.html | 20 +++++++++++-------- 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/obp-api/src/main/resources/i18n/lift-core_es_ES.properties b/obp-api/src/main/resources/i18n/lift-core_es_ES.properties index d85c91ebd..26ceb1f1d 100644 --- a/obp-api/src/main/resources/i18n/lift-core_es_ES.properties +++ b/obp-api/src/main/resources/i18n/lift-core_es_ES.properties @@ -1,8 +1,17 @@ api.explorer = Explorador API +api_manager = Gestor API introduction = Introducción support = Soporte register = Registrarse logon = Ingresar +terms_conditions = Terminos y condiciones +privacy_policy = Política de privacidad +api_documentation = Documentación API +api_host = Host del API +api_tester = Evaluador API +view_api_explorer = Ver Explorador API +get_api_key = Obten llave API + invalid.email.address = Invalid email address password.must.be.set = Password must be set diff --git a/obp-api/src/main/webapp/index.html b/obp-api/src/main/webapp/index.html index 4a5944c90..876d1cc5d 100644 --- a/obp-api/src/main/webapp/index.html +++ b/obp-api/src/main/webapp/index.html @@ -33,8 +33,10 @@ Berlin 13359, Germany

Welcome to the Open Bank Project API Sandbox test instance!

- View API Explorer - Introduction + + View API Explorer + + Introduction @@ -313,18 +315,21 @@ Berlin 13359, Germany

Get started building your application

- Get API key + + Get API key

For banks

API Manager + data-lift="WebUI.apiManagerLink" href=""> + API Manager OBP CLI API Tester + data-lift="WebUI.apiTesterLink" href=""> + API Tester Hola
diff --git a/obp-api/src/main/webapp/templates-hidden/default.html b/obp-api/src/main/webapp/templates-hidden/default.html index a21984c11..f285c376d 100644 --- a/obp-api/src/main/webapp/templates-hidden/default.html +++ b/obp-api/src/main/webapp/templates-hidden/default.html @@ -181,7 +181,8 @@ Berlin 13359, Germany
  • @@ -202,11 +203,12 @@ Berlin 13359, Germany
    • + +
  • +
    + Language + ES + | EN +
    +
    • +

  • usernameLog off

    From c1d309c39d1ce4601ebcd68aa41712fc30e6b36a Mon Sep 17 00:00:00 2001 From: hongwei Date: Thu, 30 Jun 2022 14:13:40 +0200 Subject: [PATCH 18/80] docfix/tweaked the default date value for the example value --- obp-api/src/main/scala/code/api/util/APIUtil.scala | 8 ++++---- obp-api/src/main/scala/code/api/util/Glossary.scala | 2 +- .../api/v4_0_0/AuthenticationTypeValidationTest.scala | 2 +- .../scala/code/api/v4_0_0/ForceErrorValidationTest.scala | 2 +- .../scala/code/api/v4_0_0/JsonSchemaValidationTest.scala | 6 +++--- .../com/openbankproject/commons/util/JsonUtilsTest.scala | 8 ++++---- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/obp-api/src/main/scala/code/api/util/APIUtil.scala b/obp-api/src/main/scala/code/api/util/APIUtil.scala index 791bb7ed9..797fcc1c0 100644 --- a/obp-api/src/main/scala/code/api/util/APIUtil.scala +++ b/obp-api/src/main/scala/code/api/util/APIUtil.scala @@ -130,10 +130,10 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ val DateWithMsFormat = new SimpleDateFormat(DateWithMs) val DateWithMsRollbackFormat = new SimpleDateFormat(DateWithMsRollback) - val DateWithDayExampleString: String = "2017-09-19" - val DateWithSecondsExampleString: String = "2017-09-19T02:31:05Z" - val DateWithMsExampleString: String = "2017-09-19T02:31:05.000Z" - val DateWithMsRollbackExampleString: String = "2017-09-19T02:31:05.000+0000" + val DateWithDayExampleString: String = "1100-01-01" + val DateWithSecondsExampleString: String = "1100-01-01T01:01:01Z" + val DateWithMsExampleString: String = "1100-01-01T01:01:01.000Z" + val DateWithMsRollbackExampleString: String = "1100-01-01T01:01:01.000+0000" // Use a fixed date far into the future (rather than current date/time so that cache keys are more static) // (Else caching is invalidated by constantly changing date) diff --git a/obp-api/src/main/scala/code/api/util/Glossary.scala b/obp-api/src/main/scala/code/api/util/Glossary.scala index 78df8507a..8a2fb3d01 100644 --- a/obp-api/src/main/scala/code/api/util/Glossary.scala +++ b/obp-api/src/main/scala/code/api/util/Glossary.scala @@ -993,7 +993,7 @@ object Glossary extends MdcLoggable { | |Body: | - | { "legal_name":"Eveline Tripman", "mobile_phone_number":"+44 07972 444 876", "email":"eveline@example.com", "face_image":{ "url":"www.openbankproject", "date":"2017-09-19T00:00:00Z" }, "date_of_birth":"2017-09-19T00:00:00Z", "relationship_status":"single", "dependants":10, "dob_of_dependants":["2017-09-19T00:00:00Z"], "credit_rating":{ "rating":"OBP", "source":"OBP" }, "credit_limit":{ "currency":"EUR", "amount":"10" }, "highest_education_attained":"Master", "employment_status":"worker", "kyc_status":true, "last_ok_date":"2017-09-19T00:00:00Z", "title":"Dr.", "branch_id":"DERBY6", "name_suffix":"Sr"} + | { "legal_name":"Eveline Tripman", "mobile_phone_number":"+44 07972 444 876", "email":"eveline@example.com", "face_image":{ "url":"www.openbankproject", "date":"1100-01-01T00:00:00Z" }, "date_of_birth":"1100-01-01T00:00:00Z", "relationship_status":"single", "dependants":10, "dob_of_dependants":["1100-01-01T00:00:00Z"], "credit_rating":{ "rating":"OBP", "source":"OBP" }, "credit_limit":{ "currency":"EUR", "amount":"10" }, "highest_education_attained":"Master", "employment_status":"worker", "kyc_status":true, "last_ok_date":"1100-01-01T00:00:00Z", "title":"Dr.", "branch_id":"DERBY6", "name_suffix":"Sr"} | |Headers: | diff --git a/obp-api/src/test/scala/code/api/v4_0_0/AuthenticationTypeValidationTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/AuthenticationTypeValidationTest.scala index c948dd9e3..ed112cc40 100644 --- a/obp-api/src/test/scala/code/api/v4_0_0/AuthenticationTypeValidationTest.scala +++ b/obp-api/src/test/scala/code/api/v4_0_0/AuthenticationTypeValidationTest.scala @@ -464,7 +464,7 @@ class AuthenticationTypeValidationTest extends V400ServerSetup { | "to_currency_code": "USD", | "conversion_value": 1.136305, | "inverse_conversion_value": 0.8800454103431737, - | "effective_date": "2017-09-19T00:00:00Z" + | "effective_date": "1100-01-01T00:00:00Z" |} |""".stripMargin diff --git a/obp-api/src/test/scala/code/api/v4_0_0/ForceErrorValidationTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/ForceErrorValidationTest.scala index 1fac475aa..3675d0f9f 100644 --- a/obp-api/src/test/scala/code/api/v4_0_0/ForceErrorValidationTest.scala +++ b/obp-api/src/test/scala/code/api/v4_0_0/ForceErrorValidationTest.scala @@ -683,7 +683,7 @@ class ForceErrorValidationTest extends V400ServerSetup with PropsReset { | "to_currency_code": "USD", | "conversion_value": 1.136305, | "inverse_conversion_value": 0.8800454103431737, - | "effective_date": "2017-09-19T00:00:00Z" + | "effective_date": "1100-01-01T00:00:00Z" |} |""".stripMargin diff --git a/obp-api/src/test/scala/code/api/v4_0_0/JsonSchemaValidationTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/JsonSchemaValidationTest.scala index c16289fd9..24a588daa 100644 --- a/obp-api/src/test/scala/code/api/v4_0_0/JsonSchemaValidationTest.scala +++ b/obp-api/src/test/scala/code/api/v4_0_0/JsonSchemaValidationTest.scala @@ -502,7 +502,7 @@ class JsonSchemaValidationTest extends V400ServerSetup { | "to_currency_code":"USD", | "conversion_value":1.136305, | "inverse_conversion_value":0.8800454103431737, - | "effective_date":"2017-09-19T00:00:00Z" + | "effective_date":"1100-01-01T00:00:00Z" | }], | "required":["bank_id","from_currency_code","to_currency_code"], | "properties":{ @@ -530,7 +530,7 @@ class JsonSchemaValidationTest extends V400ServerSetup { | "to_currency_code": "DEF", | "conversion_value": 1.136305, | "inverse_conversion_value": 0.8800454103431737, - | "effective_date": "2017-09-19T00:00:00Z" + | "effective_date": "1100-01-01T00:00:00Z" |} |""".stripMargin @@ -542,7 +542,7 @@ class JsonSchemaValidationTest extends V400ServerSetup { | "to_currency_code": "USD", | "conversion_value": 1.136305, | "inverse_conversion_value": 0.8800454103431737, - | "effective_date": "2017-09-19T00:00:00Z" + | "effective_date": "1100-01-01T00:00:00Z" |} |""".stripMargin diff --git a/obp-commons/src/test/scala/com/openbankproject/commons/util/JsonUtilsTest.scala b/obp-commons/src/test/scala/com/openbankproject/commons/util/JsonUtilsTest.scala index aa8c1acd4..12f64bece 100644 --- a/obp-commons/src/test/scala/com/openbankproject/commons/util/JsonUtilsTest.scala +++ b/obp-commons/src/test/scala/com/openbankproject/commons/util/JsonUtilsTest.scala @@ -71,10 +71,10 @@ class JsonUtilsTest extends FlatSpec with Matchers { val DateWithMsFormat = new SimpleDateFormat(DateWithMs) val DateWithMsRollbackFormat = new SimpleDateFormat(DateWithMsRollback) - val DateWithDayExampleString: String = "2017-09-19" - val DateWithSecondsExampleString: String = "2017-09-19T02:31:05Z" - val DateWithMsExampleString: String = "2017-09-19T02:31:05.000Z" - val DateWithMsRollbackExampleString: String = "2017-09-19T02:31:05.000+0000" + val DateWithDayExampleString: String = "1100-01-01" + val DateWithSecondsExampleString: String = "1100-01-01T01:01:01Z" + val DateWithMsExampleString: String = "1100-01-01T01:01:01.000Z" + val DateWithMsRollbackExampleString: String = "1100-01-01T01:01:01.000+0000" val DateWithDayExampleObject = DateWithDayFormat.parse(DateWithDayExampleString) From 5e8bda90f9c6466b97073076f8de9222f771f068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Thu, 30 Jun 2022 15:10:17 +0200 Subject: [PATCH 19/80] enhancement/Translate OBP Error Messages WIP --- .../main/resources/i18n/errors/error-messages-_es_ES.properties | 1 + 1 file changed, 1 insertion(+) create mode 100644 obp-api/src/main/resources/i18n/errors/error-messages-_es_ES.properties diff --git a/obp-api/src/main/resources/i18n/errors/error-messages-_es_ES.properties b/obp-api/src/main/resources/i18n/errors/error-messages-_es_ES.properties new file mode 100644 index 000000000..1332efba0 --- /dev/null +++ b/obp-api/src/main/resources/i18n/errors/error-messages-_es_ES.properties @@ -0,0 +1 @@ +OBP-20001 = El usuario no ha iniciado sesión. ¡Se requiere autenticación! \ No newline at end of file From 21247ccf02a5eb1ed2cfa7c7ad03b3db920f41d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Mon, 4 Jul 2022 11:30:12 +0200 Subject: [PATCH 20/80] feature/Add Resource Doc Translation via WebUI props --- .../ResourceDocsAPIMethods.scala | 25 ++++++++++-------- .../main/scala/code/api/util/I18NUtil.scala | 21 +++++++++++++++ .../code/api/v1_4_0/JSONFactory1_4_0.scala | 26 ++++++++++++------- .../scala/code/api/v4_0_0/APIMethods400.scala | 2 +- .../api/v1_4_0/JSONFactory1_4_0Test.scala | 6 ++--- .../commons/model/enums/Enumerations.scala | 1 + 6 files changed, 57 insertions(+), 24 deletions(-) diff --git a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocsAPIMethods.scala b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocsAPIMethods.scala index 0ede25cf3..d23988202 100644 --- a/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocsAPIMethods.scala +++ b/obp-api/src/main/scala/code/api/ResourceDocs1_4_0/ResourceDocsAPIMethods.scala @@ -248,7 +248,7 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth Caching.memoizeSyncWithProvider (Some(cacheKey.toString())) (getStaticResourceDocsTTL second) { logger.debug(s"Generating OBP Resource Docs requestedApiVersion is $requestedApiVersion") - val resourceDocJson = resourceDocsToResourceDocJson(getResourceDocsList(requestedApiVersion), resourceDocTags, partialFunctionNames, isVersion4OrHigher) + val resourceDocJson = resourceDocsToResourceDocJson(getResourceDocsList(requestedApiVersion), resourceDocTags, partialFunctionNames, isVersion4OrHigher, languageParam) resourceDocJson.map(resourceDocsJsonToJsonResponse) } } @@ -309,7 +309,7 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth val allDocs = staticDocs.map( _ ++ filteredDocs) - val resourceDocJson = resourceDocsToResourceDocJson(allDocs, resourceDocTags, partialFunctionNames, isVersion4OrHigher) + val resourceDocJson = resourceDocsToResourceDocJson(allDocs, resourceDocTags, partialFunctionNames, isVersion4OrHigher, languageParam) resourceDocJson.map(resourceDocsJsonToJsonResponse) } } @@ -353,25 +353,27 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth case None => dynamicDocs } - val resourceDocJson = resourceDocsToResourceDocJson(Some(filteredDocs), resourceDocTags, partialFunctionNames, isVersion4OrHigher) + val resourceDocJson = resourceDocsToResourceDocJson(Some(filteredDocs), resourceDocTags, partialFunctionNames, isVersion4OrHigher, languageParam) resourceDocJson.map(resourceDocsJsonToJsonResponse) }}} private def resourceDocsToResourceDocJson(rd: Option[List[ResourceDoc]], - resourceDocTags: Option[List[ResourceDocTag]], - partialFunctionNames: Option[List[String]], - isVersion4OrHigher:Boolean): Option[ResourceDocsJson] = + resourceDocTags: Option[List[ResourceDocTag]], + partialFunctionNames: Option[List[String]], + isVersion4OrHigher:Boolean, + languageParam: Option[LanguageParam]): Option[ResourceDocsJson] = { for { resourceDocs <- rd } yield { // Filter val rdFiltered = ResourceDocsAPIMethodsUtil.filterResourceDocs(resourceDocs, resourceDocTags, partialFunctionNames) // Format the data as json - JSONFactory1_4_0.createResourceDocsJson(rdFiltered, isVersion4OrHigher) + JSONFactory1_4_0.createResourceDocsJson(rdFiltered, isVersion4OrHigher, languageParam) } - + } + private val getChineseVersionResourceDocs : Box[JsonResponse] = { val stream = getClass().getClassLoader().getResourceAsStream("ResourceDocs/ResourceDocs-Chinese.json") val chineseVersion = try { @@ -402,9 +404,9 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth List(apiTagDocumentation)) - val exampleResourceDocsJson = JSONFactory1_4_0.createResourceDocsJson(List(exampleResourceDoc), false) + val exampleResourceDocsJson = JSONFactory1_4_0.createResourceDocsJson(List(exampleResourceDoc), false, None) - val exampleResourceDocsJsonV400 = JSONFactory1_4_0.createResourceDocsJson(List(exampleResourceDoc), true) + val exampleResourceDocsJsonV400 = JSONFactory1_4_0.createResourceDocsJson(List(exampleResourceDoc), true, None) @@ -578,7 +580,7 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth case _ if (apiCollectionIdParam.isDefined) => val operationIds = MappedApiCollectionEndpointsProvider.getApiCollectionEndpoints(apiCollectionIdParam.getOrElse("")).map(_.operationId).map(getObpFormatOperationId) val resourceDocs = ResourceDoc.getResourceDocs(operationIds) - val resourceDocsJson = JSONFactory1_4_0.createResourceDocsJson(resourceDocs, isVersion4OrHigher) + val resourceDocsJson = JSONFactory1_4_0.createResourceDocsJson(resourceDocs, isVersion4OrHigher, languageParam) val resourceDocsJsonJValue = Full(resourceDocsJsonToJsonResponse(resourceDocsJson)) Future(resourceDocsJsonJValue.map(successJsonResponse(_))) case _ => @@ -918,6 +920,7 @@ object ResourceDocsAPIMethodsUtil extends MdcLoggable{ def stringToLanguageParam (x: String) : Option[LanguageParam] = x.toLowerCase match { case "en" => Some(EN) case "zh" => Some(ZH) + case "es" | "es_ES" => Some(ES) case _ => Empty } diff --git a/obp-api/src/main/scala/code/api/util/I18NUtil.scala b/obp-api/src/main/scala/code/api/util/I18NUtil.scala index f2d2d2a32..b6f946d52 100644 --- a/obp-api/src/main/scala/code/api/util/I18NUtil.scala +++ b/obp-api/src/main/scala/code/api/util/I18NUtil.scala @@ -2,6 +2,8 @@ package code.api.util import java.util.{Date, Locale} +import code.webuiprops.MappedWebUiPropsProvider.getWebUiPropsValue +import com.openbankproject.commons.model.enums.LanguageParam import net.liftweb.http.S import net.liftweb.util.Props @@ -31,5 +33,24 @@ object I18NUtil { case Array(lang, country) => new Locale(lang, country) case Array(lang, country, variant) => new Locale(lang, country, variant) } + + def translateResourceDocSummary(operationId: String, language: Option[LanguageParam], default: String): String = { + language match { + case Some(value) => + val webUiKey = s"webui_resource_doc_operation_id_${operationId}_summary_${value}" + getWebUiPropsValue(webUiKey, default) + case None => + default + } + } + def translateResourceDocDescription(operationId: String, language: Option[LanguageParam], default: String): String = { + language match { + case Some(value) => + val webUiKey = s"webui_resource_doc_operation_id_${operationId}_description_${value}" + getWebUiPropsValue(webUiKey, default) + case None => + default + } + } } diff --git a/obp-api/src/main/scala/code/api/v1_4_0/JSONFactory1_4_0.scala b/obp-api/src/main/scala/code/api/v1_4_0/JSONFactory1_4_0.scala index 60e4ec7c3..e82984f83 100644 --- a/obp-api/src/main/scala/code/api/v1_4_0/JSONFactory1_4_0.scala +++ b/obp-api/src/main/scala/code/api/v1_4_0/JSONFactory1_4_0.scala @@ -1,12 +1,12 @@ package code.api.v1_4_0 import code.api.berlin.group.v1_3.JvalueCaseClass - import java.util.Date + import code.api.util.APIUtil.{EmptyBody, PrimaryDataBody, ResourceDoc} import code.api.util.ApiTag.ResourceDocTag import code.api.util.Glossary.glossaryItems -import code.api.util.{APIUtil, ApiRole, ConnectorField, CustomJsonFormats, ExampleValue, PegdownOptions} +import code.api.util.{APIUtil, ApiRole, ConnectorField, CustomJsonFormats, ExampleValue, I18NUtil, PegdownOptions} import code.bankconnectors.LocalMappedConnector.getAllEndpointTagsBox import com.openbankproject.commons.model.ListResult import code.crm.CrmEvent.CrmEvent @@ -21,10 +21,11 @@ import net.liftweb.json.JsonAST.{JArray, JBool, JNothing, JObject, JValue} import net.liftweb.util.StringHelpers import code.util.Helper.MdcLoggable import org.apache.commons.lang3.StringUtils - import java.util.concurrent.ConcurrentHashMap import java.util.regex.Pattern +import com.openbankproject.commons.model.enums.LanguageParam + object JSONFactory1_4_0 extends MdcLoggable{ implicit def formats: Formats = CustomJsonFormats.formats case class PostCustomerJson( @@ -452,7 +453,7 @@ object JSONFactory1_4_0 extends MdcLoggable{ private val createResourceDocJsonMemo = new ConcurrentHashMap[ResourceDoc, ResourceDocJson] - def createResourceDocJson(rd: ResourceDoc, isVersion4OrHigher:Boolean) : ResourceDocJson = { + def createResourceDocJson(rd: ResourceDoc, isVersion4OrHigher:Boolean, languageParam: Option[LanguageParam]) : ResourceDocJson = { // if this calculate conversion already happened before, just return that value // if not calculated before, just do conversion val endpointTags = getAllEndpointTagsBox(rd.operationId).map(endpointTag =>ResourceDocTag(endpointTag.tagName)) @@ -489,13 +490,20 @@ object JSONFactory1_4_0 extends MdcLoggable{ urlParametersDescription ++ exampleRequestBodyFieldsDescription ++ responseFieldsDescription } - val description = resourceDocUpdatedTags.description.stripMargin.trim ++ fieldsDescription + val resourceDocDescription = I18NUtil.translateResourceDocDescription( + resourceDocUpdatedTags.operationId, + languageParam, + resourceDocUpdatedTags.description.stripMargin.trim + ) + val description = resourceDocDescription ++ fieldsDescription + val summary = resourceDocUpdatedTags.summary.replaceFirst("""\.(\s*)$""", "$1") // remove the ending dot in summary + val translatedSummary = I18NUtil.translateResourceDocSummary(resourceDocUpdatedTags.operationId, languageParam, summary) ResourceDocJson( operation_id = resourceDocUpdatedTags.operationId, request_verb = resourceDocUpdatedTags.requestVerb, request_url = resourceDocUpdatedTags.requestUrl, - summary = resourceDocUpdatedTags.summary.replaceFirst("""\.(\s*)$""", "$1"), // remove the ending dot in summary + summary = translatedSummary, // Strip the margin character (|) and line breaks and convert from markdown to html description = PegdownOptions.convertPegdownToHtmlTweaked(description), //.replaceAll("\n", ""), description_markdown = description, @@ -516,14 +524,14 @@ object JSONFactory1_4_0 extends MdcLoggable{ }) } - def createResourceDocsJson(resourceDocList: List[ResourceDoc], isVersion4OrHigher:Boolean) : ResourceDocsJson = { + def createResourceDocsJson(resourceDocList: List[ResourceDoc], isVersion4OrHigher:Boolean, languageParam: Option[LanguageParam]) : ResourceDocsJson = { if(isVersion4OrHigher){ ResourceDocsJson( - resourceDocList.map(createResourceDocJson(_,isVersion4OrHigher)), + resourceDocList.map(createResourceDocJson(_,isVersion4OrHigher, languageParam)), meta=Some(ResourceDocMeta(new Date(), resourceDocList.length)) ) } else { - ResourceDocsJson(resourceDocList.map(createResourceDocJson(_,false))) + ResourceDocsJson(resourceDocList.map(createResourceDocJson(_,false, languageParam))) } } diff --git a/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala b/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala index f8ed37700..f3b7100e5 100644 --- a/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala +++ b/obp-api/src/main/scala/code/api/v4_0_0/APIMethods400.scala @@ -12435,7 +12435,7 @@ trait APIMethods400 { DynamicEndpointHelper.getRoles(dynamicEndpointInfo) } _ <- NewStyle.function.tryons(InvalidJsonFormat+"Can not generate OBP external Resource Docs", 400, cc.callContext) { - JSONFactory1_4_0.createResourceDocsJson(dynamicEndpointInfo.resourceDocs.toList, false) + JSONFactory1_4_0.createResourceDocsJson(dynamicEndpointInfo.resourceDocs.toList, false, None) } (dynamicEndpoint, callContext) <- NewStyle.function.createDynamicEndpoint(bankId, cc.userId, postedJson.swaggerString, cc.callContext) _ <- NewStyle.function.tryons(InvalidJsonFormat+s"Can not grant these roles ${roles.toString} ", 400, cc.callContext) { diff --git a/obp-api/src/test/scala/code/api/v1_4_0/JSONFactory1_4_0Test.scala b/obp-api/src/test/scala/code/api/v1_4_0/JSONFactory1_4_0Test.scala index c9145169f..086d03340 100644 --- a/obp-api/src/test/scala/code/api/v1_4_0/JSONFactory1_4_0Test.scala +++ b/obp-api/src/test/scala/code/api/v1_4_0/JSONFactory1_4_0Test.scala @@ -79,12 +79,12 @@ class JSONFactory1_4_0Test extends V140ServerSetup with DefaultUsers { scenario("createResourceDocJson should work well, no exception is good enough") { val resourceDoc: ResourceDoc = OBPAPI3_0_0.allResourceDocs(5) - val result: ResourceDocJson = JSONFactory1_4_0.createResourceDocJson(resourceDoc,false) + val result: ResourceDocJson = JSONFactory1_4_0.createResourceDocJson(resourceDoc,false, None) } scenario("createResourceDocsJson should work well, no exception is good enough") { val resourceDoc: mutable.Seq[ResourceDoc] = OBPAPI3_0_0.allResourceDocs - val result = JSONFactory1_4_0.createResourceDocsJson(resourceDoc.toList, false) + val result = JSONFactory1_4_0.createResourceDocsJson(resourceDoc.toList, false, None) } scenario("createTypedBody should work well, no exception is good enough") { @@ -97,7 +97,7 @@ class JSONFactory1_4_0Test extends V140ServerSetup with DefaultUsers { scenario("validate all the resouceDocs json schema, no exception is good enough") { val resourceDocsRaw= OBPAPI3_0_0.allResourceDocs - val resourceDocs = JSONFactory1_4_0.createResourceDocsJson(resourceDocsRaw.toList,false) + val resourceDocs = JSONFactory1_4_0.createResourceDocsJson(resourceDocsRaw.toList,false, None) for{ resouceDoc <- resourceDocs.resource_docs diff --git a/obp-commons/src/main/scala/com/openbankproject/commons/model/enums/Enumerations.scala b/obp-commons/src/main/scala/com/openbankproject/commons/model/enums/Enumerations.scala index 2284960eb..664c6d21b 100644 --- a/obp-commons/src/main/scala/com/openbankproject/commons/model/enums/Enumerations.scala +++ b/obp-commons/src/main/scala/com/openbankproject/commons/model/enums/Enumerations.scala @@ -192,6 +192,7 @@ object DynamicEntityOperation extends OBPEnumeration[DynamicEntityOperation] { sealed trait LanguageParam extends EnumValue object LanguageParam extends OBPEnumeration[LanguageParam] { object EN extends Value + object ES extends Value object ZH extends Value } From ea885a47732345934c5793f4f74cfd1956ee0d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Mon, 4 Jul 2022 13:54:15 +0200 Subject: [PATCH 21/80] refactor/Add Resource Doc Translation via WebUI props --- .../main/scala/code/api/util/I18NUtil.scala | 33 ++++++++++--------- .../code/api/v1_4_0/JSONFactory1_4_0.scala | 4 +-- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/obp-api/src/main/scala/code/api/util/I18NUtil.scala b/obp-api/src/main/scala/code/api/util/I18NUtil.scala index b6f946d52..414ef4da9 100644 --- a/obp-api/src/main/scala/code/api/util/I18NUtil.scala +++ b/obp-api/src/main/scala/code/api/util/I18NUtil.scala @@ -34,23 +34,26 @@ object I18NUtil { case Array(lang, country, variant) => new Locale(lang, country, variant) } - def translateResourceDocSummary(operationId: String, language: Option[LanguageParam], default: String): String = { - language match { - case Some(value) => - val webUiKey = s"webui_resource_doc_operation_id_${operationId}_summary_${value}" - getWebUiPropsValue(webUiKey, default) - case None => - default + object ResourceDocTranslation { + def summary(operationId: String, language: Option[LanguageParam], default: String): String = { + language match { + case Some(value) => + val webUiKey = s"webui_resource_doc_operation_id_${operationId}_summary_${value}" + getWebUiPropsValue(webUiKey, default) + case None => + default + } } - } - def translateResourceDocDescription(operationId: String, language: Option[LanguageParam], default: String): String = { - language match { - case Some(value) => - val webUiKey = s"webui_resource_doc_operation_id_${operationId}_description_${value}" - getWebUiPropsValue(webUiKey, default) - case None => - default + def description(operationId: String, language: Option[LanguageParam], default: String): String = { + language match { + case Some(value) => + val webUiKey = s"webui_resource_doc_operation_id_${operationId}_description_${value}" + getWebUiPropsValue(webUiKey, default) + case None => + default + } } } + } diff --git a/obp-api/src/main/scala/code/api/v1_4_0/JSONFactory1_4_0.scala b/obp-api/src/main/scala/code/api/v1_4_0/JSONFactory1_4_0.scala index e82984f83..a5cfd3dde 100644 --- a/obp-api/src/main/scala/code/api/v1_4_0/JSONFactory1_4_0.scala +++ b/obp-api/src/main/scala/code/api/v1_4_0/JSONFactory1_4_0.scala @@ -490,14 +490,14 @@ object JSONFactory1_4_0 extends MdcLoggable{ urlParametersDescription ++ exampleRequestBodyFieldsDescription ++ responseFieldsDescription } - val resourceDocDescription = I18NUtil.translateResourceDocDescription( + val resourceDocDescription = I18NUtil.ResourceDocTranslation.description( resourceDocUpdatedTags.operationId, languageParam, resourceDocUpdatedTags.description.stripMargin.trim ) val description = resourceDocDescription ++ fieldsDescription val summary = resourceDocUpdatedTags.summary.replaceFirst("""\.(\s*)$""", "$1") // remove the ending dot in summary - val translatedSummary = I18NUtil.translateResourceDocSummary(resourceDocUpdatedTags.operationId, languageParam, summary) + val translatedSummary = I18NUtil.ResourceDocTranslation.summary(resourceDocUpdatedTags.operationId, languageParam, summary) ResourceDocJson( operation_id = resourceDocUpdatedTags.operationId, From 57727bcc7a56866f8b29969315a0d6dc5cc50f5e Mon Sep 17 00:00:00 2001 From: hongwei Date: Tue, 5 Jul 2022 17:22:45 +0200 Subject: [PATCH 22/80] feature/POC - Translate the error message using i18n props 2 --- .../errors/error-messages-_es_ES.properties | 6 +++- .../main/scala/code/api/OBPRestHelper.scala | 34 +++++++++++++++++-- .../main/scala/code/api/util/APIUtil.scala | 6 ++-- 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/obp-api/src/main/resources/i18n/errors/error-messages-_es_ES.properties b/obp-api/src/main/resources/i18n/errors/error-messages-_es_ES.properties index 1332efba0..f61462f6d 100644 --- a/obp-api/src/main/resources/i18n/errors/error-messages-_es_ES.properties +++ b/obp-api/src/main/resources/i18n/errors/error-messages-_es_ES.properties @@ -1 +1,5 @@ -OBP-20001 = El usuario no ha iniciado sesión. ¡Se requiere autenticación! \ No newline at end of file +OBP-20001 = El usuario no ha iniciado sesión. ¡Se requiere autenticación! +OBP-20002 = E2 usuario no ha iniciado sesión. ¡Se requiere autenticación! +OBP-20003 = E3 usuario no ha iniciado sesión. ¡Se requiere autenticación! +OBP-20004 = E4 usuario no ha iniciado sesión. ¡Se requiere autenticación! +OBP-20005 = E5 usuario no ha iniciado sesión. ¡Se requiere autenticación! \ No newline at end of file diff --git a/obp-api/src/main/scala/code/api/OBPRestHelper.scala b/obp-api/src/main/scala/code/api/OBPRestHelper.scala index 3fc94438c..f63cf7101 100644 --- a/obp-api/src/main/scala/code/api/OBPRestHelper.scala +++ b/obp-api/src/main/scala/code/api/OBPRestHelper.scala @@ -31,7 +31,7 @@ import java.net.URLDecoder import code.api.Constant._ import code.api.OAuthHandshake._ import code.api.builder.AccountInformationServiceAISApi.APIMethods_AccountInformationServiceAISApi -import code.api.util.APIUtil._ +import code.api.util.APIUtil.{getClass, _} import code.api.util.ErrorMessages.{InvalidDAuthHeaderToken, UserIsDeleted, UsernameHasBeenLocked, attemptedToOpenAnEmptyBox} import code.api.util._ import code.api.v3_0_0.APIMethods300 @@ -72,7 +72,37 @@ object APIFailure { case class APIFailureNewStyle(failMsg: String, failCode: Int = 400, ccl: Option[CallContextLight] = None - ) + ){ + def translatedErrorMessage = { + + //1st,read the whole file into a map during the boot. + val language: Map[String, Map[String, String]] = Map( + "EN" -> Map("OBP-30001" -> "OBP-30001", "OBP-30002" -> "OBP-30002", "OBP-30003" -> "OBP-30002"), + "DE" -> Map("OBP-30001" -> "OBP-30001-DE", "OBP-30002" -> "OBP-30002-DE", "OBP-30003" -> "OBP-30002-DE"), + "CN" -> Map("OBP-30001" -> "OBP-30001-CN", "OBP-30002" -> "OBP-30002-CN", "OBP-30003" -> "OBP-30002-CN"), + ) + + val localeUrlParameter = getHttpRequestUrlParam(ccl.map(_.url).getOrElse(""),"Locale") + + val abc88: Map[String, String] = language.get(localeUrlParameter).head + val errorMessage = abc88.find(value => failMsg.contains(value._1)).head._2 + + + //2rd, get the error cor from "OBP-20005" the + val stream = getClass().getClassLoader().getResourceAsStream("i18n/errors/error-messages-_es_ES.properties") + val chineseVersion = try { + val bufferedSource = scala.io.Source.fromInputStream(stream, "utf-8") + bufferedSource.mkString + } finally { + stream.close() + } + + + //3rd, + + failMsg +"xxxxxxxxxx!" +errorMessage + } +} //if you change this, think about backwards compatibility! All existing //versions of the API return this failure message, so if you change it, make sure diff --git a/obp-api/src/main/scala/code/api/util/APIUtil.scala b/obp-api/src/main/scala/code/api/util/APIUtil.scala index 791bb7ed9..fa14415f3 100644 --- a/obp-api/src/main/scala/code/api/util/APIUtil.scala +++ b/obp-api/src/main/scala/code/api/util/APIUtil.scala @@ -3038,8 +3038,10 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ throw new Exception("Empty Box not allowed") case obj1@ParamFailure(m,e,c,af: APIFailureNewStyle) => val obj = (m,e, c) match { - case ("", Empty, Empty) => Empty ?~! af.failMsg - case _ => Failure (m, e, c) ?~! af.failMsg + case ("", Empty, Empty) => + Empty ?~! af.translatedErrorMessage + case _ => + Failure (m, e, c) ?~! af.translatedErrorMessage } val failuresMsg = filterMessage(obj) val callContext = af.ccl.map(_.copy(httpCode = Some(af.failCode))) From 13c0be15adf15028c44ebf0df866a55f9a880b96 Mon Sep 17 00:00:00 2001 From: hongwei Date: Wed, 6 Jul 2022 12:12:48 +0200 Subject: [PATCH 23/80] feature/POC - Translate the error message using i18n props -step3 --- .../errors/error-messages-_es_ES.properties | 5 -- .../resources/i18n/lift-core_es_ES.properties | 4 +- .../main/scala/code/api/OBPRestHelper.scala | 84 ++++++++++++++----- 3 files changed, 65 insertions(+), 28 deletions(-) delete mode 100644 obp-api/src/main/resources/i18n/errors/error-messages-_es_ES.properties diff --git a/obp-api/src/main/resources/i18n/errors/error-messages-_es_ES.properties b/obp-api/src/main/resources/i18n/errors/error-messages-_es_ES.properties deleted file mode 100644 index f61462f6d..000000000 --- a/obp-api/src/main/resources/i18n/errors/error-messages-_es_ES.properties +++ /dev/null @@ -1,5 +0,0 @@ -OBP-20001 = El usuario no ha iniciado sesión. ¡Se requiere autenticación! -OBP-20002 = E2 usuario no ha iniciado sesión. ¡Se requiere autenticación! -OBP-20003 = E3 usuario no ha iniciado sesión. ¡Se requiere autenticación! -OBP-20004 = E4 usuario no ha iniciado sesión. ¡Se requiere autenticación! -OBP-20005 = E5 usuario no ha iniciado sesión. ¡Se requiere autenticación! \ No newline at end of file diff --git a/obp-api/src/main/resources/i18n/lift-core_es_ES.properties b/obp-api/src/main/resources/i18n/lift-core_es_ES.properties index d85c91ebd..bfc503b05 100644 --- a/obp-api/src/main/resources/i18n/lift-core_es_ES.properties +++ b/obp-api/src/main/resources/i18n/lift-core_es_ES.properties @@ -384,4 +384,6 @@ invalid.username=Invalid Username: \ your.username.is.not.unique = Your username is not unique. Please enter a different one. # Those 2 messages must have the same output in order to prevent leakage of information user.invitation.is.already.finished = Looks like the invitation link is invalid. Still need help? Please send us a message using API Playground Support. -your.secret.link.is.not.valid = Looks like the invitation link is invalid. Still need help? Please send us a message using API Playground Support. \ No newline at end of file +your.secret.link.is.not.valid = Looks like the invitation link is invalid. Still need help? Please send us a message using API Playground Support. + +OBP-30001 = El usuario no ha iniciado sesión. ¡Se requiere autenticación! \ No newline at end of file diff --git a/obp-api/src/main/scala/code/api/OBPRestHelper.scala b/obp-api/src/main/scala/code/api/OBPRestHelper.scala index f63cf7101..2c54aa000 100644 --- a/obp-api/src/main/scala/code/api/OBPRestHelper.scala +++ b/obp-api/src/main/scala/code/api/OBPRestHelper.scala @@ -45,15 +45,18 @@ import com.openbankproject.commons.model.ErrorMessage import com.openbankproject.commons.util.{ApiVersion, ReflectUtils, ScannedApiVersion} import net.liftweb.common.{Box, Full, _} import net.liftweb.http.rest.RestHelper -import net.liftweb.http.{JsonResponse, LiftResponse, Req, S} +import net.liftweb.http.{JsonResponse, LiftResponse, LiftRules, Req, S, TransientRequestMemoize} import net.liftweb.json.Extraction import net.liftweb.json.JsonAST.JValue -import net.liftweb.util.Helpers +import net.liftweb.util.{Helpers, NamedPF, Props, ThreadGlobal} +import net.liftweb.util.Helpers.tryo +import java.util.{Locale, ResourceBundle} import scala.collection.immutable.List import scala.collection.mutable.ArrayBuffer import scala.math.Ordering import scala.util.control.NoStackTrace +import scala.xml.{Node, NodeSeq} trait APIFailure{ val msg : String @@ -75,32 +78,69 @@ case class APIFailureNewStyle(failMsg: String, ){ def translatedErrorMessage = { - //1st,read the whole file into a map during the boot. - val language: Map[String, Map[String, String]] = Map( - "EN" -> Map("OBP-30001" -> "OBP-30001", "OBP-30002" -> "OBP-30002", "OBP-30003" -> "OBP-30002"), - "DE" -> Map("OBP-30001" -> "OBP-30001-DE", "OBP-30002" -> "OBP-30002-DE", "OBP-30003" -> "OBP-30002-DE"), - "CN" -> Map("OBP-30001" -> "OBP-30001-CN", "OBP-30002" -> "OBP-30002-CN", "OBP-30003" -> "OBP-30002-CN"), - ) + val errorCode = failMsg.split(":").head + val errorBody = failMsg.split(":").drop(1).reduceLeft(_ + _) val localeUrlParameter = getHttpRequestUrlParam(ccl.map(_.url).getOrElse(""),"Locale") + val _resBundle = new ThreadGlobal[List[ResourceBundle]] + object resourceValueCache extends TransientRequestMemoize[(String, Locale), String] - val abc88: Map[String, String] = language.get(localeUrlParameter).head - val errorMessage = abc88.find(value => failMsg.contains(value._1)).head._2 - - - //2rd, get the error cor from "OBP-20005" the - val stream = getClass().getClassLoader().getResourceAsStream("i18n/errors/error-messages-_es_ES.properties") - val chineseVersion = try { - val bufferedSource = scala.io.Source.fromInputStream(stream, "utf-8") - bufferedSource.mkString - } finally { - stream.close() + def resourceBundles(loc: Locale): List[ResourceBundle] = { + _resBundle.box match { + case Full(bundles) => bundles + case _ => { + _resBundle.set( + LiftRules.resourceForCurrentLoc.vend() ::: + LiftRules.resourceNames.flatMap(name => tryo{ + if (Props.devMode) { + tryo{ + val clz = this.getClass.getClassLoader.loadClass("java.util.ResourceBundle") + val meth = clz.getDeclaredMethods. + filter{m => m.getName == "clearCache" && m.getParameterTypes.length == 0}. + toList.head + meth.invoke(null) + } + } + List(ResourceBundle.getBundle(name, loc)) + }.openOr( + NamedPF.applyBox((name, loc), LiftRules.resourceBundleFactories.toList).map(List(_)) openOr Nil + ))) + _resBundle.value + } + } } + val locale = I18NUtil.computeLocale(localeUrlParameter) + val liftCoreResourceBundle = tryo(ResourceBundle.getBundle(LiftRules.liftCoreResourceName, locale)).toList + + def resourceBundleList: List[ResourceBundle] = resourceBundles(locale) ++ liftCoreResourceBundle + + def ?!(str: String, resBundle: List[ResourceBundle]): String = + resBundle.flatMap( + r => tryo( + r.getObject(str) match { + case s: String => Full(s) + case n: Node => Full(n.text) + case ns: NodeSeq => Full(ns.text) + case _ => Empty + }) + .flatMap(s => s)).find(s => true) getOrElse { + LiftRules.localizationLookupFailureNotice.foreach(_ (str, locale)); + str + } + + def ?(str: String): String = resourceValueCache.get( + str -> + locale, + if(?!(str, resourceBundleList)==str) //If can not find the value from props, then return the default error body. + errorBody + else + ?!(str, resourceBundleList) + + ) - //3rd, - - failMsg +"xxxxxxxxxx!" +errorMessage + val translatedErrorBody = ?(errorCode) + s"$errorCode : $translatedErrorBody" } } From f3a51f020f8ac7d43308455eaaa02376cd2d4665 Mon Sep 17 00:00:00 2001 From: hongwei Date: Wed, 6 Jul 2022 13:21:37 +0200 Subject: [PATCH 24/80] feature/POC - Translate the error message using i18n props -step4 --- .../resources/i18n/lift-core_zh_CN.properties | 347 ++++++++++++++++++ .../main/scala/code/api/OBPRestHelper.scala | 16 +- 2 files changed, 356 insertions(+), 7 deletions(-) create mode 100644 obp-api/src/main/resources/i18n/lift-core_zh_CN.properties diff --git a/obp-api/src/main/resources/i18n/lift-core_zh_CN.properties b/obp-api/src/main/resources/i18n/lift-core_zh_CN.properties new file mode 100644 index 000000000..e48956f7a --- /dev/null +++ b/obp-api/src/main/resources/i18n/lift-core_zh_CN.properties @@ -0,0 +1,347 @@ +invalid.email.address = \u65e0\u6548\u7535\u5b50\u90ae\u7bb1\u5730\u5740 +password.must.be.set = \u5bc6\u7801\u4e0d\u80fd\u4e3a\u7a7a +password.too.short = \u5bc6\u7801\u592a\u77ed +passwords.do.not.match = \u5bc6\u7801\u4e0d\u5339\u914d +number.required = \u53ea\u80fd\u63d0\u4f9b\u6570\u5b57\u503c +ajax.error=\u8fde\u63a5\u670d\u52a1\u5668\u5931\u8d25 +invalid.zip.code = \u65e0\u6548\u90ae\u653f\u7f16\u7801 +invalid.postal.code = \u65e0\u6548\u90ae\u653f\u7f16\u7801 +unique.email.address = \u7535\u5b50\u90ae\u7bb1\u5730\u5740\u5df2\u5b58\u5728 +must.be.logged.in = \u8bf7\u5148\u767b\u5f55 +already.logged.in = \u5df2\u7ecf\u767b\u5f55\uff0c\u8bf7\u5148\u767b\u51fa +login = \u767b\u5f55 +logout = \u767b\u51fa +log.in = \u767b\u5f55 +log.out = \u767b\u51fa +sign.up = \u6ce8\u518c +logged.in = \u5df2\u767b\u5f55 +logout.first = \u8bf7\u5148\u767b\u51fa +lost.password = \u5fd8\u8bb0\u5bc6\u7801 +reset.password = \u91cd\u7f6e\u5bc6\u7801 +change.password = \u4fee\u6539\u5bc6\u7801 +password.changed = \u5bc6\u7801\u5df2\u4fee\u6539 +edit.user = \u8bbe\u7f6e\u7528\u6237 +validate.user = \u6821\u9a8c\u7528\u6237 +edit.profile = \u4fee\u6539\u8d44\u6599 +sign.up.confirmation = \u6ce8\u518c\u4fe1\u606f\u786e\u8ba4 +sign.up.message = \u6ce8\u518c\u6210\u529f\uff0c\u7cfb\u7edf\u4f1a\u53d1\u9001\u4e00\u5c01\u5e10\u53f7\u9a8c\u8bc1\u90ae\u4ef6\u5230\u4f60\u7684\u7535\u5b50\u90ae\u7bb1 +sign.up.validation.link=\u70b9\u51fb\u6b64\u94fe\u63a5\u5b8c\u6210\u6ce8\u518c\uff1a +welcome = \u6b22\u8fce +account.validated = \u5e10\u53f7\u9a8c\u8bc1\u6210\u529f +invalid.validation.link = \u9a8c\u8bc1\u94fe\u63a5\u65e0\u6548 +account.validation.error = \u60a8\u7684\u5e10\u53f7\u8fd8\u6ca1\u9a8c\u8bc1\uff0c\u8bf7\u68c0\u67e5\u60a8\u7684\u90ae\u7bb1\u83b7\u5f97\u9a8c\u8bc1\u94fe\u63a5 +invalid.credentials = \u7528\u6237\u540d/\u5bc6\u7801\u9519\u8bef +enter.email = \u8f93\u5165\u4e00\u4e2a\u7535\u5b50\u90ae\u7bb1\u5730\u5740\uff0c\u6211\u4eec\u4f1a\u53d1\u9001\u4e00\u4e2a\u5bc6\u7801\u91cd\u7f6e\u94fe\u63a5\u5230\u8be5\u90ae\u7bb1 +email.address = \u7535\u5b50\u90ae\u7bb1\u5730\u5740 +reset.password.confirmation = \u91cd\u7f6e\u5bc6\u7801\u4fe1\u606f\u786e\u8ba4 +dear = \u5c0a\u656c\u7684 +click.reset.link = \u70b9\u51fb\u6b64\u94fe\u63a5\u91cd\u7f6e\u60a8\u7684\u5bc6\u7801 +thank.you = \u8c22\u8c22 +reset.password.request = \u8bf7\u6c42\u5bc6\u7801\u91cd\u7f6e +password.reset.email.sent = \u5bc6\u7801\u91cd\u7f6e\u90ae\u4ef6\u5df2\u53d1\u9001 +account.validation.resent = \u91cd\u53d1\u5e10\u53f7\u9a8c\u8bc1\u90ae\u4ef6 +email.address.not.found = \u7535\u5b50\u90ae\u7bb1\u5730\u5740\u4e0d\u5b58\u5728 +send.it = \u53d1\u9001 +reset.your.password = \u91cd\u7f6e\u5bc6\u7801 +enter.your.new.password = \u8f93\u5165\u65b0\u5bc6\u7801 +repeat.your.new.password = \u8f93\u5165\u65b0\u5bc6\u7801\uff08\u786e\u8ba4\uff09 +set.password = \u8bbe\u7f6e\u5bc6\u7801 +password.link.invalid = \u5bc6\u7801\u91cd\u7f6e\u94fe\u7ed3\u65e0\u6548 +wrong.old.password = \u539f\u5bc6\u7801\u9519\u8bef +old.password = \u539f\u5bc6\u7801 +new.password = \u65b0\u5bc6\u7801 +repeat.password = \u65b0\u5bc6\u7801\u786e\u8ba4 +repeat = \u786e\u8ba4 +edit = \u4fee\u6539 +cancel = \u53d6\u6d88 +ok = \u786e\u5b9a +change = \u4fee\u6539 +password = \u5bc6\u7801 +recover.password = \u6062\u590d\u5bc6\u7801 +profile.updated = \u60a8\u7684\u8d44\u6599\u4fee\u6539\u6210\u529f +male = \u7537 +female = \u5973 +first.name = \u540d +last.name = \u59d3 +locale = \u533a\u57df +time.zone = \u65f6\u533a +msg.notice = \u4fe1\u606f +msg.warning = \u8b66\u544a +msg.error = \u9519\u8bef +crudify.menu.view.displayName=\u67e5\u770b %s +crudify.menu.edit.displayName=\u8bbe\u7f6e %s +crudify.menu.delete.displayName=\u5220\u9664 %s +country_1 = \u7f8e\u56fd +country_2 = \u963f\u5bcc\u6c57 +country_3 = \u963f\u5c14\u5df4\u5c3c\u4e9a +country_4 = \u963f\u5c14\u53ca\u5229\u4e9a +country_5 = \u5b89\u9053\u5c14 +country_6 = \u5b89\u54e5\u62c9 +country_7 = \u5b89\u63d0\u74dc\u548c\u5df4\u5e03\u8fbe +country_8 = \u963f\u6839\u5ef7 +country_9 = \u4e9a\u7f8e\u5c3c\u4e9a +country_10 = \u6fb3\u5927\u5229\u4e9a +country_11 = \u5965\u5730\u5229 +country_12 = \u963f\u585e\u62dc\u7586 +country_13 = \u5df4\u54c8\u9a6c +country_14 = \u5df4\u6797 +country_15 = \u5b5f\u52a0\u62c9\u56fd +country_16 = \u5df4\u5df4\u591a\u65af +country_17 = \u767d\u4fc4\u7f57\u65af +country_18 = \u6bd4\u5229\u65f6 +country_19 = \u4f2f\u5229\u5179 +country_20 = \u8d1d\u5b81 +country_21 = \u4e0d\u4e39 +country_22 = \u73bb\u5229\u7ef4\u4e9a +country_23 = \u6ce2\u65af\u5c3c\u4e9a\u548c\u9ed1\u585e\u54e5\u7ef4 +country_24 = \u535a\u8328\u74e6\u7eb3 +country_25 = \u5df4\u897f +country_26 = \u6587\u83b1 +country_27 = \u4fdd\u52a0\u5229\u4e9a +country_28 = \u5e03\u57fa\u7eb3\u6cd5\u7d22 +country_29 = \u5e03\u9686\u8fea +country_30 = \u67ec\u57d4\u5be8 +country_31 = \u5580\u9ea6\u9686 +country_32 = \u52a0\u62ff\u5927 +country_33 = \u4f5b\u5f97\u89d2 +country_34 = \u4e2d\u975e\u5171\u548c\u56fd +country_35 = \u4e4d\u5f97 +country_36 = \u667a\u5229 +country_37 = \u4e2d\u56fd +country_38 = \u54e5\u4f26\u6bd4\u4e9a +country_39 = \u79d1\u6469\u7f57 +country_40 = \u521a\u679c\u6c11\u4e3b\u5171\u548c\u56fd +country_41 = \u521a\u679c\u5171\u548c\u56fd +country_42 = \u54e5\u65af\u8fbe\u9ece\u52a0 +country_43 = \u79d1\u7279\u8fea\u74e6 +country_44 = \u514b\u7f57\u5730\u4e9a +country_45 = \u53e4\u5df4 +country_46 = \u585e\u6d66\u8def\u65af +country_47 = \u6377\u514b\u5171\u548c\u56fd +country_48 = \u4e39\u9ea6 +country_49 = \u5409\u5e03\u63d0 +country_50 = \u591a\u7c73\u5c3c\u52a0 +country_51 = \u591a\u7c73\u5c3c\u52a0\u5171\u548c\u56fd +country_52 = \u5384\u74dc\u591a\u5c14 +country_53 = \u57c3\u53ca +country_54 = \u8428\u5c14\u74e6\u591a +country_55 = \u8d64\u9053\u51e0\u5185\u4e9a +country_56 = \u5384\u7acb\u7279\u91cc\u4e9a +country_57 = \u7231\u6c99\u5c3c\u4e9a +country_58 = \u57c3\u585e\u4fc4\u6bd4\u4e9a +country_59 = \u6590\u6d4e +country_60 = \u82ac\u5170 +country_61 = \u6cd5\u56fd +country_62 = \u52a0\u84ec +country_63 = \u5188\u6bd4\u4e9a\uff0c +country_64 = \u683c\u9c81\u5409\u4e9a +country_65 = \u5fb7\u56fd +country_66 = \u52a0\u7eb3 +country_67 = \u5e0c\u814a +country_68 = \u683c\u6797\u7eb3\u8fbe +country_69 = \u5371\u5730\u9a6c\u62c9 +country_70 = \u51e0\u5185\u4e9a +country_71 = \u51e0\u5185\u4e9a\u6bd4\u7ecd +country_72 = \u572d\u4e9a\u90a3 +country_73 = \u6d77\u5730 +country_74 = \u6d2a\u90fd\u62c9\u65af +country_75 = \u5308\u7259\u5229 +country_76 = \u51b0\u5c9b +country_77 = \u5370\u5ea6 +country_78 = \u5370\u5ea6\u5c3c\u897f\u4e9a +country_79 = \u4f0a\u6717 +country_80 = \u4f0a\u62c9\u514b +country_81 = \u7231\u5c14\u5170 +country_82 = \u4ee5\u8272\u5217 +country_83 = \u610f\u5927\u5229 +country_84 = \u7259\u4e70\u52a0 +country_85 = \u65e5\u672c +country_86 = \u7ea6\u65e6 +country_87 = \u54c8\u8428\u514b\u65af\u5766 +country_88 = \u80af\u5c3c\u4e9a +country_89 = \u57fa\u91cc\u5df4\u65af +country_90 = \u671d\u9c9c +country_91 = \u97e9\u56fd +country_92 = \u79d1\u5a01\u7279 +country_93 = \u5409\u5c14\u5409\u65af\u65af\u5766 +country_94 = \u8001\u631d +country_95 = \u62c9\u8131\u7ef4\u4e9a +country_96 = \u9ece\u5df4\u5ae9 +country_97 = \u83b1\u7d22\u6258 +country_98 = \u5229\u6bd4\u91cc\u4e9a +country_99 = \u5229\u6bd4\u4e9a +country_100 = \u5217\u652f\u6566\u58eb\u767b +country_101 = \u7acb\u9676\u5b9b +country_102 = \u5362\u68ee\u5821 +country_103 = \u9a6c\u5176\u987f +country_104 = \u9a6c\u8fbe\u52a0\u65af\u52a0 +country_105 = \u9a6c\u62c9\u7ef4 +country_106 = \u9a6c\u6765\u897f\u4e9a +country_107 = \u9a6c\u5c14\u4ee3\u592b +country_108 = \u9a6c\u91cc +country_109 = \u9a6c\u8033\u4ed6 +country_110 = \u9a6c\u7ecd\u5c14\u7fa4\u5c9b +country_111 = \u6bdb\u91cc\u5854\u5c3c\u4e9a +country_112 = \u6bdb\u91cc\u6c42\u65af +country_113 = \u58a8\u897f\u54e5 +country_114 = \u5bc6\u514b\u7f57\u5c3c\u897f\u4e9a +country_115 = \u6469\u5c14\u591a\u74e6 +country_116 = \u6469\u7eb3\u54e5 +country_117 = \u8499\u53e4 +country_118 = \u9ed1\u5c71 +country_119 = \u6469\u6d1b\u54e5 +country_120 = \u83ab\u6851\u6bd4\u514b +country_121 = \u7f05\u7538 +country_122 = \u7eb3\u7c73\u6bd4\u4e9a +country_123 = \u7459\u9c81 +country_124 = \u5c3c\u6cca\u5c14 +country_125 = \u8377\u5170 +country_126 = \u65b0\u897f\u5170 +country_127 = \u5c3c\u52a0\u62c9\u74dc +country_128 = \u5c3c\u65e5\u5c14 +country_129 = \u5c3c\u65e5\u5229\u4e9a +country_130 = \u632a\u5a01 +country_131 = \u963f\u66fc +country_132 = \u5df4\u57fa\u65af\u5766 +country_133 = \u5e15\u52b3 +country_134 = \u5df4\u62ff\u9a6c +country_135 = \u5df4\u5e03\u4e9a\u65b0\u51e0\u5185\u4e9a +country_136 = \u5df4\u62c9\u572d +country_137 = \u79d8\u9c81 +country_138 = \u83f2\u5f8b\u5bbe +country_139 = \u6ce2\u5170 +country_140 = \u8461\u8404\u7259 +country_141 = \u5361\u5854\u5c14 +country_142 = \u7f57\u9a6c\u5c3c\u4e9a +country_143 = \u4fc4\u7f57\u65af +country_144 = \u5362\u65fa\u8fbe +country_145 = \u5723\u57fa\u8328\u548c\u5c3c\u7ef4\u65af +country_146 = \u5723\u5362\u897f\u4e9a +country_147 = \u5723\u6587\u68ee\u7279\u548c\u683c\u6797\u7eb3\u4e01\u65af +country_148 = \u8428\u6469\u4e9a +country_149 = \u5723\u9a6c\u529b\u8bfa +country_150 = \u5723\u591a\u7f8e\u548c\u666e\u6797\u897f\u6bd4 +country_151 = \u6c99\u7279\u963f\u62c9\u4f2f +country_152 = \u585e\u5185\u52a0\u5c14 +country_153 = \u585e\u5c14\u7ef4\u4e9a +country_154 = \u585e\u820c\u5c14 +country_155 = \u585e\u62c9\u5229\u6602 +country_156 = \u65b0\u52a0\u5761 +country_157 = \u65af\u6d1b\u4f10\u514b +country_158 = \u65af\u6d1b\u6587\u5c3c\u4e9a +country_159 = \u6240\u7f57\u95e8\u7fa4\u5c9b +country_160 = \u7d22\u9a6c\u91cc +country_161 = \u5357\u975e +country_162 = \u897f\u73ed\u7259 +country_163 = \u65af\u91cc\u5170\u5361 +country_164 = \u82cf\u4e39 +country_165 = \u82cf\u91cc\u5357 +country_166 = \u65af\u5a01\u58eb\u5170 +country_167 = \u745e\u5178 +country_168 = \u745e\u58eb +country_169 = \u53d9\u5229\u4e9a +country_170 = \u5854\u5409\u514b\u65af\u5766 +country_171 = \u5766\u6851\u5c3c\u4e9a +country_172 = \u6cf0\u56fd +country_173 = \u4e1c\u5e1d\u6c76 +country_174 = \u591a\u54e5 +country_175 = \u6c64\u52a0 +country_176 = \u7279\u7acb\u5c3c\u8fbe\u548c\u591a\u5df4\u54e5 +country_177 = \u7a81\u5c3c\u65af +country_178 = \u571f\u8033\u5176 +country_179 = \u571f\u5e93\u66fc\u65af\u5766 +country_180 = \u56fe\u74e6\u5362 +country_181 = \u4e4c\u5e72\u8fbe +country_182 = \u4e4c\u514b\u5170 +country_183 = \u963f\u62c9\u4f2f\u8054\u5408\u914b\u957f\u56fd +country_184 = \u82f1\u56fd +country_185 = \u4e4c\u62c9\u572d +country_186 = \u4e4c\u5179\u522b\u514b\u65af\u5766 +country_187 = \u74e6\u52aa\u963f\u56fe +country_188 = \u68b5\u8482\u5188\u57ce +country_189 = \u59d4\u5185\u745e\u62c9 +country_190 = \u8d8a\u5357 +country_191 = \u4e5f\u95e8 +country_192 = \u8d5e\u6bd4\u4e9a +country_193 = \u6d25\u5df4\u5e03\u97e6 +country_194 = \u963f\u5e03\u54c8\u5179 +country_195 = \u53f0\u6e7e +country_196 = \u7eb3\u5361 +country_197 = \u5317\u585e\u6d66\u8def\u65af +country_198 = \u5fb7\u6d85\u65af\u7279\u6cb3\u6cbf\u5cb8\u5171\u548c\u56fd +country_199 = \u7d22\u9a6c\u91cc\u5170 +country_200 = \u5357\u5965\u585e\u68af +country_201 = \u963f\u4ec0\u83ab\u5c14\u548c\u5361\u6377\u5c9b +country_202 = \u5723\u8bde\u5c9b +country_203 = \u79d1\u79d1\u65af\uff08\u57fa\u6797\uff09\u7fa4\u5c9b +country_204 = \u73ca\u745a\u6d77\u7fa4\u5c9b +country_205 = \u8d6b\u5fb7\u5c9b\u548c\u9ea6\u5f53\u52b3\u7fa4\u5c9b +country_206 = \u8bfa\u798f\u514b\u5c9b +country_207 = \u65b0\u5580\u91cc\u591a\u5c3c\u4e9a +country_208 = \u6cd5\u5c5e\u6ce2\u5229\u5c3c\u897f\u4e9a +country_209 = \u9a6c\u7ea6\u7279 +country_210 = \u5723\u5df4\u6cf0\u52d2\u7c73 +country_211 = \u5723\u9a6c\u4e01 +country_212 = \u5723\u76ae\u57c3\u5c14\u548c\u5bc6\u514b\u9686 +country_213 = \u74e6\u5229\u65af\u7fa4\u5c9b\u548c\u5bcc\u56fe\u7eb3\u7fa4\u5c9b +country_214 = \u6cd5\u56fd\u5357\u90e8\u548c\u5357\u6781\u9886\u5730 +country_215 = \u514b\u5229\u73c0\u987f\u5c9b +country_216 = \u5e03\u7ef4\u5c9b +country_217 = \u5e93\u514b\u7fa4\u5c9b +country_218 = \u7ebd\u57c3 +country_219 = \u6258\u514b\u52b3 +country_220 = \u6839\u897f\u5c9b +country_221 = \u9a6c\u6069\u5c9b +country_222 = \u6cfd\u897f +country_223 = \u5b89\u572d\u62c9 +country_224 = \u767e\u6155\u5927 +country_225 = \u82f1\u5c5e\u5370\u5ea6\u6d0b\u9886\u5730 +country_226 = \u82f1\u56fd\u4e3b\u6743\u57fa\u5730\u533a +country_227 = \u82f1\u5c5e\u7ef4\u5c14\u4eac\u7fa4\u5c9b +country_228 = \u5f00\u66fc\u7fa4\u5c9b +country_229 = \u798f\u514b\u5170\u7fa4\u5c9b +country_230 = \u76f4\u5e03\u7f57\u9640 +country_231 = \u8499\u7279\u585e\u62c9\u7279 +country_232 = \u76ae\u7279\u51ef\u6069\u7fa4\u5c9b +country_233 = \u5723\u6d77\u4f26\u5a1c +country_234 = \u5357\u4e54\u6cbb\u4e9a\u5c9b\u548c\u5357\u6851\u5a01\u5947\u7fa4\u5c9b +country_235 = \u7279\u514b\u65af\u548c\u51ef\u79d1\u65af\u7fa4\u5c9b +country_236 = \u5317\u9a6c\u91cc\u4e9a\u7eb3\u7fa4\u5c9b +country_237 = \u6ce2\u591a\u9ece\u5404 +country_238 = \u7f8e\u5c5e\u8428\u6469\u4e9a +country_239 = \u8d1d\u514b\u5c9b +country_240 = \u5173\u5c9b +country_241 = \u8c6a\u5170\u5c9b +country_242 = \u8d3e\u7ef4\u65af\u5c9b +country_243 = \u7ea6\u7ff0\u65af\u987f\u73af\u7901 +country_244 = \u91d1\u66fc\u7901 +country_245 = \u4e2d\u9014\u5c9b +country_246 = \u7eb3\u74e6\u8428\u5c9b +country_247 = \u5df4\u5c14\u7c73\u62c9\u73af\u7901 +country_248 = \u7f8e\u56fd\u7ef4\u5c14\u4eac\u7fa4\u5c9b +country_249 = \u5a01\u514b\u5c9b +country_250 = \u9999\u6e2f +country_251 = \u6fb3\u95e8 +country_252 = \u6cd5\u7f57\u7fa4\u5c9b +country_253 = \u683c\u9675\u5170 +country_254 = \u6cd5\u5c5e\u572d\u4e9a\u90a3 +country_255 = \u74dc\u5fb7\u7f57\u666e\u5c9b +country_256 = \u9a6c\u63d0\u5c3c\u514b +country_257 = \u7559\u5c3c\u6c6a +country_258 = \u5965\u5170 +country_259 = \u963f\u9c81\u5df4 +country_260 = \u8377\u5c5e\u5b89\u7684\u5217\u65af +country_261 = \u65af\u74e6\u5c14\u5df4\u5fb7 +country_262 = \u963f\u68ee\u677e +country_263 = \u7279\u91cc\u65af\u5766\u8fbe\u5e93\u5c3c\u4e9a +country_264 = \u5357\u6781\u6d32 +country_265 = \u79d1\u7d22\u6c83 +country_266 = \u5df4\u52d2\u65af\u5766\u9886\u571f +country_267 = \u897f\u6492\u54c8\u62c9 +country_268 = \u6fb3\u5927\u5229\u4e9a\u5357\u6781\u9886\u5730 +country_269 = \u7f57\u65af\u5c5e\u5730 +country_270 = \u5f7c\u5f97\u4e00\u4e16\u5c9b +country_271 = \u6bdb\u5fb7\u7687\u540e\u5730 +country_272 = \u82f1\u5c5e\u5357\u6781\u9886\u5730 + +OBP-30001 = \u627e\u4e0d\u5230\u94f6\u884c\u3002\u0020\u8bf7\u4e3a\u0020\u0042\u0041\u004e\u004b\u005f\u0049\u0044\u0020\u6307\u5b9a\u4e00\u4e2a\u6709\u6548\u503c diff --git a/obp-api/src/main/scala/code/api/OBPRestHelper.scala b/obp-api/src/main/scala/code/api/OBPRestHelper.scala index 2c54aa000..c10498928 100644 --- a/obp-api/src/main/scala/code/api/OBPRestHelper.scala +++ b/obp-api/src/main/scala/code/api/OBPRestHelper.scala @@ -82,9 +82,13 @@ case class APIFailureNewStyle(failMsg: String, val errorBody = failMsg.split(":").drop(1).reduceLeft(_ + _) val localeUrlParameter = getHttpRequestUrlParam(ccl.map(_.url).getOrElse(""),"Locale") + val locale = I18NUtil.computeLocale(localeUrlParameter) + + val liftCoreResourceBundle = tryo(ResourceBundle.getBundle(LiftRules.liftCoreResourceName, locale)).toList + val _resBundle = new ThreadGlobal[List[ResourceBundle]] object resourceValueCache extends TransientRequestMemoize[(String, Locale), String] - + def resourceBundles(loc: Locale): List[ResourceBundle] = { _resBundle.box match { case Full(bundles) => bundles @@ -109,9 +113,7 @@ case class APIFailureNewStyle(failMsg: String, } } } - - val locale = I18NUtil.computeLocale(localeUrlParameter) - val liftCoreResourceBundle = tryo(ResourceBundle.getBundle(LiftRules.liftCoreResourceName, locale)).toList + def resourceBundleList: List[ResourceBundle] = resourceBundles(locale) ++ liftCoreResourceBundle @@ -129,7 +131,7 @@ case class APIFailureNewStyle(failMsg: String, str } - def ?(str: String): String = resourceValueCache.get( + def ?(str: String, locale: Locale): String = resourceValueCache.get( str -> locale, if(?!(str, resourceBundleList)==str) //If can not find the value from props, then return the default error body. @@ -139,8 +141,8 @@ case class APIFailureNewStyle(failMsg: String, ) - val translatedErrorBody = ?(errorCode) - s"$errorCode : $translatedErrorBody" + val translatedErrorBody = ?(errorCode, locale) + s"$errorCode:$translatedErrorBody" } } From d8fac881456b0a09c12d3367db013f514a1b8931 Mon Sep 17 00:00:00 2001 From: hongwei Date: Thu, 7 Jul 2022 10:43:34 +0200 Subject: [PATCH 25/80] feature/POC - Translate the error message using i18n props -step5 --- .../main/scala/code/api/OBPRestHelper.scala | 6 ++--- .../main/scala/code/api/util/APIUtil.scala | 12 ++++----- .../scala/code/api/util/ErrorMessages.scala | 26 +++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/obp-api/src/main/scala/code/api/OBPRestHelper.scala b/obp-api/src/main/scala/code/api/OBPRestHelper.scala index c10498928..24d711868 100644 --- a/obp-api/src/main/scala/code/api/OBPRestHelper.scala +++ b/obp-api/src/main/scala/code/api/OBPRestHelper.scala @@ -78,8 +78,8 @@ case class APIFailureNewStyle(failMsg: String, ){ def translatedErrorMessage = { - val errorCode = failMsg.split(":").head - val errorBody = failMsg.split(":").drop(1).reduceLeft(_ + _) + val errorCode = failMsg.split(": ").head + val errorBody = failMsg.split(": ").drop(1).reduceLeft(_ + _) val localeUrlParameter = getHttpRequestUrlParam(ccl.map(_.url).getOrElse(""),"Locale") val locale = I18NUtil.computeLocale(localeUrlParameter) @@ -142,7 +142,7 @@ case class APIFailureNewStyle(failMsg: String, ) val translatedErrorBody = ?(errorCode, locale) - s"$errorCode:$translatedErrorBody" + s"$errorCode: $translatedErrorBody" } } diff --git a/obp-api/src/main/scala/code/api/util/APIUtil.scala b/obp-api/src/main/scala/code/api/util/APIUtil.scala index fa14415f3..dd32b27a3 100644 --- a/obp-api/src/main/scala/code/api/util/APIUtil.scala +++ b/obp-api/src/main/scala/code/api/util/APIUtil.scala @@ -611,14 +611,14 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ def errorJsonResponse(message : String = "error", httpCode : Int = 400, callContextLight: Option[CallContextLight] = None)(implicit headers: CustomResponseHeaders = CustomResponseHeaders(Nil)) : JsonResponse = { def check403(message: String): Boolean = { - message.contains(UserHasMissingRoles) || - message.contains(UserNoPermissionAccessView) || - message.contains(UserHasMissingRoles) || - message.contains(UserNotSuperAdminOrMissRole) || - message.contains(ConsumerHasMissingRoles) + message.contains(UserHasMissingRoles.split(": ").head) || + message.contains(UserNoPermissionAccessView.split(": ").head) || + message.contains(UserHasMissingRoles.split(": ").head) || + message.contains(UserNotSuperAdminOrMissRole.split(": ").head) || + message.contains(ConsumerHasMissingRoles.split(": ").head) } def check401(message: String): Boolean = { - message.contains(UserNotLoggedIn) + message.contains(UserNotLoggedIn.split(": ").head) } val (code, responseHeaders) = message match { diff --git a/obp-api/src/main/scala/code/api/util/ErrorMessages.scala b/obp-api/src/main/scala/code/api/util/ErrorMessages.scala index 51437346a..328963677 100644 --- a/obp-api/src/main/scala/code/api/util/ErrorMessages.scala +++ b/obp-api/src/main/scala/code/api/util/ErrorMessages.scala @@ -69,7 +69,7 @@ object ErrorMessages { val FXCurrencyCodeCombinationsNotSupported = "OBP-10004: ISO Currency code combination not supported for FX. Please modify the FROM_CURRENCY_CODE or TO_CURRENCY_CODE. " val InvalidDateFormat = "OBP-10005: Invalid Date Format. Could not convert value to a Date." val InvalidCurrency = "OBP-10006: Invalid Currency Value." - val IncorrectRoleName = "OBP-10007: Incorrect Role name: " + val IncorrectRoleName = "OBP-10007: Incorrect Role name:" val CouldNotTransformJsonToInternalModel = "OBP-10008: Could not transform Json to internal model." val CountNotSaveOrUpdateResource = "OBP-10009: Could not save or update resource." val NotImplemented = "OBP-10010: Not Implemented " @@ -77,7 +77,7 @@ object ErrorMessages { val maximumLimitExceeded = "OBP-10012: Invalid value. Maximum number is 10000." val attemptedToOpenAnEmptyBox = "OBP-10013: Attempted to open an empty Box." val cannotDecryptValueOfProperty = "OBP-10014: Could not decrypt value of property " - val AllowedValuesAre = "OBP-10015: Allowed values are: " + val AllowedValuesAre = "OBP-10015: Allowed values are:" val InvalidFilterParameterFormat = "OBP-10016: Incorrect filter Parameters in URL. " val InvalidUrl = "OBP-10017: Incorrect URL Format. " val TooManyRequests = "OBP-10018: Too Many Requests." @@ -106,7 +106,7 @@ object ErrorMessages { val FilterIsDeletedFormatError = s"OBP-10036: is_deleted parameter can only take two values: TRUE or FALSE!" val InvalidApiVersionString = "OBP-00027: Invalid API Version string. We could not find the version specified." - val IncorrectTriggerName = "OBP-10028: Incorrect Trigger name: " + val IncorrectTriggerName = "OBP-10028: Incorrect Trigger name:" val ScaMethodNotDefined = "OBP-10030: Strong customer authentication method is not defined at this instance." @@ -114,11 +114,11 @@ object ErrorMessages { // Authentication / Authorisation / User messages (OBP-20XXX) val UserNotLoggedIn = "OBP-20001: User not logged in. Authentication is required!" - val DirectLoginMissingParameters = "OBP-20002: These DirectLogin parameters are missing: " - val DirectLoginInvalidToken = "OBP-20003: This DirectLogin token is invalid or expired: " + val DirectLoginMissingParameters = "OBP-20002: These DirectLogin parameters are missing:" + val DirectLoginInvalidToken = "OBP-20003: This DirectLogin token is invalid or expired:" val InvalidLoginCredentials = "OBP-20004: Invalid login credentials. Check username/password." val UserNotFoundById = "OBP-20005: User not found. Please specify a valid value for USER_ID." - val UserHasMissingRoles = "OBP-20006: User is missing one or more roles: " + val UserHasMissingRoles = "OBP-20006: User is missing one or more roles:" val UserNotFoundByEmail = "OBP-20007: User not found by email." val InvalidConsumerKey = "OBP-20008: Invalid Consumer Key." @@ -146,13 +146,13 @@ object ErrorMessages { val SystemViewsCanNotBeModified = "OBP-20021: System Views can not be modified. Only the created views can be modified." val ViewDoesNotPermitAccess = "OBP-20022: View does not permit the access." - val ConsumerHasMissingRoles = "OBP-20023: Consumer is missing one or more roles: " + val ConsumerHasMissingRoles = "OBP-20023: Consumer is missing one or more roles:" val ConsumerNotFoundById = "OBP-20024: Consumer not found. Please specify a valid value for CONSUMER_ID." val ScopeNotFound = "OBP-20025: Scope not found. Please specify a valid value for SCOPE_ID." val ConsumerDoesNotHaveScope = "OBP-20026: CONSUMER_ID does not have the SCOPE_ID " val UserNotFoundByUsername = "OBP-20027: User not found by username." - val GatewayLoginMissingParameters = "OBP-20028: These GatewayLogin parameters are missing: " + val GatewayLoginMissingParameters = "OBP-20028: These GatewayLogin parameters are missing:" val GatewayLoginUnknownError = "OBP-20029: Unknown Gateway login error." val GatewayLoginHostPropertyMissing = "OBP-20030: Property gateway.host is not defined." val GatewayLoginWhiteListAddresses = "OBP-20031: Gateway login can be done only from allowed addresses." @@ -172,7 +172,7 @@ object ErrorMessages { val NotEnoughtSearchStatisticsResults = "OBP-20052: Result set too small. Will not be displayed for reasons of privacy." val ElasticSearchEmptyQueryBody = "OBP-20053: The Elasticsearch query body cannot be empty" val InvalidAmount = "OBP-20054: Invalid amount. Please specify a valid value for amount." - val MissingQueryParams = "OBP-20055: These query parameters are missing: " + val MissingQueryParams = "OBP-20055: These query parameters are missing:" val ElasticSearchDisabled = "OBP-20056: Elasticsearch is disabled for this API instance." val UserNotFoundByUserId = "OBP-20057: User not found by userId." val ConsumerIsDisabled = "OBP-20058: Consumer is disabled." @@ -185,7 +185,7 @@ object ErrorMessages { val UserIsDeleted = "OBP-20064: The user is deleted!" val DAuthCannotGetOrCreateUser = "OBP-20065: Cannot get or create user during DAuth process." - val DAuthMissingParameters = "OBP-20066: These DAuth parameters are missing: " + val DAuthMissingParameters = "OBP-20066: These DAuth parameters are missing:" val DAuthUnknownError = "OBP-20067: Unknown DAuth login error." val DAuthHostPropertyMissing = "OBP-20068: Property dauth.host is not defined." val DAuthWhiteListAddresses = "OBP-20069: DAuth login can be done only from allowed addresses." @@ -198,7 +198,7 @@ object ErrorMessages { val UserAttributeNotFound = "OBP-20081: User Attribute not found by USER_ATTRIBUTE_ID." - val UserNotSuperAdminOrMissRole = "OBP-20101: Current User is not super admin or is missing entitlements: " + val UserNotSuperAdminOrMissRole = "OBP-20101: Current User is not super admin or is missing entitlements:" val CannotGetOrCreateUser = "OBP-20102: Cannot get or create user." val InvalidUserProvider = "OBP-20103: Invalid DAuth User Provider." @@ -267,7 +267,7 @@ object ErrorMessages { val CreateBankError = "OBP-30020: Could not create the Bank" val UpdateBankError = "OBP-30021: Could not update the Bank" - val NoViewPermission = "OBP-30022: The current view does not have the permission: " + val NoViewPermission = "OBP-30022: The current view does not have the permission:" val UpdateConsumerError = "OBP-30023: Cannot update Consumer " val CreateConsumerError = "OBP-30024: Could not create Consumer " val CreateOAuth2ConsumerError = "OBP-30077: Could not create OAuth2 Consumer." @@ -467,7 +467,7 @@ object ErrorMessages { val ConsentDisabled = "OBP-35007: Consents are not allowed at this instance. " val ConsentHeaderNotFound = "OBP-35008: Cannot get Consent-Id. " val ConsentAllowedScaMethods = "OBP-35009: Only SMS and EMAIL are supported as SCA methods. " - val SmsServerNotResponding = "OBP-35010: SMS server is not working or SMS server can not send the message to the phone number: " + val SmsServerNotResponding = "OBP-35010: SMS server is not working or SMS server can not send the message to the phone number:" val AuthorizationNotFound = "OBP-35011: Resource identification of the related Consent authorisation sub-resource not found by AUTHORIZATION_ID. " val ConsentAlreadyRevoked = "OBP-35012: Consent is already revoked. " val RolesAllowedInConsent = "OBP-35013: Consents can only contain Roles that you already have access to." From 0b07518737ed0bc5a62ed9ad4b42af7380b0d355 Mon Sep 17 00:00:00 2001 From: hongwei Date: Thu, 7 Jul 2022 12:43:25 +0200 Subject: [PATCH 26/80] feature/POC - Translate the error message using i18n props -step6 --- .../main/scala/code/api/OBPRestHelper.scala | 2 +- .../src/main/scala/code/api/util/APIUtil.scala | 18 ++++++++++++------ .../PaymentInitiationServicePISApiTest.scala | 3 ++- .../code/api/v2_0_0/EntitlementTests.scala | 5 +++-- .../scala/code/api/v2_2_0/AccountTest.scala | 3 ++- .../scala/code/api/v3_1_0/AccountTest.scala | 3 ++- .../api/v4_0_0/TransactionRequestsTest.scala | 5 +++-- 7 files changed, 25 insertions(+), 14 deletions(-) diff --git a/obp-api/src/main/scala/code/api/OBPRestHelper.scala b/obp-api/src/main/scala/code/api/OBPRestHelper.scala index 24d711868..18bef30c5 100644 --- a/obp-api/src/main/scala/code/api/OBPRestHelper.scala +++ b/obp-api/src/main/scala/code/api/OBPRestHelper.scala @@ -78,7 +78,7 @@ case class APIFailureNewStyle(failMsg: String, ){ def translatedErrorMessage = { - val errorCode = failMsg.split(": ").head + val errorCode = extractErrorMessageCode(failMsg) val errorBody = failMsg.split(": ").drop(1).reduceLeft(_ + _) val localeUrlParameter = getHttpRequestUrlParam(ccl.map(_.url).getOrElse(""),"Locale") diff --git a/obp-api/src/main/scala/code/api/util/APIUtil.scala b/obp-api/src/main/scala/code/api/util/APIUtil.scala index dd32b27a3..6ef993443 100644 --- a/obp-api/src/main/scala/code/api/util/APIUtil.scala +++ b/obp-api/src/main/scala/code/api/util/APIUtil.scala @@ -611,14 +611,14 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ def errorJsonResponse(message : String = "error", httpCode : Int = 400, callContextLight: Option[CallContextLight] = None)(implicit headers: CustomResponseHeaders = CustomResponseHeaders(Nil)) : JsonResponse = { def check403(message: String): Boolean = { - message.contains(UserHasMissingRoles.split(": ").head) || - message.contains(UserNoPermissionAccessView.split(": ").head) || - message.contains(UserHasMissingRoles.split(": ").head) || - message.contains(UserNotSuperAdminOrMissRole.split(": ").head) || - message.contains(ConsumerHasMissingRoles.split(": ").head) + message.contains(extractErrorMessageCode(UserHasMissingRoles)) || + message.contains(extractErrorMessageCode(UserNoPermissionAccessView)) || + message.contains(extractErrorMessageCode(UserHasMissingRoles)) || + message.contains(extractErrorMessageCode(UserNotSuperAdminOrMissRole)) || + message.contains(extractErrorMessageCode(ConsumerHasMissingRoles)) } def check401(message: String): Boolean = { - message.contains(UserNotLoggedIn.split(": ").head) + message.contains(extractErrorMessageCode(UserNotLoggedIn)) } val (code, responseHeaders) = message match { @@ -4203,4 +4203,10 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ """.stripMargin val transactionRequestChallengeTtl = APIUtil.getPropsAsLongValue("transaction_request_challenge_ttl", 600) + + + //eg: UserHasMissingRoles = "OBP-20006: User is missing one or more roles:" --> + // errorCode = "OBP-20006" + // So far we support the i180n, we need to separate the errorCode and errorBody + def extractErrorMessageCode (errorMessage: String) = errorMessage.split(": ").head } diff --git a/obp-api/src/test/scala/code/api/berlin/group/v1_3/PaymentInitiationServicePISApiTest.scala b/obp-api/src/test/scala/code/api/berlin/group/v1_3/PaymentInitiationServicePISApiTest.scala index 6b7c3b5d5..f621d8e05 100644 --- a/obp-api/src/test/scala/code/api/berlin/group/v1_3/PaymentInitiationServicePISApiTest.scala +++ b/obp-api/src/test/scala/code/api/berlin/group/v1_3/PaymentInitiationServicePISApiTest.scala @@ -4,6 +4,7 @@ import code.api.BerlinGroup.ScaStatus import code.api.berlin.group.v1_3.JSONFactory_BERLIN_GROUP_1_3.{CancellationJsonV13, InitiatePaymentResponseJson, StartPaymentAuthorisationJson} import code.api.builder.PaymentInitiationServicePISApi.APIMethods_PaymentInitiationServicePISApi import code.api.util.APIUtil.OAuth._ +import code.api.util.APIUtil.extractErrorMessageCode import code.api.util.ErrorMessages.{AuthorisationNotFound, InvalidJsonFormat, NotPositiveAmount, _} import code.model.dataAccess.{BankAccountRouting, MappedBankAccount} import code.setup.{APIResponse, DefaultUsers} @@ -80,7 +81,7 @@ class PaymentInitiationServicePISApiTest extends BerlinGroupServerSetupV1_3 with response.code should equal(400) val error = s"${NotPositiveAmount} Current input is: '-1234'" And("error should be " + error) - response.body.extract[ErrorMessage].message should equal (error) + response.body.extract[ErrorMessage].message contains extractErrorMessageCode(NotPositiveAmount) should be (true) } scenario("Successful case - small amount -- change the balance", BerlinGroupV1_3, PIS, initiatePayment) { val accountsRoutingIban = BankAccountRouting.findAll(By(BankAccountRouting.AccountRoutingScheme, AccountRoutingScheme.IBAN.toString)) diff --git a/obp-api/src/test/scala/code/api/v2_0_0/EntitlementTests.scala b/obp-api/src/test/scala/code/api/v2_0_0/EntitlementTests.scala index 5473489d4..97087ad74 100644 --- a/obp-api/src/test/scala/code/api/v2_0_0/EntitlementTests.scala +++ b/obp-api/src/test/scala/code/api/v2_0_0/EntitlementTests.scala @@ -3,6 +3,7 @@ package code.api.v2_0_0 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON import com.openbankproject.commons.model.ErrorMessage import code.api.util.APIUtil.OAuth._ +import code.api.util.APIUtil.extractErrorMessageCode import code.api.util.ApiRole.CanGetEntitlementsForAnyUserAtAnyBank import code.api.util.ErrorMessages.{UserHasMissingRoles, _} import code.api.util.{ApiRole, ErrorMessages} @@ -74,7 +75,7 @@ class EntitlementTests extends V200ServerSetup with DefaultUsers { Then("We should get a 403") responsePost.code should equal(403) - responsePost.body.toString contains (UserHasMissingRoles) should be (true) + responsePost.body.toString contains (extractErrorMessageCode(UserHasMissingRoles)) should be (true) Then("We grant the canCreateEntitlementAtOneBank role") Entitlement.entitlement.vend.addEntitlement(testBankId1.value, resourceUser1.userId, ApiRole.canCreateEntitlementAtOneBank.toString) @@ -101,7 +102,7 @@ class EntitlementTests extends V200ServerSetup with DefaultUsers { Then("We should get a 403") responsePost.code should equal(403) - responsePost.body.toString contains (UserHasMissingRoles) should be (true) + responsePost.body.toString contains (extractErrorMessageCode(UserHasMissingRoles)) should be (true) Then("We grant the canCreateEntitlementAtOneBank role") Entitlement.entitlement.vend.addEntitlement("wrongbankId", resourceUser1.userId, ApiRole.canCreateEntitlementAtOneBank.toString) diff --git a/obp-api/src/test/scala/code/api/v2_2_0/AccountTest.scala b/obp-api/src/test/scala/code/api/v2_2_0/AccountTest.scala index 010e5c7f4..65cf21ca9 100644 --- a/obp-api/src/test/scala/code/api/v2_2_0/AccountTest.scala +++ b/obp-api/src/test/scala/code/api/v2_2_0/AccountTest.scala @@ -1,6 +1,7 @@ package code.api.v2_2_0 import code.api.util.APIUtil.OAuth._ +import code.api.util.APIUtil.extractErrorMessageCode import code.api.util.{ApiRole, ErrorMessages} import code.api.util.ErrorMessages.UserHasMissingRoles import code.entitlement.Entitlement @@ -129,7 +130,7 @@ class AccountTest extends V220ServerSetup with DefaultUsers { val responseWithNoRole = makePutRequest(requestPutNewAccountId, write(accountPutJSON2)) responseWithNoRole.code should equal(403) - responseWithNoRole.body.toString contains(s"$UserHasMissingRoles") should be (true) + responseWithNoRole.body.toString contains(extractErrorMessageCode(UserHasMissingRoles)) should be (true) Then("We grant the roles and test it again") diff --git a/obp-api/src/test/scala/code/api/v3_1_0/AccountTest.scala b/obp-api/src/test/scala/code/api/v3_1_0/AccountTest.scala index 95b5286fe..2526199fb 100644 --- a/obp-api/src/test/scala/code/api/v3_1_0/AccountTest.scala +++ b/obp-api/src/test/scala/code/api/v3_1_0/AccountTest.scala @@ -5,6 +5,7 @@ import com.openbankproject.commons.model.{AccountRouting, AccountRoutingJsonV121 import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON.updateAccountRequestJsonV310 import code.api.util.APIUtil.OAuth._ +import code.api.util.APIUtil.extractErrorMessageCode import code.api.util.ErrorMessages.{UserHasMissingRoles, UserNotLoggedIn} import code.api.util.ApiRole import code.api.v2_0_0.BasicAccountJSON @@ -251,7 +252,7 @@ class AccountTest extends V310ServerSetup with DefaultUsers { val responseWithNoRole = makePutRequest(request310WithNewAccountId, write(putCreateAccountOtherUserJsonV310)) Then("We should get a 403 and some error message") responseWithNoRole.code should equal(403) - responseWithNoRole.body.toString contains(s"$UserHasMissingRoles") should be (true) + responseWithNoRole.body.toString contains(extractErrorMessageCode(UserHasMissingRoles)) should be (true) Then("We grant the roles and test it again") diff --git a/obp-api/src/test/scala/code/api/v4_0_0/TransactionRequestsTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/TransactionRequestsTest.scala index 9a150d45a..2c8f5764c 100644 --- a/obp-api/src/test/scala/code/api/v4_0_0/TransactionRequestsTest.scala +++ b/obp-api/src/test/scala/code/api/v4_0_0/TransactionRequestsTest.scala @@ -5,6 +5,7 @@ import code.api.ChargePolicy import code.api.Constant._ import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON import code.api.util.APIUtil.OAuth._ +import code.api.util.APIUtil.extractErrorMessageCode import code.api.util.ApiRole.CanCreateAnyTransactionRequest import code.api.util.ErrorMessages._ import code.api.util.{APIUtil, ErrorMessages} @@ -1172,7 +1173,7 @@ class TransactionRequestsTest extends V400ServerSetup with DefaultUsers { helper.setAnswerTransactionRequest(challengeId = challengeOfUser1.map(_.id).getOrElse("")) And("we call the endpoint") val ansReqResponseUser1 = helper.makeAnswerRequest - ansReqResponseUser1.body.extract[ErrorMessage].message should equal(NextChallengePending) + ansReqResponseUser1.body.extract[ErrorMessage].message contains extractErrorMessageCode(NextChallengePending) should be (true) Then("We call 'Answer Transaction Request Challenge - V400' to finish the request") And("we prepare the parameters for it") @@ -1420,7 +1421,7 @@ class TransactionRequestsTest extends V400ServerSetup with DefaultUsers { helper.setAnswerTransactionRequest(challengeId = challengeOfUser1.map(_.id).getOrElse("")) And("we call the endpoint") val ansReqResponseUser1 = helper.makeAnswerRequest - ansReqResponseUser1.body.extract[ErrorMessage].message should equal(NextChallengePending) + ansReqResponseUser1.body.extract[ErrorMessage].message contains extractErrorMessageCode(NextChallengePending) should be (true) Then("We call 'Answer Transaction Request Challenge - V400' to finish the request") And("we prepare the parameters for it") From b928b75486efdca8887a19f41dfffa20d2c8803c Mon Sep 17 00:00:00 2001 From: hongwei Date: Thu, 7 Jul 2022 14:30:47 +0200 Subject: [PATCH 27/80] feature/POC - Translate the error message using i18n props -step7 --- .../src/main/scala/code/api/OBPRestHelper.scala | 4 ++-- .../src/main/scala/code/api/util/APIUtil.scala | 15 +++++++++++++-- .../scala/code/api/v4_0_0/DirectDebitTest.scala | 3 ++- .../scala/code/api/v4_0_0/StandingOrderTest.scala | 3 ++- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/obp-api/src/main/scala/code/api/OBPRestHelper.scala b/obp-api/src/main/scala/code/api/OBPRestHelper.scala index 18bef30c5..6dce07b18 100644 --- a/obp-api/src/main/scala/code/api/OBPRestHelper.scala +++ b/obp-api/src/main/scala/code/api/OBPRestHelper.scala @@ -79,7 +79,7 @@ case class APIFailureNewStyle(failMsg: String, def translatedErrorMessage = { val errorCode = extractErrorMessageCode(failMsg) - val errorBody = failMsg.split(": ").drop(1).reduceLeft(_ + _) + val errorBody = extractErrorMessageBody(failMsg) val localeUrlParameter = getHttpRequestUrlParam(ccl.map(_.url).getOrElse(""),"Locale") val locale = I18NUtil.computeLocale(localeUrlParameter) @@ -142,7 +142,7 @@ case class APIFailureNewStyle(failMsg: String, ) val translatedErrorBody = ?(errorCode, locale) - s"$errorCode: $translatedErrorBody" + s"$errorCode$translatedErrorBody" } } diff --git a/obp-api/src/main/scala/code/api/util/APIUtil.scala b/obp-api/src/main/scala/code/api/util/APIUtil.scala index 6ef993443..884aa47a3 100644 --- a/obp-api/src/main/scala/code/api/util/APIUtil.scala +++ b/obp-api/src/main/scala/code/api/util/APIUtil.scala @@ -4206,7 +4206,18 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ //eg: UserHasMissingRoles = "OBP-20006: User is missing one or more roles:" --> - // errorCode = "OBP-20006" + // errorCode = "OBP-20006:" // So far we support the i180n, we need to separate the errorCode and errorBody - def extractErrorMessageCode (errorMessage: String) = errorMessage.split(": ").head + def extractErrorMessageCode (errorMessage: String) = { + val regex = "(OBP-\\d+):".r + regex.findFirstIn(errorMessage).mkString + } + + //eg: UserHasMissingRoles = "OBP-20006: User is missing one or more roles:" --> + // errorBody = " User is missing one or more roles:" + // So far we support the i180n, we need to separate the errorCode and errorBody + def extractErrorMessageBody(errorMessage: String) = { + val regex = "(OBP-\\d+):" + errorMessage.replaceFirst(regex,"") + } } diff --git a/obp-api/src/test/scala/code/api/v4_0_0/DirectDebitTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/DirectDebitTest.scala index 2ab92e80b..0e24e027f 100644 --- a/obp-api/src/test/scala/code/api/v4_0_0/DirectDebitTest.scala +++ b/obp-api/src/test/scala/code/api/v4_0_0/DirectDebitTest.scala @@ -3,6 +3,7 @@ package code.api.v4_0_0 import com.openbankproject.commons.model.ErrorMessage import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON import code.api.util.APIUtil.OAuth._ +import code.api.util.APIUtil.extractErrorMessageCode import code.api.util.ApiRole.CanCreateDirectDebitAtOneBank import com.openbankproject.commons.util.ApiVersion import code.api.util.ErrorMessages.{NoViewPermission, UserHasMissingRoles, UserNotLoggedIn} @@ -45,7 +46,7 @@ class DirectDebitTest extends V400ServerSetup { val response400 = makePostRequest(request400, write(postDirectDebitJsonV400)) Then("We should get a 400") response400.code should equal(400) - response400.body.extract[ErrorMessage].message should startWith(NoViewPermission) + response400.body.extract[ErrorMessage].message contains extractErrorMessageCode(NoViewPermission) should be (true) } } diff --git a/obp-api/src/test/scala/code/api/v4_0_0/StandingOrderTest.scala b/obp-api/src/test/scala/code/api/v4_0_0/StandingOrderTest.scala index 70675732c..2cbd2df2b 100644 --- a/obp-api/src/test/scala/code/api/v4_0_0/StandingOrderTest.scala +++ b/obp-api/src/test/scala/code/api/v4_0_0/StandingOrderTest.scala @@ -3,6 +3,7 @@ package code.api.v4_0_0 import com.openbankproject.commons.model.ErrorMessage import code.api.util.APIUtil.OAuth._ import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON +import code.api.util.APIUtil.extractErrorMessageCode import code.api.util.ApiRole.CanCreateStandingOrderAtOneBank import com.openbankproject.commons.util.ApiVersion import code.api.util.ErrorMessages.{NoViewPermission, UserHasMissingRoles, UserNotLoggedIn} @@ -45,7 +46,7 @@ class StandingOrderTest extends V400ServerSetup { val response400 = makePostRequest(request400, write(postStandingOrderJsonV400)) Then("We should get a 400") response400.code should equal(400) - response400.body.extract[ErrorMessage].message should startWith(NoViewPermission) + response400.body.extract[ErrorMessage].message contains extractErrorMessageCode(NoViewPermission) should be (true) } } From 5c26e61d178afdf58f46d67dfcc55093fec78e51 Mon Sep 17 00:00:00 2001 From: hongwei Date: Thu, 7 Jul 2022 15:48:47 +0200 Subject: [PATCH 28/80] feature/POC - Translate the error message using i18n props -step8 --- obp-api/src/main/scala/code/api/util/APIUtil.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/obp-api/src/main/scala/code/api/util/APIUtil.scala b/obp-api/src/main/scala/code/api/util/APIUtil.scala index 884aa47a3..aac172b54 100644 --- a/obp-api/src/main/scala/code/api/util/APIUtil.scala +++ b/obp-api/src/main/scala/code/api/util/APIUtil.scala @@ -4204,20 +4204,20 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{ val transactionRequestChallengeTtl = APIUtil.getPropsAsLongValue("transaction_request_challenge_ttl", 600) + val obpErrorMessageCodeRegex = "^(OBP-\\d+):" //eg: UserHasMissingRoles = "OBP-20006: User is missing one or more roles:" --> // errorCode = "OBP-20006:" // So far we support the i180n, we need to separate the errorCode and errorBody def extractErrorMessageCode (errorMessage: String) = { - val regex = "(OBP-\\d+):".r + val regex = obpErrorMessageCodeRegex.r regex.findFirstIn(errorMessage).mkString } - //eg: UserHasMissingRoles = "OBP-20006: User is missing one or more roles:" --> // errorBody = " User is missing one or more roles:" // So far we support the i180n, we need to separate the errorCode and errorBody def extractErrorMessageBody(errorMessage: String) = { - val regex = "(OBP-\\d+):" - errorMessage.replaceFirst(regex,"") + + errorMessage.replaceFirst(obpErrorMessageCodeRegex,"") } } From f2dc81e4644413c57f6a56d8f7e8deda05644758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Thu, 7 Jul 2022 16:10:17 +0200 Subject: [PATCH 29/80] bugfix/Fix Endpoint Get API Info v5.0.0 --- obp-api/src/main/scala/code/api/v5_0_0/OBPAPI5_0_0.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/obp-api/src/main/scala/code/api/v5_0_0/OBPAPI5_0_0.scala b/obp-api/src/main/scala/code/api/v5_0_0/OBPAPI5_0_0.scala index 6b007dc09..726a9f9c0 100644 --- a/obp-api/src/main/scala/code/api/v5_0_0/OBPAPI5_0_0.scala +++ b/obp-api/src/main/scala/code/api/v5_0_0/OBPAPI5_0_0.scala @@ -81,8 +81,7 @@ object OBPAPI5_0_0 extends OBPRestHelper private val endpoints: List[OBPEndpoint] = OBPAPI4_0_0.routes ++ endpointsOf5_0_0 // Filter the possible endpoints by the disabled / enabled Props settings and add them together - val routes : List[OBPEndpoint] = Implementations4_0_0.root :: // For now we make this mandatory - getAllowedEndpoints(endpoints, allResourceDocs) + val routes : List[OBPEndpoint] = getAllowedEndpoints(endpoints, allResourceDocs) // register v5.0.0 apis first, Make them available for use! registerRoutes(routes, allResourceDocs, apiPrefix, true) From 84a17df7d1f7cdc13f02ff0b06eec43b12263ce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Mon, 11 Jul 2022 15:43:04 +0200 Subject: [PATCH 30/80] bugfix/Bump akka and akka streams kafka version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e452faf7f..6dbeed9ce 100644 --- a/pom.xml +++ b/pom.xml @@ -12,8 +12,8 @@ 2.12 2.12.10 - 2.5.19 - 0.22 + 2.5.31 + 2.0.5 1.1.0 1.8.2 3.4.1 From b509aba301b2ab0b1354280abe5ac51666dd94af Mon Sep 17 00:00:00 2001 From: CristhTejada Date: Mon, 11 Jul 2022 20:01:42 -0600 Subject: [PATCH 31/80] Language tag added to the footer menu --- .../src/main/webapp/templates-hidden/default.html | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/obp-api/src/main/webapp/templates-hidden/default.html b/obp-api/src/main/webapp/templates-hidden/default.html index f1aae51d7..99f37e211 100644 --- a/obp-api/src/main/webapp/templates-hidden/default.html +++ b/obp-api/src/main/webapp/templates-hidden/default.html @@ -140,14 +140,6 @@ Berlin 13359, Germany

    • -
  • -
    - Language - ES - | EN -
    -
    • -

  • usernameLog off

    @@ -243,6 +235,13 @@ Berlin 13359, Germany This API Host
    • +
  • +
    + Language + ES + | EN +
    +
    • +
    + + +
    From 7dd7a6971ab5e5f6454286a0836247d72222f5d2 Mon Sep 17 00:00:00 2001 From: CristhTejada Date: Sat, 23 Jul 2022 11:51:12 -0600 Subject: [PATCH 43/80] Spanish translation added to main sections of index.html --- .../resources/i18n/lift-core_es_ES.properties | 13 +++++++++ obp-api/src/main/webapp/index.html | 28 +++++++++---------- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/obp-api/src/main/resources/i18n/lift-core_es_ES.properties b/obp-api/src/main/resources/i18n/lift-core_es_ES.properties index cf3296df8..9db8de694 100644 --- a/obp-api/src/main/resources/i18n/lift-core_es_ES.properties +++ b/obp-api/src/main/resources/i18n/lift-core_es_ES.properties @@ -11,6 +11,19 @@ api_host = Host del API api_tester = Evaluador API view_api_explorer = Ver Explorador API get_api_key = Obten llave API +welcome_to = Bienvenido a la instancia de prueba del API Sandbox del Open Bank Project! + +Get_started = Empezar +Create_an_account = Crea una cuenta +Description_Create_an_account = En primer lugar, crea una cuenta de desarrollador gratuita en este sandbox y solicita una clave de desarrollador. En esta fase se te pedirá que envíes información básica sobre tu aplicación. +Connect_your_app = Conecta tu app +Connect_your_app_description = Utiliza nuestros SDKs para conectar tu aplicación a las APIs de Open Bank Project. Necesitarás tu clave de desarrollador, que deberías tener desde que creaste tu cuenta. Consulta todas las APIs disponibles en el Explorador de APIs, pero asegúrate de que estás utilizando la URL base correcta. +Test_your_app = Pruebe su aplicación con datos de clientes +Test_your_app_description = una vez que su aplicación esté conectada, puede probarla utilizando las credenciales del cliente de prueba. + + + +register_for_an_account = Registrar una cuenta nueva invalid.email.address = Invalid email address diff --git a/obp-api/src/main/webapp/index.html b/obp-api/src/main/webapp/index.html index 876d1cc5d..0bb4cb89f 100644 --- a/obp-api/src/main/webapp/index.html +++ b/obp-api/src/main/webapp/index.html @@ -31,12 +31,12 @@ Berlin 13359, Germany
    -

    Welcome to the Open Bank Project API Sandbox test instance!

    +

    Welcome to the Open Bank Project API Sandbox test instance!

    - View API Explorer + View API Explorer - Introduction + Introduction @@ -48,7 +48,7 @@ Berlin 13359, Germany
    -

    Get started

    +

    Get started

    @@ -57,10 +57,9 @@ Berlin 13359, Germany item-1
    -

    Create an account

    -

    First, create a free developer account on this sandbox and request a developer key. You will be asked - to submit basic information about your app at this stage. Register for - an account.

    +

    Create an account

    +

    First, create a free developer account on this sandbox and request a developer key. You will be asked to submit basic information about your app at this stage.Register for an account + .

    @@ -71,10 +70,10 @@ Berlin 13359, Germany item-2
    -

    Connect your app

    -

    Use our SDKs to connect your app to the Open Bank Project APIs. You’ll need your developer key, which +

    Connect your app

    +

    Use our SDKs to connect your app to the Open Bank Project APIs. You’ll need your developer key, which you should have from when you created your account. Check out all the available APIs on the API - Explorer, but make sure that you’re using the correct base URL.

    + Explorer, but make sure that you’re using the correct base URL.

    @@ -85,16 +84,17 @@ Berlin 13359, Germany item-3
    -

    Test your app using customer data

    +

    Test your app using customer data

    - Once your app is connected, you can test it using test customer credentials. + Once your app is connected, you can test it using test customer credentials. + View sandbox customer log ons.

    - Get API key + Get API key
    From 3a560fcafca846bda84a457e4bd04ae302064af8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Mon, 25 Jul 2022 12:02:09 +0200 Subject: [PATCH 44/80] bugfix/additional Spanish translations in the footer menu --- obp-api/src/main/webapp/index.html | 10 +++++----- .../src/main/webapp/templates-hidden/default.html | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/obp-api/src/main/webapp/index.html b/obp-api/src/main/webapp/index.html index 876d1cc5d..a06d1f0c2 100644 --- a/obp-api/src/main/webapp/index.html +++ b/obp-api/src/main/webapp/index.html @@ -34,9 +34,9 @@ Berlin 13359, Germany

    Welcome to the Open Bank Project API Sandbox test instance!

    - View API Explorer + View API Explorer - Introduction + Introduction @@ -316,7 +316,7 @@ Berlin 13359, Germany

    Get started building your application

    - Get API key + Get API key
    @@ -324,12 +324,12 @@ Berlin 13359, Germany

    For banks

    - API Manager + API Manager OBP CLI - API Tester + API Manager Hola
    diff --git a/obp-api/src/main/webapp/templates-hidden/default.html b/obp-api/src/main/webapp/templates-hidden/default.html index 99f37e211..3ab9fb804 100644 --- a/obp-api/src/main/webapp/templates-hidden/default.html +++ b/obp-api/src/main/webapp/templates-hidden/default.html @@ -186,7 +186,7 @@ Berlin 13359, Germany
  • @@ -207,12 +207,12 @@ Berlin 13359, Germany
    -

    Accountsaccounts chevron

    -

    Access to accounts (XS21) and cards. Provide fine-grained access to guests (auditor, accountant or public).

    +

    Accountsaccounts chevron

    +

    Access to accounts (XS21) and cards. Provide fine-grained access to guests (auditor, accountant or public).

    @@ -132,8 +132,8 @@ Berlin 13359, Germany src="/media/images/icons/apis/icon-branches.png" alt="branches"/>
    • -

    Branches, ATMs and ProductsBranches chevron

    -

    Access open data related to banks including branches and ATMs including geolocation and opening hours.

    +

    Branches, ATMs and ProductsBranches chevron

    +

    Access open data related to banks including branches and ATMs including geolocation and opening hours.

    @@ -148,8 +148,8 @@ Berlin 13359, Germany height="100" alt="transactions icon"/>
    -

    TransactionsTransactions chevron

    -

    Access the transaction history and transaction metadata.

    +

    TransactionsTransactions chevron

    +

    Access the transaction history and transaction metadata.

    @@ -161,9 +161,9 @@ Berlin 13359, Germany height="100" alt="metadata"/>
    -

    MetadataMetadata chevron

    -

    Enrich transactions and counterparties with metadata including geolocations, comments, pictures - and tags (e.g. category of spending).

    +

    MetadataMetadata chevron

    +

    Enrich transactions and counterparties with metadata including geolocations, comments, pictures + and tags (e.g. category of spending).

    @@ -180,9 +180,9 @@ Berlin 13359, Germany alt="counterparties"/>
    -

    CounterpartiesCounterparties chevron

    -

    Access the payers and payees of an account including metadata such as their aliases, labels, - logos and home pages.

    +

    MetadataCounterparties chevron

    +

    Access the payers and payees of an account including metadata such as their aliases, labels, + logos and home pages.

    @@ -192,8 +192,8 @@ Berlin 13359, Germany src="/media/images/icons/apis/icon-entitlements.png" alt="entitlements"/>
    -

    WebhooksWebhooks chevron

    -

    Call external web services based on Account events.

    +

    WebhooksWebhooks chevron

    +

    Call external web services based on Account events.

    @@ -205,8 +205,8 @@ Berlin 13359, Germany src="/media/images/icons/apis/icon-messages.png" alt="messages"/>
    -

    Customer onboarding and KYCCustomer onboarding and KYC chevron

    -

    Perform user, customer and account creation. Manage Know Your Customer (KYC) documents, media and status. Create customer meetings and messages.

    +

    Customer onboarding and KYCCustomer onboarding and KYC chevron

    +

    Perform user, customer and account creation. Manage Know Your Customer (KYC) documents, media and status. Create customer meetings and messages.

    @@ -217,8 +217,8 @@ Berlin 13359, Germany src="/media/images/icons/apis/icon-security.png" alt="security"/>
    -

    API Roles, Metrics and DocumentationAPI Roles, Metrics and Documentation chevron

    -

    Control access to endpoints, get API metrics and documentation.

    +

    API Roles, Metrics and DocumentationAPI Roles, Metrics and Documentation chevron

    +

    Control access to endpoints, get API metrics and documentation.

    @@ -231,8 +231,8 @@ Berlin 13359, Germany src="/media/images/icons/apis/icon-requests.png" alt="requests"/>
    -

    Payments & TransfersPayments & Transfers chevron

    -

    Initiate Transaction Requests (transfers and payments). View and confirm charges (as per PSD2). Answer strong customer authentication (SCA) challenges.

    +

    Payments & TransfersPayments & Transfers chevron

    +

    Initiate Transaction Requests (transfers and payments). View and confirm charges (as per PSD2). Answer strong customer authentication (SCA) challenges.

    @@ -241,8 +241,8 @@ Berlin 13359, Germany kyc
    -

    Search warehousekyc chevron

    -

    Perform advanced searches and statistics queries on the data warehouse.

    +

    Search warehousekyc chevron

    +

    Perform advanced searches and statistics queries on the data warehouse.

    From ef7bd08a80f52d527431b964514f537bbc182a23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Tue, 26 Jul 2022 10:51:20 +0200 Subject: [PATCH 48/80] feature/Enable Translatio of Explore APIs Section 2 --- obp-api/src/main/resources/i18n/lift-core_es_ES.properties | 1 + obp-api/src/main/webapp/index.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/obp-api/src/main/resources/i18n/lift-core_es_ES.properties b/obp-api/src/main/resources/i18n/lift-core_es_ES.properties index 4c51b7c34..0e4e0763e 100644 --- a/obp-api/src/main/resources/i18n/lift-core_es_ES.properties +++ b/obp-api/src/main/resources/i18n/lift-core_es_ES.properties @@ -21,6 +21,7 @@ view_api_explorer = Ver Explorador API get_api_key = Obten llave API # Explore APIs Section +explore_api_title = explore_api_title explore_api_accounts_title = Accounts explore_api_accounts = Access to accounts (XS21) and cards. Provide fine-grained access to guests (auditor, accountant or public). explore_api_branches_title = Branches, ATMs and Products diff --git a/obp-api/src/main/webapp/index.html b/obp-api/src/main/webapp/index.html index 2db39363b..449c7d8f7 100644 --- a/obp-api/src/main/webapp/index.html +++ b/obp-api/src/main/webapp/index.html @@ -112,7 +112,7 @@ Berlin 13359, Germany
    -

    Explore APIs

    +

    Explore APIs

    From da10e7e4fc8540920d781710faea150632126afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Tue, 26 Jul 2022 11:10:07 +0200 Subject: [PATCH 49/80] feature/Enable Translatio of Get Started Section --- .../resources/i18n/lift-core_es_ES.properties | 10 ++++++++ obp-api/src/main/webapp/index.html | 23 +++++++++---------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/obp-api/src/main/resources/i18n/lift-core_es_ES.properties b/obp-api/src/main/resources/i18n/lift-core_es_ES.properties index 0e4e0763e..87889f8b8 100644 --- a/obp-api/src/main/resources/i18n/lift-core_es_ES.properties +++ b/obp-api/src/main/resources/i18n/lift-core_es_ES.properties @@ -43,6 +43,16 @@ explore_api_payments = Initiate Transaction Requests (transfers and payments). V explore_api_warehouse_title = Search warehouse explore_api_warehouse = Perform advanced searches and statistics queries on the data warehouse. +# Get Started Section +get_started_title = Get started +get_started_create_account_title = Create an account +get_started_create_account = First, create a free developer account on this sandbox and request a developer key. You will be asked to submit basic information about your app at this stage. +get_started_create_account_sign_up = Register for an account +get_started_connect_your_app_title = Connect your app +get_started_connect_your_app = Use our SDKs to connect your app to the Open Bank Project APIs. You’ll need your developer key, which you should have from when you created your account. Check out all the available APIs on the API Explorer, but make sure that you’re using the correct base URL. +get_started_test_your_app_title = Test your app using customer data +get_started_test_your_app = Once your app is connected, you can test it using test customer credentials. +get_started_test_your_app_sandbox_date = View sandbox customer log ons. invalid.email.address = Invalid email address diff --git a/obp-api/src/main/webapp/index.html b/obp-api/src/main/webapp/index.html index 449c7d8f7..dcdac1e9f 100644 --- a/obp-api/src/main/webapp/index.html +++ b/obp-api/src/main/webapp/index.html @@ -48,7 +48,7 @@ Berlin 13359, Germany
    -

    Get started

    +

    Get started

    @@ -57,10 +57,10 @@ Berlin 13359, Germany item-1
    -

    Create an account

    -

    First, create a free developer account on this sandbox and request a developer key. You will be asked - to submit basic information about your app at this stage. Register for - an account.

    +

    Create an account

    +

    First, create a free developer account on this sandbox and request a developer key. You will be asked + to submit basic information about your app at this stage. Register for + an account.

    @@ -71,10 +71,10 @@ Berlin 13359, Germany item-2
    -

    Connect your app

    -

    Use our SDKs to connect your app to the Open Bank Project APIs. You’ll need your developer key, which +

    Connect your app

    +

    Use our SDKs to connect your app to the Open Bank Project APIs. You’ll need your developer key, which you should have from when you created your account. Check out all the available APIs on the API - Explorer, but make sure that you’re using the correct base URL.

    + Explorer, but make sure that you’re using the correct base URL.

    @@ -85,11 +85,10 @@ Berlin 13359, Germany item-3
    -

    Test your app using customer data

    -

    - Once your app is connected, you can test it using test customer credentials. +

    Test your app using customer data

    +

    Once your app is connected, you can test it using test customer credentials. View sandbox customer log ons. + href="https://github.com/OpenBankProject/OBP-API/wiki/">View sandbox customer log ons.

    From c69da95015583dd6cfcfa48bf87e95ab5f174f66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Tue, 26 Jul 2022 11:10:33 +0200 Subject: [PATCH 50/80] bugfix/Enable Translatio of Explore APIs Section 2 --- obp-api/src/main/resources/i18n/lift-core_es_ES.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/obp-api/src/main/resources/i18n/lift-core_es_ES.properties b/obp-api/src/main/resources/i18n/lift-core_es_ES.properties index 87889f8b8..70265698d 100644 --- a/obp-api/src/main/resources/i18n/lift-core_es_ES.properties +++ b/obp-api/src/main/resources/i18n/lift-core_es_ES.properties @@ -21,7 +21,7 @@ view_api_explorer = Ver Explorador API get_api_key = Obten llave API # Explore APIs Section -explore_api_title = explore_api_title +explore_api_title = Explore APIs explore_api_accounts_title = Accounts explore_api_accounts = Access to accounts (XS21) and cards. Provide fine-grained access to guests (auditor, accountant or public). explore_api_branches_title = Branches, ATMs and Products From f880c008b43aab615b7e8b2f2a471a6f0b74843e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mili=C4=87?= Date: Tue, 26 Jul 2022 12:44:34 +0200 Subject: [PATCH 51/80] feature/Enable Translatio of Get Started Section 2 --- .../resources/i18n/lift-core_es_ES.properties | 22 ++++++------------- obp-api/src/main/webapp/index.html | 14 ++++++------ 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/obp-api/src/main/resources/i18n/lift-core_es_ES.properties b/obp-api/src/main/resources/i18n/lift-core_es_ES.properties index ac0345ca1..44cf0ca25 100644 --- a/obp-api/src/main/resources/i18n/lift-core_es_ES.properties +++ b/obp-api/src/main/resources/i18n/lift-core_es_ES.properties @@ -21,14 +21,6 @@ view_api_explorer = Ver Explorador API get_api_key = Obten llave API welcome_to = Bienvenido a la instancia de prueba del API Sandbox del Open Bank Project! -Get_started = Empezar -Create_an_account = Crea una cuenta -Description_Create_an_account = En primer lugar, crea una cuenta de desarrollador gratuita en este sandbox y solicita una clave de desarrollador. En esta fase se te pedirá que envíes información básica sobre tu aplicación. -Connect_your_app = Conecta tu app -Connect_your_app_description = Utiliza nuestros SDKs para conectar tu aplicación a las APIs de Open Bank Project. Necesitarás tu clave de desarrollador, que deberías tener desde que creaste tu cuenta. Consulta todas las APIs disponibles en el Explorador de APIs, pero asegúrate de que estás utilizando la URL base correcta. -Test_your_app = Pruebe su aplicación con datos de clientes -Test_your_app_description = una vez que su aplicación esté conectada, puede probarla utilizando las credenciales del cliente de prueba. - register_for_an_account = Registrar una cuenta nueva @@ -57,14 +49,14 @@ explore_api_warehouse_title = Search warehouse explore_api_warehouse = Perform advanced searches and statistics queries on the data warehouse. # Get Started Section -get_started_title = Get started -get_started_create_account_title = Create an account -get_started_create_account = First, create a free developer account on this sandbox and request a developer key. You will be asked to submit basic information about your app at this stage. +get_started_title = Empezar +get_started_create_account_title = Crea una cuenta +get_started_create_account = En primer lugar, crea una cuenta de desarrollador gratuita en este sandbox y solicita una clave de desarrollador. En esta fase se te pedir\u00e1 que env\u00edes informaci\u00f3n b\u00e1sica sobre tu aplicaci\u00f3n. get_started_create_account_sign_up = Register for an account -get_started_connect_your_app_title = Connect your app -get_started_connect_your_app = Use our SDKs to connect your app to the Open Bank Project APIs. You’ll need your developer key, which you should have from when you created your account. Check out all the available APIs on the API Explorer, but make sure that you’re using the correct base URL. -get_started_test_your_app_title = Test your app using customer data -get_started_test_your_app = Once your app is connected, you can test it using test customer credentials. +get_started_connect_your_app_title = Conecta tu app +get_started_connect_your_app = Utiliza nuestros SDKs para conectar tu aplicaci\u00f3n a las APIs de Open Bank Project. Necesitar\u00e1s tu clave de desarrollador, que deber\u00edas tener desde que creaste tu cuenta. Consulta todas las APIs disponibles en el Explorador de APIs, pero aseg\u00farate de que est\u00e1s utilizando la URL base correcta. +get_started_test_your_app_title = Pruebe su aplicaci\u00f3n con datos de clientes +get_started_test_your_app = Una vez que su aplicaci\u00f3n est\u00e9 conectada, puede probarla utilizando las credenciales del cliente de prueba. get_started_test_your_app_sandbox_date = View sandbox customer log ons. diff --git a/obp-api/src/main/webapp/index.html b/obp-api/src/main/webapp/index.html index 995925883..f0832424a 100644 --- a/obp-api/src/main/webapp/index.html +++ b/obp-api/src/main/webapp/index.html @@ -48,7 +48,7 @@ Berlin 13359, Germany
    -

    Get started

    +

    Get started

    @@ -57,8 +57,8 @@ Berlin 13359, Germany item-1
    -

    Create an account

    -

    First, create a free developer account on this sandbox and request a developer key. You will be asked to submit basic information about your app at this stage.Register for an account +

    Create an account

    +

    First, create a free developer account on this sandbox and request a developer key. You will be asked to submit basic information about your app at this stage.Register for an account .

    @@ -70,8 +70,8 @@ Berlin 13359, Germany item-2
    -

    Connect your app

    -

    Use our SDKs to connect your app to the Open Bank Project APIs. You’ll need your developer key, which +

    Connect your app

    +

    Use our SDKs to connect your app to the Open Bank Project APIs. You’ll need your developer key, which you should have from when you created your account. Check out all the available APIs on the API Explorer, but make sure that you’re using the correct base URL.

    @@ -84,12 +84,12 @@ Berlin 13359, Germany item-3
    -

    Test your app using customer data

    +

    Test your app using customer data

    Once your app is connected, you can test it using test customer credentials. View sandbox customer log ons. + href="https://github.com/OpenBankProject/OBP-API/wiki/">View sandbox customer log ons.

    From 33f851b411d9d347db1d6493e6815713d5855039 Mon Sep 17 00:00:00 2001 From: CristhTejada Date: Tue, 26 Jul 2022 22:45:38 -0600 Subject: [PATCH 52/80] Extra translations have been added to the API Explorer and Login page. --- .../resources/i18n/lift-core_es_ES.properties | 50 +++++++++++-------- .../main/webapp/templates-hidden/_login.html | 16 +++--- 2 files changed, 37 insertions(+), 29 deletions(-) diff --git a/obp-api/src/main/resources/i18n/lift-core_es_ES.properties b/obp-api/src/main/resources/i18n/lift-core_es_ES.properties index be856751e..0612c5419 100644 --- a/obp-api/src/main/resources/i18n/lift-core_es_ES.properties +++ b/obp-api/src/main/resources/i18n/lift-core_es_ES.properties @@ -5,8 +5,8 @@ # be automated using tools like native2ascii # https://native2ascii.net/ # This tool will allow you to convert national language characters to and from their Unicode equivalents in plain ASCII text. -api.explorer = Explorador API -api_explorer = Explorador API +api.explorer = API Explorer +api_explorer = API Explorer api_manager = Gestor API introduction = Introducci\u00f3n support = Soporte @@ -17,7 +17,7 @@ privacy_policy = Pol\u00edtica de privacidad api_documentation = Documentaci\u00f3n API api_host = Host del API api_tester = Evaluador API -view_api_explorer = Ver Explorador API +view_api_explorer = Ver API Explorer get_api_key = Obten llave API welcome_to = Bienvenido a la instancia de prueba del API Sandbox del Open Bank Project! @@ -34,29 +34,37 @@ Test_your_app_description = una vez que su aplicaci register_for_an_account = Registrar una cuenta nueva # Explore APIs Section -explore_api_title = explore_api_title -explore_api_accounts_title = Accounts -explore_api_accounts = Access to accounts (XS21) and cards. Provide fine-grained access to guests (auditor, accountant or public). -explore_api_branches_title = Branches, ATMs and Products -explore_api_branches = Access open data related to banks including branches and ATMs including geolocation and opening hours. -explore_api_transactions_title = Transactions -explore_api_transactions = Access the transaction history and transaction metadata. +explore_api_title = Explorar los titulos de las API +explore_api_accounts_title = Cuentas +explore_api_accounts = Acceso a cuentas (XS21) y tarjetas. Proporcionar acceso de grano fino a los invitados (auditor, contable o público). +explore_api_branches_title = Sucursales, cajeros y productos +explore_api_branches = Acceda a los datos abiertos relacionados con los bancos, incluidas las sucursales y los cajeros automáticos, así como la geolocalización y los horarios de apertura. +explore_api_transactions_title = Transacciones +explore_api_transactions = Acceda al historial de transacciones y a los metadatos de las mismas. explore_api_metadata_title = Metadata -explore_api_metadata = Enrich transactions and counterparties with metadata including geolocations, comments, pictures and tags (e.g. category of spending). +explore_api_metadata = Enriquezca las transacciones y las contrapartes con metadatos que incluyan geolocalizaciones, comentarios, imágenes y etiquetas (por ejemplo, categoría de gasto). explore_api_counterparties_title = Metadata -explore_api_counterparties = Access the payers and payees of an account including metadata such as their aliases, labels, logos and home pages. +explore_api_counterparties = Acceda a los pagadores y beneficiarios de una cuenta, incluyendo metadatos como sus alias, etiquetas, logotipos y páginas de inicio. explore_api_webhooks_title = Webhooks -explore_api_webhooks = Call external web services based on Account events. -explore_api_customer_title = Customer onboarding and KYC -explore_api_customer = Perform user, customer and account creation. Manage Know Your Customer (KYC) documents, media and status. Create customer meetings and messages. -explore_api_roles_title = API Roles, Metrics and Documentation -explore_api_roles = Control access to endpoints, get API metrics and documentation. -explore_api_payments_title = Payments & Transfers -explore_api_payments = Initiate Transaction Requests (transfers and payments). View and confirm charges (as per PSD2). Answer strong customer authentication (SCA) challenges. -explore_api_warehouse_title = Search warehouse -explore_api_warehouse = Perform advanced searches and statistics queries on the data warehouse. +explore_api_webhooks = Llamar a servicios web externos basados en eventos de la Cuenta. +explore_api_customer_title = Incorporación de clientes y KYC +explore_api_customer = Realizar la creación de usuarios, clientes y cuentas. Gestionar los documentos, los medios y el estado de Conozca a su Cliente (KYC). Crear reuniones y mensajes de clientes. +explore_api_roles_title = Funciones, métricas y documentación de la API +explore_api_roles = Controle el acceso a los puntos finales, obtenga métricas y documentación de la API. +explore_api_payments_title = Pagos y transferencias +explore_api_payments = Iniciar solicitudes de transacciones (transferencias y pagos). Ver y confirmar cargos (según la PSD2). Responder a los retos de autenticación fuerte del cliente (SCA). +explore_api_warehouse_title = Buscar en el almacén +explore_api_warehouse = Realice búsquedas avanzadas y consultas estadísticas en el almacén de datos. +username = Nombre de usuario +logontext = Acceda a la API del Open Bank Project +passwordlog = Contraseña +Forgotten_password = ¿Has olvidado tu contraseña? +don't_have_account = ¿No Tienes una cuenta? +or_login_with_openid = o conéctate con OpenID +or = o + invalid.email.address = Invalid email address password.must.be.set = Password must be set diff --git a/obp-api/src/main/webapp/templates-hidden/_login.html b/obp-api/src/main/webapp/templates-hidden/_login.html index 4517637b6..d76df7c2f 100644 --- a/obp-api/src/main/webapp/templates-hidden/_login.html +++ b/obp-api/src/main/webapp/templates-hidden/_login.html @@ -1,19 +1,19 @@
    -

    Log on to the Open Bank Project API

    +

    Log on to the Open Bank Project API

    Special Instructions