Merge pull request #2652 from constantine2nd/develop

Warnings, webui prop
This commit is contained in:
Simon Redfern 2026-01-13 12:11:46 +01:00 committed by GitHub
commit f10a070a07
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
131 changed files with 236 additions and 107 deletions

View File

@ -624,6 +624,14 @@ webui_agree_terms_url =
#webui_post_consumer_registration_more_info_text = Please tell us more your Application and / or Startup using this link.
#webui_post_consumer_registration_submit_button_value=Register consumer
# OBP Portal URL - base URL for the OBP Portal service
webui_obp_portal_url = http://localhost:5174
# External Consumer Registration URL - used to redirect "Get API Key" links to an external service
# If not set, defaults to webui_obp_portal_url + "/consumer-registration"
# Set this to redirect to a custom URL for consumer registration
webui_external_consumer_registration_url = http://localhost:5174/consumer-registration
## Display For Banks section
webui_display_for_banks_section = true

View File

@ -1,5 +1,7 @@
package code.api.AUOpenBanking.v1_0_0
import scala.language.reflectiveCalls
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.AUOpenBanking.v1_0_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil.{defaultBankId, _}
import code.api.util.ApiTag._

View File

@ -1,5 +1,7 @@
package code.api.AUOpenBanking.v1_0_0
import scala.language.reflectiveCalls
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,7 @@
package code.api.AUOpenBanking.v1_0_0
import scala.language.reflectiveCalls
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,7 @@
package code.api.AUOpenBanking.v1_0_0
import scala.language.reflectiveCalls
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,7 @@
package code.api.AUOpenBanking.v1_0_0
import scala.language.reflectiveCalls
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,7 @@
package code.api.AUOpenBanking.v1_0_0
import scala.language.reflectiveCalls
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.AUOpenBanking.v1_0_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,7 @@
package code.api.AUOpenBanking.v1_0_0
import scala.language.reflectiveCalls
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.BahrainOBF.v1_0_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.BahrainOBF.v1_0_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.BahrainOBF.v1_0_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.BahrainOBF.v1_0_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.BahrainOBF.v1_0_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.BahrainOBF.v1_0_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.BahrainOBF.v1_0_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.BahrainOBF.v1_0_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.BahrainOBF.v1_0_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.BahrainOBF.v1_0_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.BahrainOBF.v1_0_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.BahrainOBF.v1_0_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.BahrainOBF.v1_0_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.BahrainOBF.v1_0_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.BahrainOBF.v1_0_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.BahrainOBF.v1_0_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.BahrainOBF.v1_0_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.BahrainOBF.v1_0_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.BahrainOBF.v1_0_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.BahrainOBF.v1_0_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.BahrainOBF.v1_0_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,7 @@
package code.api.MxOF
import scala.language.reflectiveCalls
import scala.language.implicitConversions
import code.api.Constant
import code.api.MxOF.JSONFactory_MXOF_0_0_1.createGetAtmsResponse
import code.api.util.APIUtil._

View File

@ -27,6 +27,8 @@ TESOBE (http://www.tesobe.com/)
package code.api
import scala.language.reflectiveCalls
import scala.language.implicitConversions
import code.api.Constant._
import code.api.OAuthHandshake._
import code.api.util.APIUtil._

View File

@ -1,5 +1,6 @@
package code.api.Polish.v2_1_1_1
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.Polish.v2_1_1_1
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.Polish.v2_1_1_1
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.Polish.v2_1_1_1
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.ResourceDocs1_4_0
import scala.language.reflectiveCalls
import code.api.Constant.HostName
import code.api.OBPRestHelper
import code.api.cache.Caching
@ -16,7 +17,7 @@ import net.liftweb.http.{GetRequest, InMemoryResponse, PlainTextResponse, Req, S
object ResourceDocs140 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
val version = ApiVersion.v1_4_0 // "1.4.0" // We match other api versions so API explorer can easily use the path.
val versionStatus = ApiVersionStatus.STABLE.toString
val routes = List(
val routes: Seq[OBPEndpoint] = List(
ImplementationsResourceDocs.getResourceDocsObp,
ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
ImplementationsResourceDocs.getResourceDocsSwagger,
@ -31,7 +32,7 @@ object ResourceDocs140 extends OBPRestHelper with ResourceDocsAPIMethods with Md
object ResourceDocs200 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
val version = ApiVersion.v2_0_0 // "2.0.0" // We match other api versions so API explorer can easily use the path.
val versionStatus = ApiVersionStatus.STABLE.toString
val routes = List(
val routes: Seq[OBPEndpoint] = List(
ImplementationsResourceDocs.getResourceDocsObp,
ImplementationsResourceDocs.getResourceDocsSwagger,
ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
@ -46,7 +47,7 @@ object ResourceDocs200 extends OBPRestHelper with ResourceDocsAPIMethods with Md
object ResourceDocs210 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
val version: ApiVersion = ApiVersion.v2_1_0 // "2.1.0" // We match other api versions so API explorer can easily use the path.
val versionStatus = ApiVersionStatus.STABLE.toString
val routes = List(
val routes: Seq[OBPEndpoint] = List(
ImplementationsResourceDocs.getResourceDocsObp,
ImplementationsResourceDocs.getResourceDocsSwagger,
ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
@ -60,7 +61,7 @@ object ResourceDocs210 extends OBPRestHelper with ResourceDocsAPIMethods with Md
object ResourceDocs220 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
val version: ApiVersion = ApiVersion.v2_2_0 // "2.2.0" // We match other api versions so API explorer can easily use the path.
val versionStatus = ApiVersionStatus.STABLE.toString
val routes = List(
val routes: Seq[OBPEndpoint] = List(
ImplementationsResourceDocs.getResourceDocsObp,
ImplementationsResourceDocs.getResourceDocsSwagger,
ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
@ -74,7 +75,7 @@ object ResourceDocs220 extends OBPRestHelper with ResourceDocsAPIMethods with Md
object ResourceDocs300 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
val version : ApiVersion = ApiVersion.v3_0_0 // = "3.0.0" // We match other api versions so API explorer can easily use the path.
val versionStatus = ApiVersionStatus.STABLE.toString
val routes = List(
val routes: Seq[OBPEndpoint] = List(
ImplementationsResourceDocs.getResourceDocsObp,
ImplementationsResourceDocs.getResourceDocsSwagger,
ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
@ -87,7 +88,7 @@ object ResourceDocs300 extends OBPRestHelper with ResourceDocsAPIMethods with Md
object ResourceDocs310 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
val version: ApiVersion = ApiVersion.v3_1_0 // = "3.0.0" // We match other api versions so API explorer can easily use the path.
val versionStatus = ApiVersionStatus.STABLE.toString
val routes = List(
val routes: Seq[OBPEndpoint] = List(
ImplementationsResourceDocs.getResourceDocsObp,
ImplementationsResourceDocs.getResourceDocsSwagger,
ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
@ -102,7 +103,7 @@ object ResourceDocs300 extends OBPRestHelper with ResourceDocsAPIMethods with Md
object ResourceDocs400 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
val version: ApiVersion = ApiVersion.v4_0_0 // = "4.0.0" // We match other api versions so API explorer can easily use the path.
val versionStatus = ApiVersionStatus.STABLE.toString
val routes = List(
val routes: Seq[OBPEndpoint] = List(
ImplementationsResourceDocs.getResourceDocsObpV400,
ImplementationsResourceDocs.getResourceDocsSwagger,
ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
@ -117,7 +118,7 @@ object ResourceDocs300 extends OBPRestHelper with ResourceDocsAPIMethods with Md
object ResourceDocs500 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
val version: ApiVersion = ApiVersion.v5_0_0
val versionStatus = ApiVersionStatus.STABLE.toString
val routes = List(
val routes: Seq[OBPEndpoint] = List(
ImplementationsResourceDocs.getResourceDocsObpV400,
ImplementationsResourceDocs.getResourceDocsSwagger,
ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
@ -132,7 +133,7 @@ object ResourceDocs300 extends OBPRestHelper with ResourceDocsAPIMethods with Md
object ResourceDocs510 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
val version: ApiVersion = ApiVersion.v5_1_0
val versionStatus = ApiVersionStatus.BLEEDING_EDGE.toString
val routes = List(
val routes: Seq[OBPEndpoint] = List(
ImplementationsResourceDocs.getResourceDocsObpV400,
ImplementationsResourceDocs.getResourceDocsSwagger,
ImplementationsResourceDocs.getBankLevelDynamicResourceDocsObp,
@ -148,7 +149,7 @@ object ResourceDocs300 extends OBPRestHelper with ResourceDocsAPIMethods with Md
object ResourceDocs600 extends OBPRestHelper with ResourceDocsAPIMethods with MdcLoggable {
val version: ApiVersion = ApiVersion.v6_0_0
val versionStatus = ApiVersionStatus.BLEEDING_EDGE.toString
val routes = List(
val routes: Seq[OBPEndpoint] = List(
ImplementationsResourceDocs.getResourceDocsObpV400,
ImplementationsResourceDocs.getResourceDocsSwagger,
ImplementationsResourceDocs.getResourceDocsOpenAPI31,

View File

@ -39,6 +39,7 @@ import net.liftweb.json.JsonAST.{JField, JString, JValue}
import net.liftweb.json._
import java.util.concurrent.ConcurrentHashMap
import scala.collection.immutable
import scala.collection.immutable.{List, Nil}
import scala.concurrent.Future
@ -471,7 +472,7 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth
case true => authenticatedAccess(cc) // If set resource_docs_requires_role=true, we need check the authentication
}
_ <- resourceDocsRequireRole match {
case false => Future()
case false => Future(())
case true => // If set resource_docs_requires_role=true, we need check the roles as well
NewStyle.function.hasAtLeastOneEntitlement(failMsg = UserHasMissingRoles + canReadResourceDoc.toString)("", u.map(_.userId).getOrElse(""), ApiRole.canReadResourceDoc :: Nil, cc.callContext)
}
@ -595,7 +596,7 @@ trait ResourceDocsAPIMethods extends MdcLoggable with APIMethods220 with APIMeth
}
(_, callContext) <- NewStyle.function.getBank(BankId(bankId), Option(cc))
_ <- resourceDocsRequireRole match {
case false => Future()
case false => Future(())
case true => // If set resource_docs_requires_role=true, we need check the the roles as well
NewStyle.function.hasAtLeastOneEntitlement(failMsg = UserHasMissingRoles + ApiRole.canReadDynamicResourceDocsAtOneBank.toString)(
bankId, u.map(_.userId).getOrElse(""), ApiRole.canReadDynamicResourceDocsAtOneBank::Nil, cc.callContext

View File

@ -1,5 +1,6 @@
package code.api.ResourceDocs1_4_0
import scala.language.implicitConversions
import code.api.Constant
import code.api.Constant._
import code.api.UKOpenBanking.v2_0_0.JSONFactory_UKOpenBanking_200

View File

@ -889,7 +889,7 @@ object SwaggerJSONFactory extends MdcLoggable {
* @return a list of include original list and nested objects
*/
private def getAllEntities(entities: List[AnyRef]) = {
val notNullEntities = entities.filter(null !=)
val notNullEntities = entities.filter(null.!=)
val notSupportYetEntity = entities.filter(_.getClass.getSimpleName.equals(NotSupportedYet.getClass.getSimpleName.replace("$","")))
val existsEntityTypes: Set[universe.Type] = notNullEntities.map(ReflectUtils.getType).toSet
@ -919,10 +919,10 @@ object SwaggerJSONFactory extends MdcLoggable {
val entityType = ReflectUtils.getType(obj)
val constructorParamList = ReflectUtils.getPrimaryConstructor(entityType).paramLists.headOption.getOrElse(Nil)
// if exclude current obj, the result list tail will be Nil
val resultTail = if(excludeTypes.exists(entityType =:=)) Nil else List(obj)
val resultTail = if(excludeTypes.exists(entityType.=:=)) Nil else List(obj)
val refValues: List[Any] = constructorParamList
.filter(it => isSwaggerRefType(it.info) && !excludeTypes.exists(_ =:= it.info))
.filter(it => isSwaggerRefType(it.info) && !excludeTypes.exists(_.=:=(it.info)))
.map(it => {
val paramName = it.name.toString
val value = ReflectUtils.invokeMethod(obj, paramName)
@ -1009,7 +1009,7 @@ object SwaggerJSONFactory extends MdcLoggable {
val errorMessages: Set[AnyRef] = resourceDocList.flatMap(_.error_response_bodies).toSet
val errorDefinitions = ErrorMessages.allFields
.filterNot(null ==)
.filterNot(null.==)
.filter(it => errorMessages.contains(it._2))
.toList
.map(it => {

View File

@ -1,5 +1,6 @@
package code.api.STET.v1_4
import scala.language.implicitConversions
import code.api.APIFailureNewStyle
import code.api.STET.v1_4.JSONFactory_STET_1_4._
import code.api.berlin.group.v1_3.JvalueCaseClass

View File

@ -1,5 +1,6 @@
package code.api.STET.v1_4
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.STET.v1_4
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.UKOpenBanking.v3_1_0
import scala.language.implicitConversions
import code.api.Constant
import code.api.UKOpenBanking.v3_1_0.JSONFactory_UKOpenBanking_310.ConsentPostBodyUKV310
import code.api.berlin.group.v1_3.JvalueCaseClass

View File

@ -1,5 +1,6 @@
package code.api.UKOpenBanking.v3_1_0
import scala.language.implicitConversions
import code.api.Constant
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._

View File

@ -1,5 +1,6 @@
package code.api.UKOpenBanking.v3_1_0
import scala.language.implicitConversions
import code.api.Constant
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._

View File

@ -1,5 +1,6 @@
package code.api.UKOpenBanking.v3_1_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.UKOpenBanking.v3_1_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.UKOpenBanking.v3_1_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.UKOpenBanking.v3_1_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.UKOpenBanking.v3_1_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.UKOpenBanking.v3_1_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.UKOpenBanking.v3_1_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.UKOpenBanking.v3_1_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.UKOpenBanking.v3_1_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.UKOpenBanking.v3_1_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.UKOpenBanking.v3_1_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.UKOpenBanking.v3_1_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.UKOpenBanking.v3_1_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.UKOpenBanking.v3_1_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.UKOpenBanking.v3_1_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.UKOpenBanking.v3_1_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil._
import code.api.util.ApiTag

View File

@ -1,5 +1,6 @@
package code.api.UKOpenBanking.v3_1_0
import scala.language.implicitConversions
import code.api.berlin.group.v1_3.JvalueCaseClass
import code.api.util.APIUtil.{defaultBankId, _}
import code.api.util.ApiTag._

View File

@ -1,5 +1,6 @@
package code.api.builder.AccountInformationServiceAISApi
import scala.language.implicitConversions
import code.api.APIFailureNewStyle
import code.api.Constant.{SYSTEM_READ_ACCOUNTS_BERLIN_GROUP_VIEW_ID, SYSTEM_READ_BALANCES_BERLIN_GROUP_VIEW_ID, SYSTEM_READ_TRANSACTIONS_BERLIN_GROUP_VIEW_ID}
import code.api.berlin.group.ConstantsBG

View File

@ -1,5 +1,6 @@
package code.api.builder.CommonServicesApi
import scala.language.implicitConversions
import code.api.berlin.group.ConstantsBG
import code.api.berlin.group.v1_3.{JvalueCaseClass, OBP_BERLIN_GROUP_1_3}
import code.api.builder.AccountInformationServiceAISApi.APIMethods_AccountInformationServiceAISApi

View File

@ -1,5 +1,6 @@
package code.api.builder.ConfirmationOfFundsServicePIISApi
import scala.language.implicitConversions
import code.api.berlin.group.ConstantsBG
import code.api.berlin.group.v1_3.JSONFactory_BERLIN_GROUP_1_3._
import code.api.berlin.group.v1_3.{JvalueCaseClass, OBP_BERLIN_GROUP_1_3}

View File

@ -1,5 +1,6 @@
package code.api.builder.PaymentInitiationServicePISApi
import scala.language.implicitConversions
import code.api.berlin.group.ConstantsBG
import code.api.berlin.group.v1_3.JSONFactory_BERLIN_GROUP_1_3.{CancelPaymentResponseJson, CancelPaymentResponseLinks, LinkHrefJson, UpdatePaymentPsuDataJson, checkAuthorisationConfirmation, checkSelectPsuAuthenticationMethod, checkTransactionAuthorisation, checkUpdatePsuAuthentication, createCancellationTransactionRequestJson}
import code.api.berlin.group.v1_3.model.TransactionStatus.mapTransactionStatus

View File

@ -1,5 +1,6 @@
package code.api.builder.SigningBasketsApi
import scala.language.implicitConversions
import code.api.berlin.group.ConstantsBG
import code.api.berlin.group.v1_3.JSONFactory_BERLIN_GROUP_1_3.{PostSigningBasketJsonV13, UpdatePaymentPsuDataJson, createSigningBasketResponseJson, createStartSigningBasketAuthorisationJson, getSigningBasketResponseJson, getSigningBasketStatusResponseJson}
import code.api.berlin.group.v1_3.{JSONFactory_BERLIN_GROUP_1_3, JvalueCaseClass}

View File

@ -1,5 +1,6 @@
package code.api.dynamic.endpoint.helper
import scala.language.implicitConversions
import code.api.util.APIUtil.{OBPEndpoint, OBPReturnType, futureToBoxedResponse, scalaFutureToLaFuture}
import code.api.util.DynamicUtil.{Sandbox, Validation}
import code.api.util.{CallContext, CustomJsonFormats, DynamicUtil}
@ -34,7 +35,7 @@ trait DynamicCompileEndpoint {
}
private def validateDependencies() = {
val dependencies = DynamicUtil.getDynamicCodeDependentMethods(this.getClass, "process" == )
val dependencies = DynamicUtil.getDynamicCodeDependentMethods(this.getClass, "process".==)
Validation.validateDependency(dependencies)
}
}

View File

@ -1,5 +1,6 @@
package code.api.dynamic.endpoint.helper
import scala.language.existentials
import org.apache.pekko.http.scaladsl.model.{HttpMethods, HttpMethod => PekkoHttpMethod}
import code.DynamicData.{DynamicDataProvider, DynamicDataT}
import code.DynamicEndpoint.{DynamicEndpointProvider, DynamicEndpointT}
@ -677,7 +678,7 @@ object DynamicEndpointHelper extends RestHelper {
schemas += schema
}
// check whether this schema already recurse two times
if(schemas.count(schema ==) > 3) {
if(schemas.count(schema.==) > 3) {
return JObject(Nil)
}

View File

@ -26,6 +26,9 @@ TESOBE (http://www.tesobe.com/)
*/
package code.api.util
import scala.language.implicitConversions
import scala.language.reflectiveCalls
import bootstrap.liftweb.CustomDBVendor
import cats.effect.IO
import code.accountholders.AccountHolders
@ -1767,9 +1770,9 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{
private val reversedRequestUrl = requestUrlPartPath.reverse
def getPathParams(url: List[String]): Map[String, String] =
reversedRequestUrl.zip(url.reverse) collect {
reversedRequestUrl.zip(url.reverse).collect {
case pair @(k, _) if isPathVariable(k) => pair
} toMap
}.toMap
/**
* According errorResponseBodies whether contains UserNotLoggedIn and UserHasMissingRoles do validation.
@ -4026,7 +4029,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{
def parseDate(date: String): Option[Date] = {
val currentSupportFormats = List(DateWithDayFormat, DateWithSecondsFormat, DateWithMsFormat, DateWithMsRollbackFormat)
val parsePosition = new ParsePosition(0)
currentSupportFormats.toStream.map(_.parse(date, parsePosition)).find(null !=)
currentSupportFormats.toStream.map(_.parse(date, parsePosition)).find(null.!=)
}
private def passesPsd2ServiceProviderCommon(cc: Option[CallContext], serviceProvider: String) = {
@ -4422,7 +4425,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{
private def getClassPool(classLoader: ClassLoader) = {
import scala.concurrent.duration._
Caching.memoizeSyncWithImMemory(Some(classLoader.toString()))(DurationInt(30) days) {
Caching.memoizeSyncWithImMemory(Some(classLoader.toString()))(DurationInt(30).days) {
val classPool: ClassPool = ClassPool.getDefault
classPool.appendClassPath(new LoaderClassPath(classLoader))
classPool
@ -4523,7 +4526,7 @@ object APIUtil extends MdcLoggable with CustomJsonFormats{
*/
def getObpTrace(clazzName: String, methodName: String, signature: String, exclude: List[(String, String, String)] = Nil): List[(String, String, String)] = {
import scala.concurrent.duration._
Caching.memoizeSyncWithImMemory(Some(clazzName + methodName + signature))(DurationInt(30) days) {
Caching.memoizeSyncWithImMemory(Some(clazzName + methodName + signature))(DurationInt(30).days) {
// List:: className->methodName->signature, find all the dependent methods for one
val methods = getDependentMethods(clazzName, methodName, signature)

View File

@ -32,11 +32,12 @@ object AfterApiAuth extends MdcLoggable{
*/
def innerLoginUserInitAction(authUser: Box[AuthUser]) = {
authUser.map { u => // Init actions
logger.info("AfterApiAuth.innerLoginUserInitAction started successfully")
logger.debug("AfterApiAuth.innerLoginUserInitAction started successfully")
sofitInitAction(u)
} match {
case Full(_) => logger.warn("AfterApiAuth.innerLoginUserInitAction completed successfully")
case userInitActionFailure => logger.warn("AfterApiAuth.innerLoginUserInitAction: " + userInitActionFailure)
case Full(_) => logger.debug("AfterApiAuth.innerLoginUserInitAction completed successfully")
case Empty => // Init actions are not started at all
case userInitActionFailure => logger.error("AfterApiAuth.innerLoginUserInitAction: " + userInitActionFailure)
}
}
/**

View File

@ -3160,7 +3160,7 @@ object NewStyle extends MdcLoggable{
var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString)
CacheKeyFromArguments.buildCacheKey {
Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(methodRoutingTTL second) {
Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(methodRoutingTTL.second) {
MethodRoutingProvider.connectorMethodProvider.vend.getMethodRoutings(methodName, isBankIdExactMatch, bankIdPattern)
}
}
@ -3213,7 +3213,7 @@ object NewStyle extends MdcLoggable{
var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString)
CacheKeyFromArguments.buildCacheKey {
Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(endpointMappingTTL second) {
Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(endpointMappingTTL.second) {
{(EndpointMappingProvider.endpointMappingProvider.vend.getAllEndpointMappings(bankId), callContext)}
}
}
@ -3327,7 +3327,7 @@ object NewStyle extends MdcLoggable{
var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString)
CacheKeyFromArguments.buildCacheKey {
Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(dynamicEntityTTL second) {
Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(dynamicEntityTTL.second) {
DynamicEntityProvider.connectorMethodProvider.vend.getDynamicEntities(bankId, returnBothBankAndSystemLevel)
}
}
@ -3338,7 +3338,7 @@ object NewStyle extends MdcLoggable{
var cacheKey = (randomUUID().toString, randomUUID().toString, randomUUID().toString)
CacheKeyFromArguments.buildCacheKey {
Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(dynamicEntityTTL second) {
Caching.memoizeSyncWithProvider(Some(cacheKey.toString()))(dynamicEntityTTL.second) {
DynamicEntityProvider.connectorMethodProvider.vend.getDynamicEntitiesByUserId(userId: String)
}
}

View File

@ -76,7 +76,7 @@ trait APIMethods121 {
def checkIfLocationPossible(lat:Double,lon:Double) : Box[Unit] = {
if(scala.math.abs(lat) <= 90 & scala.math.abs(lon) <= 180)
Full()
Full(())
else
Failure("Coordinates not possible")
}
@ -132,7 +132,7 @@ trait APIMethods121 {
cc =>
implicit val ec = EndpointContext(Some(cc))
for {
_ <- Future() // Just start async call
_ <- Future(()) // Just start async call
} yield {
(JSONFactory.getApiInfoJSON(apiVersion,apiVersionStatus), HttpCode.`200`(cc.callContext))
}

View File

@ -26,6 +26,8 @@ TESOBE (http://www.tesobe.com/)
*/
package code.api.v1_2_1
import scala.language.implicitConversions
import scala.language.reflectiveCalls
import code.api.OBPRestHelper
import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints}
import com.openbankproject.commons.util.{ApiVersion,ApiVersionStatus}
@ -40,7 +42,7 @@ object OBPAPI1_2_1 extends OBPRestHelper with APIMethods121 with MdcLoggable wit
val version : ApiVersion = ApiVersion.v1_2_1 // "1.2.1"
val versionStatus = ApiVersionStatus.DEPRECATED.toString
lazy val endpointsOf1_2_1 = List(
lazy val endpointsOf1_2_1: Seq[OBPEndpoint] = List(
Implementations1_2_1.root,
Implementations1_2_1.getBanks,
Implementations1_2_1.bankById,

View File

@ -50,7 +50,7 @@ trait APIMethods130 {
cc =>
implicit val ec = EndpointContext(Some(cc))
for {
_ <- Future() // Just start async call
_ <- Future(()) // Just start async call
} yield {
(JSONFactory.getApiInfoJSON(OBPAPI1_3_0.version, OBPAPI1_3_0.versionStatus), HttpCode.`200`(cc.callContext))
}

View File

@ -1,5 +1,6 @@
package code.api.v1_3_0
import scala.language.reflectiveCalls
import code.api.OBPRestHelper
import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints}
import com.openbankproject.commons.util.{ApiVersion,ApiVersionStatus}

View File

@ -1,5 +1,6 @@
package code.api.v1_4_0
import scala.language.reflectiveCalls
import code.api.Constant._
import code.api.util.ApiRole._
import code.api.util.ApiTag._
@ -84,7 +85,7 @@ trait APIMethods140 extends MdcLoggable with APIMethods130 with APIMethods121{
cc =>
implicit val ec = EndpointContext(Some(cc))
for {
_ <- Future() // Just start async call
_ <- Future(()) // Just start async call
} yield {
(JSONFactory.getApiInfoJSON(OBPAPI1_4_0.version, OBPAPI1_4_0.versionStatus), HttpCode.`200`(cc.callContext))
}

View File

@ -530,7 +530,7 @@ object JSONFactory1_4_0 extends MdcLoggable{
jsonResponseBodyFieldsI18n:String
): ResourceDocJson = {
val cacheKey = LOCALISED_RESOURCE_DOC_PREFIX + s"operationId:${operationId}-locale:$locale- isVersion4OrHigher:$isVersion4OrHigher".intern()
Caching.memoizeSyncWithImMemory(Some(cacheKey))(CREATE_LOCALISED_RESOURCE_DOC_JSON_TTL seconds) {
Caching.memoizeSyncWithImMemory(Some(cacheKey))(CREATE_LOCALISED_RESOURCE_DOC_JSON_TTL.seconds) {
val fieldsDescription =
if (resourceDocUpdatedTags.tags.toString.contains("Dynamic-Entity")
|| resourceDocUpdatedTags.tags.toString.contains("Dynamic-Endpoint")

View File

@ -1,5 +1,6 @@
package code.api.v1_4_0
import scala.language.reflectiveCalls
import code.api.OBPRestHelper
import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints}
import com.openbankproject.commons.util.{ApiVersion,ApiVersionStatus}

View File

@ -1,5 +1,6 @@
package code.api.v2_0_0
import scala.language.reflectiveCalls
import code.TransactionTypes.TransactionType
import code.api.APIFailureNewStyle
import code.api.Constant._
@ -147,7 +148,7 @@ trait APIMethods200 {
cc =>
implicit val ec = EndpointContext(Some(cc))
for {
_ <- Future() // Just start async call
_ <- Future(()) // Just start async call
} yield {
(JSONFactory121.getApiInfoJSON(OBPAPI2_0_0.version, OBPAPI2_0_0.versionStatus), HttpCode.`200`(cc.callContext))
}

View File

@ -26,6 +26,7 @@ TESOBE (http://www.tesobe.com/)
*/
package code.api.v2_0_0
import scala.language.reflectiveCalls
import code.api.OBPRestHelper
import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints}
import com.openbankproject.commons.util.{ApiVersion,ApiVersionStatus}

View File

@ -1,5 +1,6 @@
package code.api.v2_1_0
import scala.language.reflectiveCalls
import code.TransactionTypes.TransactionType
import code.api.Constant.CAN_SEE_TRANSACTION_REQUESTS
import code.api.util.ApiTag._
@ -91,7 +92,7 @@ trait APIMethods210 {
cc =>
implicit val ec = EndpointContext(Some(cc))
for {
_ <- Future() // Just start async call
_ <- Future(()) // Just start async call
} yield {
(JSONFactory.getApiInfoJSON(OBPAPI2_1_0.version, OBPAPI2_1_0.versionStatus), HttpCode.`200`(cc.callContext))
}

View File

@ -26,6 +26,7 @@ TESOBE (http://www.tesobe.com/)
*/
package code.api.v2_1_0
import scala.language.reflectiveCalls
import code.api.OBPRestHelper
import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints}
import code.api.util.{APIUtil, VersionedOBPApis}

View File

@ -1,5 +1,6 @@
package code.api.v2_2_0
import scala.language.reflectiveCalls
import code.api.Constant._
import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON._
import code.api.util.APIUtil._
@ -79,7 +80,7 @@ trait APIMethods220 {
cc =>
implicit val ec = EndpointContext(Some(cc))
for {
_ <- Future() // Just start async call
_ <- Future(()) // Just start async call
} yield {
(JSONFactory.getApiInfoJSON(OBPAPI2_2_0.version, OBPAPI2_2_0.versionStatus), HttpCode.`200`(cc.callContext))
}
@ -535,14 +536,14 @@ trait APIMethods220 {
_ <- entitlementsByBank.filter(_.roleName == CanCreateEntitlementAtOneBank.toString()).size > 0 match {
case true =>
// Already has entitlement
Full()
Full(())
case false =>
Full(Entitlement.entitlement.vend.addEntitlement(bank.id, u.userId, CanCreateEntitlementAtOneBank.toString()))
}
_ <- entitlementsByBank.filter(_.roleName == CanReadDynamicResourceDocsAtOneBank.toString()).size > 0 match {
case true =>
// Already has entitlement
Full()
Full(())
case false =>
Full(Entitlement.entitlement.vend.addEntitlement(bank.id, u.userId, CanReadDynamicResourceDocsAtOneBank.toString()))
}
@ -1246,7 +1247,7 @@ trait APIMethods220 {
(account, callContext)
}
}else
Future{(Full(), Some(cc))}
Future{(Full(()), Some(cc))}
otherAccountRoutingSchemeOBPFormat = if(postJson.other_account_routing_scheme.equalsIgnoreCase("AccountNo")) "ACCOUNT_NUMBER" else StringHelpers.snakify(postJson.other_account_routing_scheme).toUpperCase

View File

@ -1,6 +1,7 @@
package code.api.v2_2_0
import scala.language.reflectiveCalls
import code.api.OBPRestHelper
import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints}
import code.api.util.{APIUtil, VersionedOBPApis}

View File

@ -1,5 +1,6 @@
package code.api.v3_0_0
import scala.language.reflectiveCalls
import code.accountattribute.AccountAttributeX
import code.api.Constant._
import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON
@ -84,7 +85,7 @@ trait APIMethods300 {
cc =>
implicit val ec = EndpointContext(Some(cc))
for {
_ <- Future() // Just start async call
_ <- Future(()) // Just start async call
} yield {
(JSONFactory.getApiInfoJSON(OBPAPI3_0_0.version, OBPAPI3_0_0.versionStatus), HttpCode.`200`(cc.callContext))
}
@ -2118,7 +2119,7 @@ trait APIMethods300 {
hasCanReadGlossaryRole
}
} else {
Future{Full()}
Future{Full(())}
}
json = JSONFactory300.createGlossaryItemsJsonV300(getGlossaryItems)
} yield {

View File

@ -26,6 +26,7 @@ TESOBE (http://www.tesobe.com/)
*/
package code.api.v3_0_0
import scala.language.reflectiveCalls
import code.api.OBPRestHelper
import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints}
import com.openbankproject.commons.util.{ApiVersion,ApiVersionStatus}

View File

@ -1,5 +1,6 @@
package code.api.v3_1_0
import scala.language.reflectiveCalls
import code.api.Constant
import code.api.Constant._
import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON._
@ -101,7 +102,7 @@ trait APIMethods310 {
cc =>
implicit val ec = EndpointContext(Some(cc))
for {
_ <- Future() // Just start async call
_ <- Future(()) // Just start async call
} yield {
(JSONFactory.getApiInfoJSON(OBPAPI3_1_0.version, OBPAPI3_1_0.versionStatus), HttpCode.`200`(cc.callContext))
}

View File

@ -1075,7 +1075,7 @@ object JSONFactory310{
def createEntitlementJsonsV310(tr: List[Entitlement]) = {
val idToUser: Map[String, Box[String]] = tr.map(_.userId).distinct.map {
userId => (userId, UserX.findByUserId(userId).map(_.name))
} toMap;
}.toMap;
EntitlementJSonsV310(
tr.map(e =>

View File

@ -26,6 +26,7 @@ TESOBE (http://www.tesobe.com/)
*/
package code.api.v3_1_0
import scala.language.reflectiveCalls
import code.api.OBPRestHelper
import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints}
import com.openbankproject.commons.util.{ApiVersion,ApiVersionStatus}

View File

@ -1,5 +1,6 @@
package code.api.v4_0_0
import scala.language.reflectiveCalls
import code.DynamicData.DynamicData
import code.DynamicEndpoint.DynamicEndpointSwagger
import code.accountattribute.AccountAttributeX
@ -1546,7 +1547,7 @@ trait APIMethods400 extends MdcLoggable {
value = rejectReasonCode,
callContext = callContext
)
} else Future.successful()
} else Future.successful(())
rejectAdditionalInformation =
challengeAnswerJson.additional_information.getOrElse("")
_ <-
@ -1562,7 +1563,7 @@ trait APIMethods400 extends MdcLoggable {
value = rejectAdditionalInformation,
callContext = callContext
)
} else Future.successful()
} else Future.successful(())
_ <- NewStyle.function.notifyTransactionRequest(
fromAccount,
toAccount,
@ -3371,7 +3372,7 @@ trait APIMethods400 extends MdcLoggable {
case (Nil | "root" :: Nil) JsonGet _ => { cc =>
implicit val ec = EndpointContext(Some(cc))
for {
_ <- Future() // Just start async call
_ <- Future(()) // Just start async call
} yield {
(
JSONFactory400.getApiInfoJSON(
@ -3405,7 +3406,7 @@ trait APIMethods400 extends MdcLoggable {
case "development" :: "call_context" :: Nil JsonGet _ => { cc =>
implicit val ec = EndpointContext(Some(cc))
for {
_ <- Future() // Just start async call
_ <- Future(()) // Just start async call
} yield {
(cc.callContext, HttpCode.`200`(cc.callContext))
}
@ -3434,7 +3435,7 @@ trait APIMethods400 extends MdcLoggable {
cc =>
implicit val ec = EndpointContext(Some(cc))
for {
_ <- Future() // Just start async call
_ <- Future(()) // Just start async call
} yield {
(cc.callContext, HttpCode.`200`(cc.callContext))
}
@ -10457,7 +10458,7 @@ trait APIMethods400 extends MdcLoggable {
(account, callContext)
}
} else
Future { (Full(), Some(cc)) }
Future { (Full(()), Some(cc)) }
otherAccountRoutingSchemeOBPFormat =
if (
@ -10810,7 +10811,7 @@ trait APIMethods400 extends MdcLoggable {
(account, callContext)
}
} else
Future { (Full(), Some(cc)) }
Future { (Full(()), Some(cc)) }
otherAccountRoutingSchemeOBPFormat =
if (
@ -12872,7 +12873,7 @@ trait APIMethods400 extends MdcLoggable {
// auth type validation related endpoints
private val allowedAuthTypes =
AuthenticationType.values.filterNot(AuthenticationType.Anonymous ==)
AuthenticationType.values.filterNot(AuthenticationType.Anonymous.==)
staticResourceDocs += ResourceDoc(
createAuthenticationTypeValidation,
implementedInApiVersion,
@ -16724,7 +16725,7 @@ trait APIMethods400 extends MdcLoggable {
s"$EntitlementAlreadyExists user_id($userId) ${duplicatedRoles.mkString(",")}"
Helper.booleanToFuture(errorMessages, cc = callContext) { false }
} else
Future.successful(Full())
Future.successful(Full(()))
}
/** This method will check all the roles the loggedIn user already has and the
@ -16758,7 +16759,7 @@ trait APIMethods400 extends MdcLoggable {
.mkString(",")}"
Helper.booleanToFuture(errorMessages, cc = callContext) { false }
} else
Future.successful(Full())
Future.successful(Full(()))
}
private def checkRoleBankIdMapping(

View File

@ -26,6 +26,7 @@ TESOBE (http://www.tesobe.com/)
*/
package code.api.v4_0_0
import scala.language.reflectiveCalls
import code.api.OBPRestHelper
import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints}
import code.api.util.VersionedOBPApis

View File

@ -1,5 +1,6 @@
package code.api.v5_0_0
import scala.language.reflectiveCalls
import code.accountattribute.AccountAttributeX
import code.api.Constant._
import code.api.ResourceDocs1_4_0.SwaggerDefinitionsJSON._
@ -104,7 +105,7 @@ trait APIMethods500 {
cc =>
implicit val ec = EndpointContext(Some(cc))
for {
_ <- Future() // Just start async call
_ <- Future(()) // Just start async call
} yield {
(JSONFactory400.getApiInfoJSON(OBPAPI5_0_0.version,OBPAPI5_0_0.versionStatus), HttpCode.`200`(cc.callContext))
}
@ -220,14 +221,14 @@ trait APIMethods500 {
_ <- entitlementsByBank.filter(_.roleName == CanCreateEntitlementAtOneBank.toString()).size > 0 match {
case true =>
// Already has entitlement
Future()
Future(())
case false =>
Future(Entitlement.entitlement.vend.addEntitlement(postJson.id.getOrElse(""), cc.userId, CanCreateEntitlementAtOneBank.toString()))
}
_ <- entitlementsByBank.filter(_.roleName == CanReadDynamicResourceDocsAtOneBank.toString()).size > 0 match {
case true =>
// Already has entitlement
Future()
Future(())
case false =>
Future(Entitlement.entitlement.vend.addEntitlement(postJson.id.getOrElse(""), cc.userId, CanReadDynamicResourceDocsAtOneBank.toString()))
}

View File

@ -26,6 +26,7 @@ TESOBE (http://www.tesobe.com/)
*/
package code.api.v5_0_0
import scala.language.reflectiveCalls
import code.api.OBPRestHelper
import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints}
import code.api.util.{APIUtil, VersionedOBPApis}

View File

@ -1,6 +1,7 @@
package code.api.v5_1_0
import scala.language.reflectiveCalls
import code.api.Constant
import code.api.Constant._
import code.api.OAuth2Login.{Keycloak, OBPOIDC}
@ -107,7 +108,7 @@ trait APIMethods510 {
case (Nil | "root" :: Nil) JsonGet _ => {
cc => implicit val ec = EndpointContext(Some(cc))
for {
_ <- Future() // Just start async call
_ <- Future(()) // Just start async call
} yield {
(JSONFactory510.getApiInfoJSON(OBPAPI5_1_0.version,OBPAPI5_1_0.versionStatus), HttpCode.`200`(cc.callContext))
}
@ -4451,7 +4452,7 @@ trait APIMethods510 {
case "tags" :: Nil JsonGet _ =>
cc => implicit val ec = EndpointContext(Some(cc))
for {
_ <- Future.successful() // Just start async call
_ <- Future.successful(()) // Just start async call
} yield {
(APITags(ApiTag.allDisplayTagNames.toList), HttpCode.`200`(cc.callContext))
}

View File

@ -26,6 +26,7 @@ TESOBE (http://www.tesobe.com/)
*/
package code.api.v5_1_0
import scala.language.reflectiveCalls
import code.api.OBPRestHelper
import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints}
import code.api.util.{APIUtil, VersionedOBPApis}

View File

@ -1,5 +1,6 @@
package code.api.v6_0_0
import scala.language.reflectiveCalls
import code.accountattribute.AccountAttributeX
import code.api.Constant
import code.api.{DirectLogin, ObpApiFailure}
@ -111,7 +112,7 @@ trait APIMethods600 {
case (Nil | "root" :: Nil) JsonGet _ => {
cc => implicit val ec = EndpointContext(Some(cc))
for {
_ <- Future() // Just start async call
_ <- Future(()) // Just start async call
} yield {
(JSONFactory510.getApiInfoJSON(OBPAPI6_0_0.version, OBPAPI6_0_0.versionStatus), HttpCode.`200`(cc.callContext))
}
@ -1539,14 +1540,14 @@ trait APIMethods600 {
_ <- entitlementsByBank.exists(_.roleName == CanCreateEntitlementAtOneBank.toString()) match {
case true =>
// Already has entitlement
Future()
Future(())
case false =>
Future(Entitlement.entitlement.vend.addEntitlement(postJson.bank_id, cc.userId, CanCreateEntitlementAtOneBank.toString()))
}
_ <- entitlementsByBank.exists(_.roleName == CanReadDynamicResourceDocsAtOneBank.toString()) match {
case true =>
// Already has entitlement
Future()
Future(())
case false =>
Future(Entitlement.entitlement.vend.addEntitlement(postJson.bank_id, cc.userId, CanReadDynamicResourceDocsAtOneBank.toString()))
}
@ -1675,7 +1676,7 @@ trait APIMethods600 {
*/
val cacheKey = "getConnectorMethodNames"
val cacheTTL = APIUtil.getPropsAsIntValue("getConnectorMethodNames.cache.ttl.seconds", 3600)
Caching.memoizeSyncWithProvider(Some(cacheKey))(cacheTTL seconds) {
Caching.memoizeSyncWithProvider(Some(cacheKey))(cacheTTL.seconds) {
val connectorName = APIUtil.getPropsValue("connector", "mapped")
val connector = code.bankconnectors.Connector.getConnectorInstance(connectorName)
connector.callableMethods.keys.toList

View File

@ -26,6 +26,8 @@ TESOBE (http://www.tesobe.com/)
*/
package code.api.v6_0_0
import scala.language.reflectiveCalls
import code.api.OBPRestHelper
import code.api.util.APIUtil.{OBPEndpoint, getAllowedEndpoints}
import code.api.util.VersionedOBPApis

Some files were not shown because too many files have changed in this diff Show More